diff --git a/sdk/constructive-cli/src/admin/orm/client.ts b/sdk/constructive-cli/src/admin/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-cli/src/admin/orm/client.ts
+++ b/sdk/constructive-cli/src/admin/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-cli/src/admin/orm/query-builder.ts b/sdk/constructive-cli/src/admin/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-cli/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/admin/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-cli/src/auth/orm/client.ts b/sdk/constructive-cli/src/auth/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-cli/src/auth/orm/client.ts
+++ b/sdk/constructive-cli/src/auth/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-cli/src/auth/orm/query-builder.ts b/sdk/constructive-cli/src/auth/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-cli/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/auth/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-cli/src/objects/orm/client.ts b/sdk/constructive-cli/src/objects/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-cli/src/objects/orm/client.ts
+++ b/sdk/constructive-cli/src/objects/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-cli/src/objects/orm/query-builder.ts b/sdk/constructive-cli/src/objects/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-cli/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/objects/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-cli/src/public/orm/client.ts b/sdk/constructive-cli/src/public/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-cli/src/public/orm/client.ts
+++ b/sdk/constructive-cli/src/public/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-cli/src/public/orm/query-builder.ts b/sdk/constructive-cli/src/public/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-cli/src/public/orm/query-builder.ts
+++ b/sdk/constructive-cli/src/public/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-react/src/admin/orm/client.ts b/sdk/constructive-react/src/admin/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-react/src/admin/orm/client.ts
+++ b/sdk/constructive-react/src/admin/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-react/src/admin/orm/query-builder.ts b/sdk/constructive-react/src/admin/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-react/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-react/src/admin/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-react/src/auth/orm/client.ts b/sdk/constructive-react/src/auth/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-react/src/auth/orm/client.ts
+++ b/sdk/constructive-react/src/auth/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-react/src/auth/orm/query-builder.ts b/sdk/constructive-react/src/auth/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-react/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-react/src/auth/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-react/src/objects/orm/client.ts b/sdk/constructive-react/src/objects/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-react/src/objects/orm/client.ts
+++ b/sdk/constructive-react/src/objects/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-react/src/objects/orm/query-builder.ts b/sdk/constructive-react/src/objects/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-react/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-react/src/objects/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-react/src/public/orm/client.ts b/sdk/constructive-react/src/public/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-react/src/public/orm/client.ts
+++ b/sdk/constructive-react/src/public/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-react/src/public/orm/query-builder.ts b/sdk/constructive-react/src/public/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-react/src/public/orm/query-builder.ts
+++ b/sdk/constructive-react/src/public/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-sdk/src/admin/orm/client.ts b/sdk/constructive-sdk/src/admin/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-sdk/src/admin/orm/client.ts
+++ b/sdk/constructive-sdk/src/admin/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-sdk/src/admin/orm/query-builder.ts b/sdk/constructive-sdk/src/admin/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-sdk/src/admin/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/admin/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-sdk/src/auth/orm/client.ts b/sdk/constructive-sdk/src/auth/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-sdk/src/auth/orm/client.ts
+++ b/sdk/constructive-sdk/src/auth/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-sdk/src/auth/orm/query-builder.ts b/sdk/constructive-sdk/src/auth/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-sdk/src/auth/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/auth/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-sdk/src/objects/orm/client.ts b/sdk/constructive-sdk/src/objects/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-sdk/src/objects/orm/client.ts
+++ b/sdk/constructive-sdk/src/objects/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-sdk/src/objects/orm/query-builder.ts b/sdk/constructive-sdk/src/objects/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-sdk/src/objects/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/objects/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/constructive-sdk/src/public/orm/client.ts b/sdk/constructive-sdk/src/public/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/constructive-sdk/src/public/orm/client.ts
+++ b/sdk/constructive-sdk/src/public/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/constructive-sdk/src/public/orm/query-builder.ts b/sdk/constructive-sdk/src/public/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/constructive-sdk/src/public/orm/query-builder.ts
+++ b/sdk/constructive-sdk/src/public/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';
 
diff --git a/sdk/migrate-client/src/migrate/orm/client.ts b/sdk/migrate-client/src/migrate/orm/client.ts
index c0f12c466..0d893b0e1 100644
--- a/sdk/migrate-client/src/migrate/orm/client.ts
+++ b/sdk/migrate-client/src/migrate/orm/client.ts
@@ -3,9 +3,17 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
-
-export type { GraphQLAdapter, GraphQLError, QueryResult } from '@constructive-io/graphql-types';
+import type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
+
+export type {
+  GraphQLAdapter,
+  GraphQLError,
+  QueryResult,
+} from '@constructive-io/graphql-query/runtime';
 
 /**
  * Default adapter that uses fetch for HTTP requests.
diff --git a/sdk/migrate-client/src/migrate/orm/query-builder.ts b/sdk/migrate-client/src/migrate/orm/query-builder.ts
index b0261f895..f2fd4566f 100644
--- a/sdk/migrate-client/src/migrate/orm/query-builder.ts
+++ b/sdk/migrate-client/src/migrate/orm/query-builder.ts
@@ -3,7 +3,7 @@
  * @generated by @constructive-io/graphql-codegen
  * DO NOT EDIT - changes will be overwritten
  */
-import { parseType, print } from '@0no-co/graphql.web';
+import { parseType, print } from '@constructive-io/graphql-query/runtime';
 import * as t from 'gql-ast';
 import type { ArgumentNode, EnumValueNode, FieldNode, VariableDefinitionNode } from 'graphql';