diff --git a/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java b/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java
index 9dc6e02..e1cb8d7 100644
--- a/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java
+++ b/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java
@@ -122,8 +122,8 @@ public ConnectionResponse register( PolyphenyConnectionProperties connectionProp
         requestBuilder
                 .setMajorApiVersion( VersionUtil.MAJOR_API_VERSION )
                 .setMinorApiVersion( VersionUtil.MINOR_API_VERSION )
-                //.setClientUuid( clientUUID )
-                .setConnectionProperties( buildConnectionProperties( connectionProperties ) );
+                .setConnectionProperties( buildConnectionProperties( connectionProperties ) )
+                .addAllFeatures( VersionUtil.supportedFeatures );
         ConnectionResponse connectionResponse = rpc.connect( requestBuilder.build(), timeout );
         if ( !connectionResponse.getIsCompatible() ) {
             throw new PrismInterfaceServiceException( "client version " + getClientApiVersionString()
diff --git a/src/main/java/org/polypheny/jdbc/utils/VersionUtil.java b/src/main/java/org/polypheny/jdbc/utils/VersionUtil.java
index f08188f..5454d6a 100644
--- a/src/main/java/org/polypheny/jdbc/utils/VersionUtil.java
+++ b/src/main/java/org/polypheny/jdbc/utils/VersionUtil.java
@@ -19,6 +19,9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 import lombok.extern.slf4j.Slf4j;
 
@@ -28,6 +31,8 @@
 @Slf4j
 public class VersionUtil {
 
+    public static List<String> supportedFeatures;
+
     private static final String VERSION_FILE = "polypheny-jdbc-driver-version.properties";
     private static final String API_VERSION_PROPERTIES = "prism-api-version.properties";
 
@@ -72,6 +77,10 @@ public class VersionUtil {
         } catch ( IOException e ) {
             throw new RuntimeException( "Error loading API version properties", e );
         }
+
+        supportedFeatures = new ArrayList<>();
+        supportedFeatures.add("client_streaming");
+        supportedFeatures.add("server_streaming");
     }
 
 }