diff --git a/build/generated/source/proto/main/grpc/io/cloudquery/plugin/v3/PluginGrpc.java b/build/generated/source/proto/main/grpc/io/cloudquery/plugin/v3/PluginGrpc.java
index d89b401..744aa09 100644
--- a/build/generated/source/proto/main/grpc/io/cloudquery/plugin/v3/PluginGrpc.java
+++ b/build/generated/source/proto/main/grpc/io/cloudquery/plugin/v3/PluginGrpc.java
@@ -301,7 +301,7 @@ io.cloudquery.plugin.v3.Transform.Response> getTransformMethod() {
       fullMethodName = SERVICE_NAME + '/' + "TransformSchema",
       requestType = io.cloudquery.plugin.v3.TransformSchema.Request.class,
       responseType = io.cloudquery.plugin.v3.TransformSchema.Response.class,
-      methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<io.cloudquery.plugin.v3.TransformSchema.Request,
       io.cloudquery.plugin.v3.TransformSchema.Response> getTransformSchemaMethod() {
     io.grpc.MethodDescriptor<io.cloudquery.plugin.v3.TransformSchema.Request, io.cloudquery.plugin.v3.TransformSchema.Response> getTransformSchemaMethod;
@@ -310,7 +310,7 @@ io.cloudquery.plugin.v3.TransformSchema.Response> getTransformSchemaMethod() {
         if ((getTransformSchemaMethod = PluginGrpc.getTransformSchemaMethod) == null) {
           PluginGrpc.getTransformSchemaMethod = getTransformSchemaMethod =
               io.grpc.MethodDescriptor.<io.cloudquery.plugin.v3.TransformSchema.Request, io.cloudquery.plugin.v3.TransformSchema.Response>newBuilder()
-              .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING)
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
               .setFullMethodName(generateFullMethodName(SERVICE_NAME, "TransformSchema"))
               .setSampledToLocalTracing(true)
               .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
@@ -533,9 +533,9 @@ default io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.Transform.Request> t
      * Transform schemas.
      * </pre>
      */
-    default io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Request> transformSchema(
+    default void transformSchema(io.cloudquery.plugin.v3.TransformSchema.Request request,
         io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Response> responseObserver) {
-      return io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall(getTransformSchemaMethod(), responseObserver);
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getTransformSchemaMethod(), responseObserver);
     }
 
     /**
@@ -693,10 +693,10 @@ public io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.Transform.Request> tr
      * Transform schemas.
      * </pre>
      */
-    public io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Request> transformSchema(
+    public void transformSchema(io.cloudquery.plugin.v3.TransformSchema.Request request,
         io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Response> responseObserver) {
-      return io.grpc.stub.ClientCalls.asyncBidiStreamingCall(
-          getChannel().newCall(getTransformSchemaMethod(), getCallOptions()), responseObserver);
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getTransformSchemaMethod(), getCallOptions()), request, responseObserver);
     }
 
     /**
@@ -813,6 +813,16 @@ public java.util.Iterator<io.cloudquery.plugin.v3.Read.Response> read(
           getChannel(), getReadMethod(), getCallOptions(), request);
     }
 
+    /**
+     * <pre>
+     * Transform schemas.
+     * </pre>
+     */
+    public io.cloudquery.plugin.v3.TransformSchema.Response transformSchema(io.cloudquery.plugin.v3.TransformSchema.Request request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getTransformSchemaMethod(), getCallOptions(), request);
+    }
+
     /**
      * <pre>
      * Send signal to flush and close open connections
@@ -907,6 +917,17 @@ public com.google.common.util.concurrent.ListenableFuture<io.cloudquery.plugin.v
           getChannel().newCall(getGetTablesMethod(), getCallOptions()), request);
     }
 
+    /**
+     * <pre>
+     * Transform schemas.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<io.cloudquery.plugin.v3.TransformSchema.Response> transformSchema(
+        io.cloudquery.plugin.v3.TransformSchema.Request request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getTransformSchemaMethod(), getCallOptions()), request);
+    }
+
     /**
      * <pre>
      * Send signal to flush and close open connections
@@ -937,11 +958,11 @@ public com.google.common.util.concurrent.ListenableFuture<io.cloudquery.plugin.v
   private static final int METHODID_GET_TABLES = 4;
   private static final int METHODID_SYNC = 5;
   private static final int METHODID_READ = 6;
-  private static final int METHODID_CLOSE = 7;
-  private static final int METHODID_TEST_CONNECTION = 8;
-  private static final int METHODID_WRITE = 9;
-  private static final int METHODID_TRANSFORM = 10;
-  private static final int METHODID_TRANSFORM_SCHEMA = 11;
+  private static final int METHODID_TRANSFORM_SCHEMA = 7;
+  private static final int METHODID_CLOSE = 8;
+  private static final int METHODID_TEST_CONNECTION = 9;
+  private static final int METHODID_WRITE = 10;
+  private static final int METHODID_TRANSFORM = 11;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -988,6 +1009,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserv
           serviceImpl.read((io.cloudquery.plugin.v3.Read.Request) request,
               (io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.Read.Response>) responseObserver);
           break;
+        case METHODID_TRANSFORM_SCHEMA:
+          serviceImpl.transformSchema((io.cloudquery.plugin.v3.TransformSchema.Request) request,
+              (io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Response>) responseObserver);
+          break;
         case METHODID_CLOSE:
           serviceImpl.close((io.cloudquery.plugin.v3.Close.Request) request,
               (io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.Close.Response>) responseObserver);
@@ -1012,9 +1037,6 @@ public io.grpc.stub.StreamObserver<Req> invoke(
         case METHODID_TRANSFORM:
           return (io.grpc.stub.StreamObserver<Req>) serviceImpl.transform(
               (io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.Transform.Response>) responseObserver);
-        case METHODID_TRANSFORM_SCHEMA:
-          return (io.grpc.stub.StreamObserver<Req>) serviceImpl.transformSchema(
-              (io.grpc.stub.StreamObserver<io.cloudquery.plugin.v3.TransformSchema.Response>) responseObserver);
         default:
           throw new AssertionError();
       }
@@ -1088,7 +1110,7 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser
                 service, METHODID_TRANSFORM)))
         .addMethod(
           getTransformSchemaMethod(),
-          io.grpc.stub.ServerCalls.asyncBidiStreamingCall(
+          io.grpc.stub.ServerCalls.asyncUnaryCall(
             new MethodHandlers<
               io.cloudquery.plugin.v3.TransformSchema.Request,
               io.cloudquery.plugin.v3.TransformSchema.Response>(
diff --git a/build/generated/source/proto/main/java/io/cloudquery/plugin/v3/PluginOuterClass.java b/build/generated/source/proto/main/java/io/cloudquery/plugin/v3/PluginOuterClass.java
index 7c03d59..69eae3d 100644
--- a/build/generated/source/proto/main/java/io/cloudquery/plugin/v3/PluginOuterClass.java
+++ b/build/generated/source/proto/main/java/io/cloudquery/plugin/v3/PluginOuterClass.java
@@ -334,7 +334,7 @@ public static void registerAllExtensions(
       "\007Request\032\n\n\010Response\"y\n\016TestConnection\032\027" +
       "\n\007Request\022\014\n\004spec\030\001 \001(\014\032N\n\010Response\022\017\n\007s" +
       "uccess\030\001 \001(\010\022\024\n\014failure_code\030\002 \001(\t\022\033\n\023fa" +
-      "ilure_description\030\003 \001(\t2\373\010\n\006Plugin\022X\n\007Ge" +
+      "ilure_description\030\003 \001(\t2\367\010\n\006Plugin\022X\n\007Ge" +
       "tName\022%.cloudquery.plugin.v3.GetName.Req" +
       "uest\032&.cloudquery.plugin.v3.GetName.Resp" +
       "onse\022a\n\nGetVersion\022(.cloudquery.plugin.v" +
@@ -355,17 +355,17 @@ public static void registerAllExtensions(
       "\032$.cloudquery.plugin.v3.Write.Response(\001" +
       "\022b\n\tTransform\022\'.cloudquery.plugin.v3.Tra" +
       "nsform.Request\032(.cloudquery.plugin.v3.Tr" +
-      "ansform.Response(\0010\001\022t\n\017TransformSchema\022" +
+      "ansform.Response(\0010\001\022p\n\017TransformSchema\022" +
       "-.cloudquery.plugin.v3.TransformSchema.R" +
       "equest\032..cloudquery.plugin.v3.TransformS" +
-      "chema.Response(\0010\001\022R\n\005Close\022#.cloudquery" +
-      ".plugin.v3.Close.Request\032$.cloudquery.pl" +
-      "ugin.v3.Close.Response\022m\n\016TestConnection" +
-      "\022,.cloudquery.plugin.v3.TestConnection.R" +
-      "equest\032-.cloudquery.plugin.v3.TestConnec" +
-      "tion.ResponseBS\n\027io.cloudquery.plugin.v3" +
-      "P\001Z6github.com/cloudquery/plugin-pb-go/p" +
-      "b/plugin/v3;pluginb\006proto3"
+      "chema.Response\022R\n\005Close\022#.cloudquery.plu" +
+      "gin.v3.Close.Request\032$.cloudquery.plugin" +
+      ".v3.Close.Response\022m\n\016TestConnection\022,.c" +
+      "loudquery.plugin.v3.TestConnection.Reque" +
+      "st\032-.cloudquery.plugin.v3.TestConnection" +
+      ".ResponseBS\n\027io.cloudquery.plugin.v3P\001Z6" +
+      "github.com/cloudquery/plugin-pb-go/pb/pl" +
+      "ugin/v3;pluginb\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/main/proto/cloudquery/plugin/v3/plugin.proto b/src/main/proto/cloudquery/plugin/v3/plugin.proto
index 8cbddcf..3dd5189 100644
--- a/src/main/proto/cloudquery/plugin/v3/plugin.proto
+++ b/src/main/proto/cloudquery/plugin/v3/plugin.proto
@@ -30,7 +30,7 @@ service Plugin {
   // Transform resources.
   rpc Transform(stream Transform.Request) returns (stream Transform.Response);
   // Transform schemas.
-  rpc TransformSchema(stream TransformSchema.Request) returns (stream TransformSchema.Response);
+  rpc TransformSchema(TransformSchema.Request) returns (TransformSchema.Response);
   // Send signal to flush and close open connections
   rpc Close(Close.Request) returns (Close.Response);
   // Validate and test the connections used by the plugin