diff --git a/package.json b/package.json
index 4c9a166d4..c117e8b46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
index 0600e0360..3bfd0b948 100644
--- a/packages/auth-adapters/better-auth/package.json
+++ b/packages/auth-adapters/better-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7f33b32e6..622d65b14 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
index 9a121978b..bbcf25858 100644
--- a/packages/clients/tanstack-query/package.json
+++ b/packages/clients/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "main": "index.js",
     "type": "module",
@@ -10,7 +10,7 @@
         "lint": "eslint src --ext ts",
         "test": "vitest run",
         "pack": "pnpm pack",
-        "test:generate": "tsx ../../../scripts/test-generate.ts tests",
+        "test:generate": "tsx ../../../scripts/test-generate.ts test --lite-only",
         "test:typecheck": "tsc --noEmit --project tsconfig.test.json"
     },
     "keywords": [
@@ -75,6 +75,7 @@
         "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
+        "@zenstackhq/cli": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
         "happy-dom": "^20.0.10",
diff --git a/packages/clients/tanstack-query/src/react.ts b/packages/clients/tanstack-query/src/react.ts
index 57b9cea20..9cd617276 100644
--- a/packages/clients/tanstack-query/src/react.ts
+++ b/packages/clients/tanstack-query/src/react.ts
@@ -24,7 +24,6 @@ import type {
     AggregateArgs,
     AggregateResult,
     BatchResult,
-    ClientOptions,
     CountArgs,
     CountResult,
     CreateArgs,
@@ -37,8 +36,10 @@ import type {
     FindUniqueArgs,
     GroupByArgs,
     GroupByResult,
+    QueryOptions,
     SelectSubset,
-    SimplifiedModelResult,
+    SimplifiedPlainResult,
+    SimplifiedResult,
     Subset,
     UpdateArgs,
     UpdateManyAndReturnArgs,
@@ -129,101 +130,99 @@ export type ModelMutationModelResult<
     Model extends GetModels<Schema>,
     TArgs,
     Array extends boolean = false,
-> = Omit<
-    ModelMutationResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, TArgs, false, Array>, TArgs>,
-    'mutateAsync'
-> & {
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
+> = Omit<ModelMutationResult<SimplifiedResult<Schema, Model, TArgs, Options, false, Array>, TArgs>, 'mutateAsync'> & {
     mutateAsync<T extends TArgs>(
         args: T,
-        options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>, T>,
-    ): Promise<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>>;
+        options?: ModelMutationOptions<SimplifiedResult<Schema, Model, T, Options, false, Array>, T>,
+    ): Promise<SimplifiedResult<Schema, Model, T, Options, false, Array>>;
 };
 
-export type ClientHooks<Schema extends SchemaDef> = {
-    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model>;
+export type ClientHooks<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = {
+    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model, Options>;
 };
 
 // Note that we can potentially use TypeScript's mapped type to directly map from ORM contract, but that seems
 // to significantly slow down tsc performance ...
-export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = TrimDelegateModelOperations<
+export type ModelQueryHooks<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
+> = TrimDelegateModelOperations<
     Schema,
     Model,
     {
         useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
             args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useSuspenseFindUnique<T extends FindUniqueArgs<Schema, Model>>(
             args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-            options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelSuspenseQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelSuspenseQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindFirst<T extends FindFirstArgs<Schema, Model>>(
             args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useSuspenseFindFirst<T extends FindFirstArgs<Schema, Model>>(
             args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-            options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelSuspenseQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelSuspenseQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
         useSuspenseFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelSuspenseQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelSuspenseQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>;
+            options?: ModelSuspenseQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelSuspenseQueryResult<SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
         useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>>;
+            options?: ModelInfiniteQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedPlainResult<Schema, Model, T, Options>[]>>;
 
         useSuspenseInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelSuspenseInfiniteQueryOptions<
-                SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]
-            >,
-        ): ModelSuspenseInfiniteQueryResult<
-            InfiniteData<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>
-        >;
+            options?: ModelSuspenseInfiniteQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelSuspenseInfiniteQueryResult<InfiniteData<SimplifiedPlainResult<Schema, Model, T, Options>[]>>;
 
         useCreate<T extends CreateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useCreateMany<T extends CreateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpdate<T extends UpdateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpsert<T extends UpsertArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useDelete<T extends DeleteArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
@@ -264,20 +263,29 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
 /**
  * Gets data query hooks for all models in the schema.
  */
-export function useClientQueries<Schema extends SchemaDef>(schema: Schema): ClientHooks<Schema> {
-    return Object.keys(schema.models).reduce((acc, model) => {
-        (acc as any)[lowerCaseFirst(model)] = useModelQueries(schema, model as GetModels<Schema>);
-        return acc;
-    }, {} as ClientHooks<Schema>);
+export function useClientQueries<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>>(
+    schema: Schema,
+): ClientHooks<Schema, Options> {
+    return Object.keys(schema.models).reduce(
+        (acc, model) => {
+            (acc as any)[lowerCaseFirst(model)] = useModelQueries<Schema, GetModels<Schema>, Options>(
+                schema,
+                model as GetModels<Schema>,
+            );
+            return acc;
+        },
+        {} as ClientHooks<Schema, Options>,
+    );
 }
 
 /**
  * Gets data query hooks for a specific model in the schema.
  */
-export function useModelQueries<Schema extends SchemaDef, Model extends GetModels<Schema>>(
-    schema: Schema,
-    model: Model,
-): ModelQueryHooks<Schema, Model> {
+export function useModelQueries<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema>,
+>(schema: Schema, model: Model): ModelQueryHooks<Schema, Model, Options> {
     const modelDef = Object.values(schema.models).find((m) => m.name.toLowerCase() === model.toLowerCase());
     if (!modelDef) {
         throw new Error(`Model "${model}" not found in schema`);
@@ -377,7 +385,7 @@ export function useModelQueries<Schema extends SchemaDef, Model extends GetModel
         useSuspenseGroupBy: (args: any, options?: any) => {
             return useInternalSuspenseQuery(schema, modelName, 'groupBy', args, options);
         },
-    } as ModelQueryHooks<Schema, Model>;
+    } as ModelQueryHooks<Schema, Model, Options>;
 }
 
 export function useInternalQuery<TQueryFnData, TData>(
diff --git a/packages/clients/tanstack-query/src/svelte.ts b/packages/clients/tanstack-query/src/svelte.ts
index 447b11dc8..36a2ab1c9 100644
--- a/packages/clients/tanstack-query/src/svelte.ts
+++ b/packages/clients/tanstack-query/src/svelte.ts
@@ -20,7 +20,6 @@ import type {
     AggregateArgs,
     AggregateResult,
     BatchResult,
-    ClientOptions,
     CountArgs,
     CountResult,
     CreateArgs,
@@ -33,8 +32,10 @@ import type {
     FindUniqueArgs,
     GroupByArgs,
     GroupByResult,
+    QueryOptions,
     SelectSubset,
-    SimplifiedModelResult,
+    SimplifiedPlainResult,
+    SimplifiedResult,
     Subset,
     UpdateArgs,
     UpdateManyAndReturnArgs,
@@ -117,84 +118,82 @@ export type ModelMutationModelResult<
     Model extends GetModels<Schema>,
     TArgs,
     Array extends boolean = false,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
 > = Readable<
     Omit<
-        UnwrapStore<
-            ModelMutationResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, TArgs, false, Array>, TArgs>
-        >,
+        UnwrapStore<ModelMutationResult<SimplifiedResult<Schema, Model, TArgs, Options, false, Array>, TArgs>>,
         'mutateAsync'
     > & {
         mutateAsync<T extends TArgs>(
             args: T,
-            options?: ModelMutationOptions<
-                SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>,
-                T
-            >,
-        ): Promise<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>>;
+            options?: ModelMutationOptions<SimplifiedResult<Schema, Model, T, Options, false, Array>, T>,
+        ): Promise<SimplifiedResult<Schema, Model, T, Options, false, Array>>;
     }
 >;
 
-export type ClientHooks<Schema extends SchemaDef> = {
-    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model>;
+export type ClientHooks<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = {
+    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model, Options>;
 };
 
 // Note that we can potentially use TypeScript's mapped type to directly map from ORM contract, but that seems
 // to significantly slow down tsc performance ...
-export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = TrimDelegateModelOperations<
+export type ModelQueryHooks<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
+> = TrimDelegateModelOperations<
     Schema,
     Model,
     {
         useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
             args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindFirst<T extends FindFirstArgs<Schema, Model>>(
             args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
         useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>>;
+            options?: ModelInfiniteQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedPlainResult<Schema, Model, T, Options>[]>>;
 
         useCreate<T extends CreateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useCreateMany<T extends CreateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpdate<T extends UpdateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
-
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
         useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpsert<T extends UpsertArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
-
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
         useDelete<T extends DeleteArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
@@ -220,20 +219,29 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
 /**
  * Gets data query hooks for all models in the schema.
  */
-export function useClientQueries<Schema extends SchemaDef>(schema: Schema): ClientHooks<Schema> {
-    return Object.keys(schema.models).reduce((acc, model) => {
-        (acc as any)[lowerCaseFirst(model)] = useModelQueries(schema, model as GetModels<Schema>);
-        return acc;
-    }, {} as ClientHooks<Schema>);
+export function useClientQueries<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>>(
+    schema: Schema,
+): ClientHooks<Schema, Options> {
+    return Object.keys(schema.models).reduce(
+        (acc, model) => {
+            (acc as any)[lowerCaseFirst(model)] = useModelQueries<Schema, GetModels<Schema>, Options>(
+                schema,
+                model as GetModels<Schema>,
+            );
+            return acc;
+        },
+        {} as ClientHooks<Schema, Options>,
+    );
 }
 
 /**
  * Gets data query hooks for a specific model in the schema.
  */
-export function useModelQueries<Schema extends SchemaDef, Model extends GetModels<Schema>>(
-    schema: Schema,
-    model: Model,
-): ModelQueryHooks<Schema, Model> {
+export function useModelQueries<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema>,
+>(schema: Schema, model: Model): ModelQueryHooks<Schema, Model, Options> {
     const modelDef = Object.values(schema.models).find((m) => m.name.toLowerCase() === model.toLowerCase());
     if (!modelDef) {
         throw new Error(`Model "${model}" not found in schema`);
@@ -305,7 +313,7 @@ export function useModelQueries<Schema extends SchemaDef, Model extends GetModel
         useGroupBy: (args: any, options?: any) => {
             return useInternalQuery(schema, modelName, 'groupBy', args, options);
         },
-    } as ModelQueryHooks<Schema, Model>;
+    } as ModelQueryHooks<Schema, Model, Options>;
 }
 
 export function useInternalQuery<TQueryFnData, TData>(
diff --git a/packages/clients/tanstack-query/src/vue.ts b/packages/clients/tanstack-query/src/vue.ts
index 6d0cec9bf..bcac42d9c 100644
--- a/packages/clients/tanstack-query/src/vue.ts
+++ b/packages/clients/tanstack-query/src/vue.ts
@@ -18,7 +18,6 @@ import type {
     AggregateArgs,
     AggregateResult,
     BatchResult,
-    ClientOptions,
     CountArgs,
     CountResult,
     CreateArgs,
@@ -31,8 +30,10 @@ import type {
     FindUniqueArgs,
     GroupByArgs,
     GroupByResult,
+    QueryOptions,
     SelectSubset,
-    SimplifiedModelResult,
+    SimplifiedPlainResult,
+    SimplifiedResult,
     Subset,
     UpdateArgs,
     UpdateManyAndReturnArgs,
@@ -106,77 +107,82 @@ export type ModelMutationModelResult<
     Model extends GetModels<Schema>,
     TArgs,
     Array extends boolean = false,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
 > = Omit<
-    ModelMutationResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, TArgs, false, Array>, TArgs>,
+    ModelMutationResult<SimplifiedResult<Schema, Model, TArgs, QueryOptions<Schema>, false, Array>, TArgs>,
     'mutateAsync'
 > & {
     mutateAsync<T extends TArgs>(
         args: T,
-        options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>, T>,
-    ): Promise<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T, false, Array>>;
+        options?: ModelMutationOptions<SimplifiedResult<Schema, Model, T, Options, false, Array>, T>,
+    ): Promise<SimplifiedResult<Schema, Model, T, Options, false, Array>>;
 };
 
-export type ClientHooks<Schema extends SchemaDef> = {
-    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model>;
+export type ClientHooks<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>> = {
+    [Model in GetModels<Schema> as `${Uncapitalize<Model>}`]: ModelQueryHooks<Schema, Model, Options>;
 };
 
 // Note that we can potentially use TypeScript's mapped type to directly map from ORM contract, but that seems
 // to significantly slow down tsc performance ...
-export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = TrimDelegateModelOperations<
+export type ModelQueryHooks<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
+> = TrimDelegateModelOperations<
     Schema,
     Model,
     {
         useFindUnique<T extends FindUniqueArgs<Schema, Model>>(
             args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindFirst<T extends FindFirstArgs<Schema, Model>>(
             args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T> | null>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options> | null>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
         useFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelQueryResult<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>;
+            options?: ModelQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelQueryResult<SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
         useInfiniteFindMany<T extends FindManyArgs<Schema, Model>>(
             args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-            options?: ModelInfiniteQueryOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>,
-        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[]>>;
+            options?: ModelInfiniteQueryOptions<SimplifiedPlainResult<Schema, Model, T, Options>[]>,
+        ): ModelInfiniteQueryResult<InfiniteData<SimplifiedPlainResult<Schema, Model, T, Options>[]>>;
 
         useCreate<T extends CreateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useCreateMany<T extends CreateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useCreateManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpdate<T extends UpdateArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useUpdateMany<T extends UpdateManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
         ): ModelMutationResult<BatchResult, T>;
 
         useUpdateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>[], T>,
-        ): ModelMutationModelResult<Schema, Model, T, true>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>[], T>,
+        ): ModelMutationModelResult<Schema, Model, T, true, Options>;
 
         useUpsert<T extends UpsertArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useDelete<T extends DeleteArgs<Schema, Model>>(
-            options?: ModelMutationOptions<SimplifiedModelResult<Schema, Model, ClientOptions<Schema>, T>, T>,
-        ): ModelMutationModelResult<Schema, Model, T>;
+            options?: ModelMutationOptions<SimplifiedPlainResult<Schema, Model, T, Options>, T>,
+        ): ModelMutationModelResult<Schema, Model, T, false, Options>;
 
         useDeleteMany<T extends DeleteManyArgs<Schema, Model>>(
             options?: ModelMutationOptions<BatchResult, T>,
@@ -202,20 +208,29 @@ export type ModelQueryHooks<Schema extends SchemaDef, Model extends GetModels<Sc
 /**
  * Gets data query hooks for all models in the schema.
  */
-export function useClientQueries<Schema extends SchemaDef>(schema: Schema): ClientHooks<Schema> {
-    return Object.keys(schema.models).reduce((acc, model) => {
-        (acc as any)[lowerCaseFirst(model)] = useModelQueries(schema, model as GetModels<Schema>);
-        return acc;
-    }, {} as ClientHooks<Schema>);
+export function useClientQueries<Schema extends SchemaDef, Options extends QueryOptions<Schema> = QueryOptions<Schema>>(
+    schema: Schema,
+): ClientHooks<Schema, Options> {
+    return Object.keys(schema.models).reduce(
+        (acc, model) => {
+            (acc as any)[lowerCaseFirst(model)] = useModelQueries<Schema, GetModels<Schema>, Options>(
+                schema,
+                model as GetModels<Schema>,
+            );
+            return acc;
+        },
+        {} as ClientHooks<Schema, Options>,
+    );
 }
 
 /**
  * Gets data query hooks for a specific model in the schema.
  */
-export function useModelQueries<Schema extends SchemaDef, Model extends GetModels<Schema>>(
-    schema: Schema,
-    model: Model,
-): ModelQueryHooks<Schema, Model> {
+export function useModelQueries<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Options extends QueryOptions<Schema>,
+>(schema: Schema, model: Model): ModelQueryHooks<Schema, Model, Options> {
     const modelDef = Object.values(schema.models).find((m) => m.name.toLowerCase() === model.toLowerCase());
     if (!modelDef) {
         throw new Error(`Model "${model}" not found in schema`);
@@ -287,7 +302,7 @@ export function useModelQueries<Schema extends SchemaDef, Model extends GetModel
         useGroupBy: (args: any, options?: any) => {
             return useInternalQuery(schema, modelName, 'groupBy', args, options);
         },
-    } as ModelQueryHooks<Schema, Model>;
+    } as ModelQueryHooks<Schema, Model, Options>;
 }
 
 export function useInternalQuery<TQueryFnData, TData>(
diff --git a/packages/clients/tanstack-query/test/schemas/basic/input.ts b/packages/clients/tanstack-query/test/schemas/basic/input.ts
index 29cf79295..766d0ca90 100644
--- a/packages/clients/tanstack-query/test/schemas/basic/input.ts
+++ b/packages/clients/tanstack-query/test/schemas/basic/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema-lite";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,7 +47,7 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
 export type CategoryFindManyArgs = $FindManyArgs<$Schema, "Category">;
 export type CategoryFindUniqueArgs = $FindUniqueArgs<$Schema, "Category">;
 export type CategoryFindFirstArgs = $FindFirstArgs<$Schema, "Category">;
@@ -67,7 +67,7 @@ export type CategoryWhereInput = $WhereInput<$Schema, "Category">;
 export type CategorySelect = $SelectInput<$Schema, "Category">;
 export type CategoryInclude = $IncludeInput<$Schema, "Category">;
 export type CategoryOmit = $OmitInput<$Schema, "Category">;
-export type CategoryGetPayload<Args extends $SelectIncludeOmit<$Schema, "Category", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Category", Options, Args>;
+export type CategoryGetPayload<Args extends $SelectIncludeOmit<$Schema, "Category", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Category", Args, Options>;
 export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">;
 export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">;
 export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">;
@@ -87,7 +87,7 @@ export type FooWhereInput = $WhereInput<$Schema, "Foo">;
 export type FooSelect = $SelectInput<$Schema, "Foo">;
 export type FooInclude = $IncludeInput<$Schema, "Foo">;
 export type FooOmit = $OmitInput<$Schema, "Foo">;
-export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Foo", Options, Args>;
+export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Foo", Args, Options>;
 export type BarFindManyArgs = $FindManyArgs<$Schema, "Bar">;
 export type BarFindUniqueArgs = $FindUniqueArgs<$Schema, "Bar">;
 export type BarFindFirstArgs = $FindFirstArgs<$Schema, "Bar">;
@@ -107,4 +107,4 @@ export type BarWhereInput = $WhereInput<$Schema, "Bar">;
 export type BarSelect = $SelectInput<$Schema, "Bar">;
 export type BarInclude = $IncludeInput<$Schema, "Bar">;
 export type BarOmit = $OmitInput<$Schema, "Bar">;
-export type BarGetPayload<Args extends $SelectIncludeOmit<$Schema, "Bar", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Bar", Options, Args>;
+export type BarGetPayload<Args extends $SelectIncludeOmit<$Schema, "Bar", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Bar", Args, Options>;
diff --git a/packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts b/packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts
index 3d826024f..918a37373 100644
--- a/packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts
+++ b/packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts
@@ -6,11 +6,11 @@
 /* eslint-disable */
 
 import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema";
-const _schema = {
-    provider: {
+export class SchemaType implements SchemaDef {
+    provider = {
         type: "sqlite"
-    },
-    models: {
+    } as const;
+    models = {
         User: {
             name: "User",
             fields: {
@@ -165,12 +165,8 @@ const _schema = {
                 id: { type: "String" }
             }
         }
-    },
-    authType: "User",
-    plugins: {}
-} as const satisfies SchemaDef;
-type Schema = typeof _schema & {
-    __brand?: "schema";
-};
-export const schema: Schema = _schema;
-export type SchemaType = Schema;
+    } as const;
+    authType = "User" as const;
+    plugins = {};
+}
+export const schema = new SchemaType();
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
index 564217f13..442e243ac 100644
--- a/packages/common-helpers/package.json
+++ b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
index 208b0e451..4c3561078 100644
--- a/packages/config/eslint-config/package.json
+++ b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
index 1b05dc4c4..257e1835d 100644
--- a/packages/config/typescript-config/package.json
+++ b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "license": "MIT"
 }
diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json
index b0391fa65..65a2b7fc9 100644
--- a/packages/config/vitest-config/package.json
+++ b/packages/config/vitest-config/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
index 2f7a1fd70..312bd0e85 100644
--- a/packages/create-zenstack/package.json
+++ b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/language/package.json b/packages/language/package.json
index e58d67294..df63be591 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/orm/package.json b/packages/orm/package.json
index 603fad418..0de776c50 100644
--- a/packages/orm/package.json
+++ b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/orm/src/client/contract.ts b/packages/orm/src/client/contract.ts
index 57cd9b05e..4074ede6a 100644
--- a/packages/orm/src/client/contract.ts
+++ b/packages/orm/src/client/contract.ts
@@ -31,7 +31,7 @@ import type {
     GroupByResult,
     ModelResult,
     SelectSubset,
-    SimplifiedModelResult,
+    SimplifiedPlainResult,
     Subset,
     TypeDefResult,
     UpdateArgs,
@@ -39,7 +39,7 @@ import type {
     UpdateManyArgs,
     UpsertArgs,
 } from './crud-types';
-import type { ClientOptions } from './options';
+import type { ClientOptions, QueryOptions, ToQueryOptions } from './options';
 import type { RuntimePlugin } from './plugin';
 import type { ZenStackPromise } from './promise';
 import type { ToKysely } from './query-builder';
@@ -193,7 +193,7 @@ export type ClientContract<Schema extends SchemaDef, Options extends ClientOptio
      */
     $pushSchema(): Promise<void>;
 } & {
-    [Key in GetModels<Schema> as Uncapitalize<Key>]: ModelOperations<Schema, Key, Options>;
+    [Key in GetModels<Schema> as Uncapitalize<Key>]: ModelOperations<Schema, Key, ToQueryOptions<Options>>;
 } & Procedures<Schema>;
 
 /**
@@ -274,7 +274,7 @@ export const CRUD_EXT = [...CRUD, 'post-update'] as const;
 export type AllModelOperations<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema>,
+    Options extends QueryOptions<Schema>,
 > = {
     /**
      * Returns a list of entities.
@@ -359,7 +359,7 @@ export type AllModelOperations<
      */
     findMany<T extends FindManyArgs<Schema, Model>>(
         args?: SelectSubset<T, FindManyArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>[]>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
     /**
      * Returns a uniquely identified entity.
@@ -369,7 +369,7 @@ export type AllModelOperations<
      */
     findUnique<T extends FindUniqueArgs<Schema, Model>>(
         args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T> | null>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
     /**
      * Returns a uniquely identified entity or throws `NotFoundError` if not found.
@@ -379,7 +379,7 @@ export type AllModelOperations<
      */
     findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(
         args: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Returns the first entity.
@@ -389,7 +389,7 @@ export type AllModelOperations<
      */
     findFirst<T extends FindFirstArgs<Schema, Model>>(
         args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T> | null>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options> | null>;
 
     /**
      * Returns the first entity or throws `NotFoundError` if not found.
@@ -399,7 +399,7 @@ export type AllModelOperations<
      */
     findFirstOrThrow<T extends FindFirstArgs<Schema, Model>>(
         args?: SelectSubset<T, FindFirstArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Creates a new entity.
@@ -455,7 +455,7 @@ export type AllModelOperations<
      */
     create<T extends CreateArgs<Schema, Model>>(
         args: SelectSubset<T, CreateArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Creates multiple entities. Only scalar fields are allowed.
@@ -506,7 +506,7 @@ export type AllModelOperations<
      */
     createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
         args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>[]>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
     /**
      * Updates a uniquely identified entity.
@@ -627,7 +627,7 @@ export type AllModelOperations<
      */
     update<T extends UpdateArgs<Schema, Model>>(
         args: SelectSubset<T, UpdateArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Updates multiple entities.
@@ -677,7 +677,7 @@ export type AllModelOperations<
      */
     updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
         args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>[]>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>[]>;
 
     /**
      * Creates or updates an entity.
@@ -701,7 +701,7 @@ export type AllModelOperations<
      */
     upsert<T extends UpsertArgs<Schema, Model>>(
         args: SelectSubset<T, UpsertArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Deletes a uniquely identifiable entity.
@@ -724,7 +724,7 @@ export type AllModelOperations<
      */
     delete<T extends DeleteArgs<Schema, Model>>(
         args: SelectSubset<T, DeleteArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, SimplifiedModelResult<Schema, Model, Options, T>>;
+    ): ZenStackPromise<Schema, SimplifiedPlainResult<Schema, Model, T, Options>>;
 
     /**
      * Deletes multiple entities.
@@ -835,7 +835,7 @@ export type OperationsIneligibleForDelegateModels = 'create' | 'createMany' | 'c
 export type ModelOperations<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema> = ClientOptions<Schema>,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
 > = Omit<
     AllModelOperations<Schema, Model, Options>,
     // exclude operations not applicable to delegate models
@@ -851,7 +851,7 @@ export type ModelOperations<
  * Relations are recursively included to allow nested auth data like { user: { profile: { ... } } }
  */
 type AuthModelType<Schema extends SchemaDef, Model extends GetModels<Schema>> = Partial<
-    DefaultModelResult<Schema, Model, ClientOptions<Schema>>
+    DefaultModelResult<Schema, Model>
 > & {
     [Key in RelationFields<Schema, Model>]?: FieldIsArray<Schema, Model, Key> extends true
         ? AuthModelType<Schema, RelationFieldType<Schema, Model, Key>>[]
diff --git a/packages/orm/src/client/crud-types.ts b/packages/orm/src/client/crud-types.ts
index 65e07c1ca..9704d1739 100644
--- a/packages/orm/src/client/crud-types.ts
+++ b/packages/orm/src/client/crud-types.ts
@@ -44,7 +44,7 @@ import type {
     WrapType,
     XOR,
 } from '../utils/type-utils';
-import type { ClientOptions } from './options';
+import type { QueryOptions } from './options';
 import type { ToKyselySchema } from './query-builder';
 
 //#region Query results
@@ -52,8 +52,8 @@ import type { ToKyselySchema } from './query-builder';
 export type DefaultModelResult<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema> = ClientOptions<Schema>,
     Omit = undefined,
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
     Optional = false,
     Array = false,
 > = WrapType<
@@ -85,7 +85,7 @@ export type DefaultModelResult<
 type ShouldOmitField<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema>,
+    Options extends QueryOptions<Schema>,
     Field extends GetModelFields<Schema, Model>,
     Omit,
 > =
@@ -106,7 +106,7 @@ type OptionsLevelOmit<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
     Field extends GetModelFields<Schema, Model>,
-    Options extends ClientOptions<Schema>,
+    Options extends QueryOptions<Schema>,
 > = Model extends keyof Options['omit']
     ? Field extends keyof Options['omit'][Model]
         ? Options['omit'][Model][Field] extends boolean
@@ -124,7 +124,7 @@ type SchemaLevelOmit<
 // type DelegateUnionResult<
 //     Schema extends SchemaDef,
 //     Model extends GetModels<Schema>,
-//     Options extends ClientOptions<Schema>,
+//     Options extends QueryOptions<Schema>,
 //     SubModel extends GetModels<Schema>,
 //     Omit = undefined,
 // > = SubModel extends string // typescript union distribution
@@ -134,9 +134,9 @@ type SchemaLevelOmit<
 type ModelSelectResult<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema>,
     Select,
     Omit,
+    Options extends QueryOptions<Schema>,
 > = {
     [Key in keyof Select as Select[Key] extends false | undefined
         ? never
@@ -162,24 +162,24 @@ type ModelSelectResult<
                     ? ModelResult<
                           Schema,
                           RelationFieldType<Schema, Model, Key>,
-                          Options,
                           Pick<Select[Key], 'select'>,
+                          Options,
                           ModelFieldIsOptional<Schema, Model, Key>,
                           FieldIsArray<Schema, Model, Key>
                       >
                     : ModelResult<
                           Schema,
                           RelationFieldType<Schema, Model, Key>,
-                          Options,
                           Pick<Select[Key], 'include' | 'omit'>,
+                          Options,
                           ModelFieldIsOptional<Schema, Model, Key>,
                           FieldIsArray<Schema, Model, Key>
                       >
                 : DefaultModelResult<
                       Schema,
                       RelationFieldType<Schema, Model, Key>,
-                      Options,
                       Omit,
+                      Options,
                       ModelFieldIsOptional<Schema, Model, Key>,
                       FieldIsArray<Schema, Model, Key>
                   >
@@ -198,8 +198,8 @@ type SelectCountResult<Schema extends SchemaDef, Model extends GetModels<Schema>
 export type ModelResult<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema> = ClientOptions<Schema>,
     Args = {},
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
     Optional = false,
     Array = false,
 > = WrapType<
@@ -207,12 +207,12 @@ export type ModelResult<
         select: infer S;
         omit?: infer O;
     }
-        ? ModelSelectResult<Schema, Model, Options, S, O>
+        ? ModelSelectResult<Schema, Model, S, O, Options>
         : Args extends {
                 include: infer I;
                 omit?: infer O;
             }
-          ? DefaultModelResult<Schema, Model, Options, O> & {
+          ? DefaultModelResult<Schema, Model, O, Options, false, false> & {
                 [Key in keyof I & RelationFields<Schema, Model> as I[Key] extends false | undefined
                     ? never
                     : Key]: I[Key] extends FindArgs<
@@ -223,35 +223,42 @@ export type ModelResult<
                     ? ModelResult<
                           Schema,
                           RelationFieldType<Schema, Model, Key>,
-                          Options,
                           I[Key],
+                          Options,
                           ModelFieldIsOptional<Schema, Model, Key>,
                           FieldIsArray<Schema, Model, Key>
                       >
                     : DefaultModelResult<
                           Schema,
                           RelationFieldType<Schema, Model, Key>,
-                          Options,
                           undefined,
+                          Options,
                           ModelFieldIsOptional<Schema, Model, Key>,
                           FieldIsArray<Schema, Model, Key>
                       >;
             }
           : Args extends { omit: infer O }
-            ? DefaultModelResult<Schema, Model, Options, O>
-            : DefaultModelResult<Schema, Model, Options>,
+            ? DefaultModelResult<Schema, Model, O, Options, false, false>
+            : DefaultModelResult<Schema, Model, undefined, Options, false, false>,
     Optional,
     Array
 >;
 
-export type SimplifiedModelResult<
+export type SimplifiedResult<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
-    Options extends ClientOptions<Schema>,
     Args = {},
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
     Optional = false,
     Array = false,
-> = Simplify<ModelResult<Schema, Model, Options, Args, Optional, Array>>;
+> = Simplify<ModelResult<Schema, Model, Args, Options, Optional, Array>>;
+
+export type SimplifiedPlainResult<
+    Schema extends SchemaDef,
+    Model extends GetModels<Schema>,
+    Args = {},
+    Options extends QueryOptions<Schema> = QueryOptions<Schema>,
+> = Simplify<ModelResult<Schema, Model, Args, Options, false, false>>;
 
 export type TypeDefResult<
     Schema extends SchemaDef,
diff --git a/packages/orm/src/client/crud/dialects/sqlite.ts b/packages/orm/src/client/crud/dialects/sqlite.ts
index 102d57252..3f0ae1dc6 100644
--- a/packages/orm/src/client/crud/dialects/sqlite.ts
+++ b/packages/orm/src/client/crud/dialects/sqlite.ts
@@ -380,7 +380,7 @@ export class SqliteCrudDialect<Schema extends SchemaDef> extends BaseCrudDialect
                         'SQLite "array_contains" only supports checking for a single value, not an array of values',
                     );
                 } else {
-                    return sql<any>`EXISTS (SELECT 1 FROM jsonb_each(${lhs}) WHERE value = ${value})`;
+                    return sql<any>`EXISTS (SELECT 1 FROM json_each(${lhs}) WHERE value = ${value})`;
                 }
             })
             .with('array_starts_with', () =>
@@ -398,7 +398,7 @@ export class SqliteCrudDialect<Schema extends SchemaDef> extends BaseCrudDialect
     ) {
         return this.eb.exists(
             this.eb
-                .selectFrom(this.eb.fn('jsonb_each', [receiver]).as('$items'))
+                .selectFrom(this.eb.fn('json_each', [receiver]).as('$items'))
                 .select(this.eb.lit(1).as('$t'))
                 .where(buildFilter(this.eb.ref('$items.value'))),
         );
diff --git a/packages/orm/src/client/options.ts b/packages/orm/src/client/options.ts
index ed2f95121..2ec330d0c 100644
--- a/packages/orm/src/client/options.ts
+++ b/packages/orm/src/client/options.ts
@@ -144,3 +144,13 @@ export type HasProcedures<Schema extends SchemaDef> = Schema extends {
 }
     ? true
     : false;
+
+/**
+ * Subset of client options relevant to query operations.
+ */
+export type QueryOptions<Schema extends SchemaDef> = Pick<ClientOptions<Schema>, 'omit'>;
+
+/**
+ * Extract QueryOptions from ClientOptions
+ */
+export type ToQueryOptions<T extends ClientOptions<any>> = Pick<T, 'omit'>;
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
index 6c77e09dc..875b5d668 100644
--- a/packages/plugins/policy/package.json
+++ b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 04853b153..788ea0be0 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index c2a123367..20657cb41 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/src/ts-schema-generator.ts b/packages/sdk/src/ts-schema-generator.ts
index 9620ca671..f68bb0bc6 100644
--- a/packages/sdk/src/ts-schema-generator.ts
+++ b/packages/sdk/src/ts-schema-generator.ts
@@ -1581,7 +1581,7 @@ export class TsSchemaGenerator {
                         ts.factory.createImportSpecifier(
                             false,
                             undefined,
-                            ts.factory.createIdentifier('ClientOptions as $ClientOptions'),
+                            ts.factory.createIdentifier('QueryOptions as $QueryOptions'),
                         ),
                     ]),
                 ),
@@ -1589,7 +1589,7 @@ export class TsSchemaGenerator {
             ),
         );
 
-        // generate: import { type SelectIncludeOmit as $SelectIncludeOmit, type SimplifiedModelResult as $SimplifiedModelResult } from '@zenstackhq/orm';
+        // generate: import { type SelectIncludeOmit as $SelectIncludeOmit, type SimplifiedPlainResult as $Result } from '@zenstackhq/orm';
         statements.push(
             ts.factory.createImportDeclaration(
                 undefined,
@@ -1600,7 +1600,7 @@ export class TsSchemaGenerator {
                         ts.factory.createImportSpecifier(
                             false,
                             undefined,
-                            ts.factory.createIdentifier('SimplifiedModelResult as $SimplifiedModelResult'),
+                            ts.factory.createIdentifier('SimplifiedPlainResult as $Result'),
                         ),
                         ts.factory.createImportSpecifier(
                             false,
@@ -1632,7 +1632,7 @@ export class TsSchemaGenerator {
                 );
             }
 
-            // generate: export type ModelGetPayload<Args extends $SelectIncludeOmit<Schema, Model, true>, Options extends ClientOptions<Schema>> = $SimplifiedModelResult<Schema, Model, Options, Args>;
+            // generate: export type ModelGetPayload<Args extends $SelectIncludeOmit<Schema, Model, true>, Options extends $QueryOptions<Schema>> = $Result<Schema, Model, Args, Options>;
             statements.push(
                 ts.factory.createTypeAliasDeclaration(
                     [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
@@ -1650,19 +1650,19 @@ export class TsSchemaGenerator {
                         ts.factory.createTypeParameterDeclaration(
                             undefined,
                             'Options',
-                            ts.factory.createTypeReferenceNode('$ClientOptions', [
+                            ts.factory.createTypeReferenceNode('$QueryOptions', [
                                 ts.factory.createTypeReferenceNode('$Schema'),
                             ]),
-                            ts.factory.createTypeReferenceNode('$ClientOptions', [
+                            ts.factory.createTypeReferenceNode('$QueryOptions', [
                                 ts.factory.createTypeReferenceNode('$Schema'),
                             ]),
                         ),
                     ],
-                    ts.factory.createTypeReferenceNode('$SimplifiedModelResult', [
+                    ts.factory.createTypeReferenceNode('$Result', [
                         ts.factory.createTypeReferenceNode('$Schema'),
                         ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(dm.name)),
-                        ts.factory.createTypeReferenceNode('Options'),
                         ts.factory.createTypeReferenceNode('Args'),
+                        ts.factory.createTypeReferenceNode('Options'),
                     ]),
                 ),
             );
diff --git a/packages/server/package.json b/packages/server/package.json
index 2f65b2e01..8795cf32f 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
index b507320d9..83dd5ae82 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
index 704d15d37..219355485 100644
--- a/packages/zod/package.json
+++ b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 686c2bc1d..8f85a60f4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -260,6 +260,9 @@ importers:
       '@types/react':
         specifier: 'catalog:'
         version: 19.2.0
+      '@zenstackhq/cli':
+        specifier: workspace:*
+        version: link:../../cli
       '@zenstackhq/eslint-config':
         specifier: workspace:*
         version: link:../../config/eslint-config
diff --git a/samples/next.js/package.json b/samples/next.js/package.json
index c675370ca..977f78a53 100644
--- a/samples/next.js/package.json
+++ b/samples/next.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "next.js",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "scripts": {
         "generate": "zen generate --lite",
diff --git a/samples/next.js/zenstack/input.ts b/samples/next.js/zenstack/input.ts
index 7d1c6dbee..b2cd96ee4 100644
--- a/samples/next.js/zenstack/input.ts
+++ b/samples/next.js/zenstack/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema-lite";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,4 +47,4 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
diff --git a/samples/orm/package.json b/samples/orm/package.json
index 30183276c..23a793223 100644
--- a/samples/orm/package.json
+++ b/samples/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/samples/orm/zenstack/input.ts b/samples/orm/zenstack/input.ts
index c5ead56dd..fcd198d49 100644
--- a/samples/orm/zenstack/input.ts
+++ b/samples/orm/zenstack/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -47,7 +47,7 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -67,4 +67,4 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
diff --git a/scripts/test-generate.ts b/scripts/test-generate.ts
index 4c94ef858..e799ecf45 100644
--- a/scripts/test-generate.ts
+++ b/scripts/test-generate.ts
@@ -7,18 +7,23 @@ const _dirname = typeof __dirname !== 'undefined' ? __dirname : path.dirname(fil
 
 async function main() {
     const baseDir = process.argv[2] || '.';
+    const options = process.argv.slice(3);
 
     const zmodelFiles = [...glob.sync(path.resolve(baseDir, '**/schema.zmodel'), { ignore: '**/node_modules/**' })];
     for (const file of zmodelFiles) {
-        console.log(`Generating TS schema for: ${file}`);
-        await generate(file);
+        console.log(
+            `Generating TS schema for: ${file}${options.length > 0 ? ` with options: ${options.join(' ')}` : ''}`,
+        );
+        await generate(file, options);
     }
 }
 
-async function generate(schemaPath: string) {
+async function generate(schemaPath: string, options: string[]) {
     const cliPath = path.join(_dirname, '../packages/cli/dist/index.js');
     const RUNTIME = process.env.RUNTIME ?? 'node';
-    execSync(`${RUNTIME} ${cliPath} generate --schema ${schemaPath}`, { cwd: path.dirname(schemaPath) });
+    execSync(`${RUNTIME} ${cliPath} generate --schema ${schemaPath} ${options.join(' ')}`, {
+        cwd: path.dirname(schemaPath),
+    });
 }
 
 main();
diff --git a/tests/e2e/apps/rally/zenstack/input.ts b/tests/e2e/apps/rally/zenstack/input.ts
index fcb5ede67..27012a3f3 100644
--- a/tests/e2e/apps/rally/zenstack/input.ts
+++ b/tests/e2e/apps/rally/zenstack/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type AccountFindManyArgs = $FindManyArgs<$Schema, "Account">;
 export type AccountFindUniqueArgs = $FindUniqueArgs<$Schema, "Account">;
 export type AccountFindFirstArgs = $FindFirstArgs<$Schema, "Account">;
@@ -27,7 +27,7 @@ export type AccountWhereInput = $WhereInput<$Schema, "Account">;
 export type AccountSelect = $SelectInput<$Schema, "Account">;
 export type AccountInclude = $IncludeInput<$Schema, "Account">;
 export type AccountOmit = $OmitInput<$Schema, "Account">;
-export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Account", Options, Args>;
+export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Account", Args, Options>;
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -47,7 +47,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type VerificationTokenFindManyArgs = $FindManyArgs<$Schema, "VerificationToken">;
 export type VerificationTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "VerificationToken">;
 export type VerificationTokenFindFirstArgs = $FindFirstArgs<$Schema, "VerificationToken">;
@@ -67,7 +67,7 @@ export type VerificationTokenWhereInput = $WhereInput<$Schema, "VerificationToke
 export type VerificationTokenSelect = $SelectInput<$Schema, "VerificationToken">;
 export type VerificationTokenInclude = $IncludeInput<$Schema, "VerificationToken">;
 export type VerificationTokenOmit = $OmitInput<$Schema, "VerificationToken">;
-export type VerificationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerificationToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "VerificationToken", Options, Args>;
+export type VerificationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerificationToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "VerificationToken", Args, Options>;
 export type SessionFindManyArgs = $FindManyArgs<$Schema, "Session">;
 export type SessionFindUniqueArgs = $FindUniqueArgs<$Schema, "Session">;
 export type SessionFindFirstArgs = $FindFirstArgs<$Schema, "Session">;
@@ -87,7 +87,7 @@ export type SessionWhereInput = $WhereInput<$Schema, "Session">;
 export type SessionSelect = $SelectInput<$Schema, "Session">;
 export type SessionInclude = $IncludeInput<$Schema, "Session">;
 export type SessionOmit = $OmitInput<$Schema, "Session">;
-export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Session", Options, Args>;
+export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Session", Args, Options>;
 export type VerificationFindManyArgs = $FindManyArgs<$Schema, "Verification">;
 export type VerificationFindUniqueArgs = $FindUniqueArgs<$Schema, "Verification">;
 export type VerificationFindFirstArgs = $FindFirstArgs<$Schema, "Verification">;
@@ -107,7 +107,7 @@ export type VerificationWhereInput = $WhereInput<$Schema, "Verification">;
 export type VerificationSelect = $SelectInput<$Schema, "Verification">;
 export type VerificationInclude = $IncludeInput<$Schema, "Verification">;
 export type VerificationOmit = $OmitInput<$Schema, "Verification">;
-export type VerificationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Verification", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Verification", Options, Args>;
+export type VerificationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Verification", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Verification", Args, Options>;
 export type PollFindManyArgs = $FindManyArgs<$Schema, "Poll">;
 export type PollFindUniqueArgs = $FindUniqueArgs<$Schema, "Poll">;
 export type PollFindFirstArgs = $FindFirstArgs<$Schema, "Poll">;
@@ -127,7 +127,7 @@ export type PollWhereInput = $WhereInput<$Schema, "Poll">;
 export type PollSelect = $SelectInput<$Schema, "Poll">;
 export type PollInclude = $IncludeInput<$Schema, "Poll">;
 export type PollOmit = $OmitInput<$Schema, "Poll">;
-export type PollGetPayload<Args extends $SelectIncludeOmit<$Schema, "Poll", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Poll", Options, Args>;
+export type PollGetPayload<Args extends $SelectIncludeOmit<$Schema, "Poll", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Poll", Args, Options>;
 export type WatcherFindManyArgs = $FindManyArgs<$Schema, "Watcher">;
 export type WatcherFindUniqueArgs = $FindUniqueArgs<$Schema, "Watcher">;
 export type WatcherFindFirstArgs = $FindFirstArgs<$Schema, "Watcher">;
@@ -147,7 +147,7 @@ export type WatcherWhereInput = $WhereInput<$Schema, "Watcher">;
 export type WatcherSelect = $SelectInput<$Schema, "Watcher">;
 export type WatcherInclude = $IncludeInput<$Schema, "Watcher">;
 export type WatcherOmit = $OmitInput<$Schema, "Watcher">;
-export type WatcherGetPayload<Args extends $SelectIncludeOmit<$Schema, "Watcher", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Watcher", Options, Args>;
+export type WatcherGetPayload<Args extends $SelectIncludeOmit<$Schema, "Watcher", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Watcher", Args, Options>;
 export type ParticipantFindManyArgs = $FindManyArgs<$Schema, "Participant">;
 export type ParticipantFindUniqueArgs = $FindUniqueArgs<$Schema, "Participant">;
 export type ParticipantFindFirstArgs = $FindFirstArgs<$Schema, "Participant">;
@@ -167,7 +167,7 @@ export type ParticipantWhereInput = $WhereInput<$Schema, "Participant">;
 export type ParticipantSelect = $SelectInput<$Schema, "Participant">;
 export type ParticipantInclude = $IncludeInput<$Schema, "Participant">;
 export type ParticipantOmit = $OmitInput<$Schema, "Participant">;
-export type ParticipantGetPayload<Args extends $SelectIncludeOmit<$Schema, "Participant", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Participant", Options, Args>;
+export type ParticipantGetPayload<Args extends $SelectIncludeOmit<$Schema, "Participant", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Participant", Args, Options>;
 export type OptionFindManyArgs = $FindManyArgs<$Schema, "Option">;
 export type OptionFindUniqueArgs = $FindUniqueArgs<$Schema, "Option">;
 export type OptionFindFirstArgs = $FindFirstArgs<$Schema, "Option">;
@@ -187,7 +187,7 @@ export type OptionWhereInput = $WhereInput<$Schema, "Option">;
 export type OptionSelect = $SelectInput<$Schema, "Option">;
 export type OptionInclude = $IncludeInput<$Schema, "Option">;
 export type OptionOmit = $OmitInput<$Schema, "Option">;
-export type OptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Option", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Option", Options, Args>;
+export type OptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Option", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Option", Args, Options>;
 export type VoteFindManyArgs = $FindManyArgs<$Schema, "Vote">;
 export type VoteFindUniqueArgs = $FindUniqueArgs<$Schema, "Vote">;
 export type VoteFindFirstArgs = $FindFirstArgs<$Schema, "Vote">;
@@ -207,7 +207,7 @@ export type VoteWhereInput = $WhereInput<$Schema, "Vote">;
 export type VoteSelect = $SelectInput<$Schema, "Vote">;
 export type VoteInclude = $IncludeInput<$Schema, "Vote">;
 export type VoteOmit = $OmitInput<$Schema, "Vote">;
-export type VoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "Vote", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Vote", Options, Args>;
+export type VoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "Vote", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Vote", Args, Options>;
 export type CommentFindManyArgs = $FindManyArgs<$Schema, "Comment">;
 export type CommentFindUniqueArgs = $FindUniqueArgs<$Schema, "Comment">;
 export type CommentFindFirstArgs = $FindFirstArgs<$Schema, "Comment">;
@@ -227,7 +227,7 @@ export type CommentWhereInput = $WhereInput<$Schema, "Comment">;
 export type CommentSelect = $SelectInput<$Schema, "Comment">;
 export type CommentInclude = $IncludeInput<$Schema, "Comment">;
 export type CommentOmit = $OmitInput<$Schema, "Comment">;
-export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Comment", Options, Args>;
+export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Comment", Args, Options>;
 export type PollViewFindManyArgs = $FindManyArgs<$Schema, "PollView">;
 export type PollViewFindUniqueArgs = $FindUniqueArgs<$Schema, "PollView">;
 export type PollViewFindFirstArgs = $FindFirstArgs<$Schema, "PollView">;
@@ -247,7 +247,7 @@ export type PollViewWhereInput = $WhereInput<$Schema, "PollView">;
 export type PollViewSelect = $SelectInput<$Schema, "PollView">;
 export type PollViewInclude = $IncludeInput<$Schema, "PollView">;
 export type PollViewOmit = $OmitInput<$Schema, "PollView">;
-export type PollViewGetPayload<Args extends $SelectIncludeOmit<$Schema, "PollView", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PollView", Options, Args>;
+export type PollViewGetPayload<Args extends $SelectIncludeOmit<$Schema, "PollView", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PollView", Args, Options>;
 export type SpaceFindManyArgs = $FindManyArgs<$Schema, "Space">;
 export type SpaceFindUniqueArgs = $FindUniqueArgs<$Schema, "Space">;
 export type SpaceFindFirstArgs = $FindFirstArgs<$Schema, "Space">;
@@ -267,7 +267,7 @@ export type SpaceWhereInput = $WhereInput<$Schema, "Space">;
 export type SpaceSelect = $SelectInput<$Schema, "Space">;
 export type SpaceInclude = $IncludeInput<$Schema, "Space">;
 export type SpaceOmit = $OmitInput<$Schema, "Space">;
-export type SpaceGetPayload<Args extends $SelectIncludeOmit<$Schema, "Space", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Space", Options, Args>;
+export type SpaceGetPayload<Args extends $SelectIncludeOmit<$Schema, "Space", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Space", Args, Options>;
 export type SpaceMemberFindManyArgs = $FindManyArgs<$Schema, "SpaceMember">;
 export type SpaceMemberFindUniqueArgs = $FindUniqueArgs<$Schema, "SpaceMember">;
 export type SpaceMemberFindFirstArgs = $FindFirstArgs<$Schema, "SpaceMember">;
@@ -287,7 +287,7 @@ export type SpaceMemberWhereInput = $WhereInput<$Schema, "SpaceMember">;
 export type SpaceMemberSelect = $SelectInput<$Schema, "SpaceMember">;
 export type SpaceMemberInclude = $IncludeInput<$Schema, "SpaceMember">;
 export type SpaceMemberOmit = $OmitInput<$Schema, "SpaceMember">;
-export type SpaceMemberGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceMember", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SpaceMember", Options, Args>;
+export type SpaceMemberGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceMember", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SpaceMember", Args, Options>;
 export type SpaceMemberInviteFindManyArgs = $FindManyArgs<$Schema, "SpaceMemberInvite">;
 export type SpaceMemberInviteFindUniqueArgs = $FindUniqueArgs<$Schema, "SpaceMemberInvite">;
 export type SpaceMemberInviteFindFirstArgs = $FindFirstArgs<$Schema, "SpaceMemberInvite">;
@@ -307,7 +307,7 @@ export type SpaceMemberInviteWhereInput = $WhereInput<$Schema, "SpaceMemberInvit
 export type SpaceMemberInviteSelect = $SelectInput<$Schema, "SpaceMemberInvite">;
 export type SpaceMemberInviteInclude = $IncludeInput<$Schema, "SpaceMemberInvite">;
 export type SpaceMemberInviteOmit = $OmitInput<$Schema, "SpaceMemberInvite">;
-export type SpaceMemberInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceMemberInvite", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SpaceMemberInvite", Options, Args>;
+export type SpaceMemberInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceMemberInvite", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SpaceMemberInvite", Args, Options>;
 export type SubscriptionFindManyArgs = $FindManyArgs<$Schema, "Subscription">;
 export type SubscriptionFindUniqueArgs = $FindUniqueArgs<$Schema, "Subscription">;
 export type SubscriptionFindFirstArgs = $FindFirstArgs<$Schema, "Subscription">;
@@ -327,7 +327,7 @@ export type SubscriptionWhereInput = $WhereInput<$Schema, "Subscription">;
 export type SubscriptionSelect = $SelectInput<$Schema, "Subscription">;
 export type SubscriptionInclude = $IncludeInput<$Schema, "Subscription">;
 export type SubscriptionOmit = $OmitInput<$Schema, "Subscription">;
-export type SubscriptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Subscription", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Subscription", Options, Args>;
+export type SubscriptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Subscription", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Subscription", Args, Options>;
 export type PaymentMethodFindManyArgs = $FindManyArgs<$Schema, "PaymentMethod">;
 export type PaymentMethodFindUniqueArgs = $FindUniqueArgs<$Schema, "PaymentMethod">;
 export type PaymentMethodFindFirstArgs = $FindFirstArgs<$Schema, "PaymentMethod">;
@@ -347,7 +347,7 @@ export type PaymentMethodWhereInput = $WhereInput<$Schema, "PaymentMethod">;
 export type PaymentMethodSelect = $SelectInput<$Schema, "PaymentMethod">;
 export type PaymentMethodInclude = $IncludeInput<$Schema, "PaymentMethod">;
 export type PaymentMethodOmit = $OmitInput<$Schema, "PaymentMethod">;
-export type PaymentMethodGetPayload<Args extends $SelectIncludeOmit<$Schema, "PaymentMethod", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PaymentMethod", Options, Args>;
+export type PaymentMethodGetPayload<Args extends $SelectIncludeOmit<$Schema, "PaymentMethod", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PaymentMethod", Args, Options>;
 export type ScheduledEventFindManyArgs = $FindManyArgs<$Schema, "ScheduledEvent">;
 export type ScheduledEventFindUniqueArgs = $FindUniqueArgs<$Schema, "ScheduledEvent">;
 export type ScheduledEventFindFirstArgs = $FindFirstArgs<$Schema, "ScheduledEvent">;
@@ -367,7 +367,7 @@ export type ScheduledEventWhereInput = $WhereInput<$Schema, "ScheduledEvent">;
 export type ScheduledEventSelect = $SelectInput<$Schema, "ScheduledEvent">;
 export type ScheduledEventInclude = $IncludeInput<$Schema, "ScheduledEvent">;
 export type ScheduledEventOmit = $OmitInput<$Schema, "ScheduledEvent">;
-export type ScheduledEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "ScheduledEvent", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ScheduledEvent", Options, Args>;
+export type ScheduledEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "ScheduledEvent", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ScheduledEvent", Args, Options>;
 export type RescheduledEventDateFindManyArgs = $FindManyArgs<$Schema, "RescheduledEventDate">;
 export type RescheduledEventDateFindUniqueArgs = $FindUniqueArgs<$Schema, "RescheduledEventDate">;
 export type RescheduledEventDateFindFirstArgs = $FindFirstArgs<$Schema, "RescheduledEventDate">;
@@ -387,7 +387,7 @@ export type RescheduledEventDateWhereInput = $WhereInput<$Schema, "RescheduledEv
 export type RescheduledEventDateSelect = $SelectInput<$Schema, "RescheduledEventDate">;
 export type RescheduledEventDateInclude = $IncludeInput<$Schema, "RescheduledEventDate">;
 export type RescheduledEventDateOmit = $OmitInput<$Schema, "RescheduledEventDate">;
-export type RescheduledEventDateGetPayload<Args extends $SelectIncludeOmit<$Schema, "RescheduledEventDate", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RescheduledEventDate", Options, Args>;
+export type RescheduledEventDateGetPayload<Args extends $SelectIncludeOmit<$Schema, "RescheduledEventDate", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RescheduledEventDate", Args, Options>;
 export type ScheduledEventInviteFindManyArgs = $FindManyArgs<$Schema, "ScheduledEventInvite">;
 export type ScheduledEventInviteFindUniqueArgs = $FindUniqueArgs<$Schema, "ScheduledEventInvite">;
 export type ScheduledEventInviteFindFirstArgs = $FindFirstArgs<$Schema, "ScheduledEventInvite">;
@@ -407,7 +407,7 @@ export type ScheduledEventInviteWhereInput = $WhereInput<$Schema, "ScheduledEven
 export type ScheduledEventInviteSelect = $SelectInput<$Schema, "ScheduledEventInvite">;
 export type ScheduledEventInviteInclude = $IncludeInput<$Schema, "ScheduledEventInvite">;
 export type ScheduledEventInviteOmit = $OmitInput<$Schema, "ScheduledEventInvite">;
-export type ScheduledEventInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "ScheduledEventInvite", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ScheduledEventInvite", Options, Args>;
+export type ScheduledEventInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "ScheduledEventInvite", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ScheduledEventInvite", Args, Options>;
 export type CredentialFindManyArgs = $FindManyArgs<$Schema, "Credential">;
 export type CredentialFindUniqueArgs = $FindUniqueArgs<$Schema, "Credential">;
 export type CredentialFindFirstArgs = $FindFirstArgs<$Schema, "Credential">;
@@ -427,7 +427,7 @@ export type CredentialWhereInput = $WhereInput<$Schema, "Credential">;
 export type CredentialSelect = $SelectInput<$Schema, "Credential">;
 export type CredentialInclude = $IncludeInput<$Schema, "Credential">;
 export type CredentialOmit = $OmitInput<$Schema, "Credential">;
-export type CredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "Credential", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Credential", Options, Args>;
+export type CredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "Credential", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Credential", Args, Options>;
 export type CalendarConnectionFindManyArgs = $FindManyArgs<$Schema, "CalendarConnection">;
 export type CalendarConnectionFindUniqueArgs = $FindUniqueArgs<$Schema, "CalendarConnection">;
 export type CalendarConnectionFindFirstArgs = $FindFirstArgs<$Schema, "CalendarConnection">;
@@ -447,7 +447,7 @@ export type CalendarConnectionWhereInput = $WhereInput<$Schema, "CalendarConnect
 export type CalendarConnectionSelect = $SelectInput<$Schema, "CalendarConnection">;
 export type CalendarConnectionInclude = $IncludeInput<$Schema, "CalendarConnection">;
 export type CalendarConnectionOmit = $OmitInput<$Schema, "CalendarConnection">;
-export type CalendarConnectionGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalendarConnection", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CalendarConnection", Options, Args>;
+export type CalendarConnectionGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalendarConnection", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CalendarConnection", Args, Options>;
 export type ProviderCalendarFindManyArgs = $FindManyArgs<$Schema, "ProviderCalendar">;
 export type ProviderCalendarFindUniqueArgs = $FindUniqueArgs<$Schema, "ProviderCalendar">;
 export type ProviderCalendarFindFirstArgs = $FindFirstArgs<$Schema, "ProviderCalendar">;
@@ -467,7 +467,7 @@ export type ProviderCalendarWhereInput = $WhereInput<$Schema, "ProviderCalendar"
 export type ProviderCalendarSelect = $SelectInput<$Schema, "ProviderCalendar">;
 export type ProviderCalendarInclude = $IncludeInput<$Schema, "ProviderCalendar">;
 export type ProviderCalendarOmit = $OmitInput<$Schema, "ProviderCalendar">;
-export type ProviderCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProviderCalendar", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ProviderCalendar", Options, Args>;
+export type ProviderCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProviderCalendar", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ProviderCalendar", Args, Options>;
 export type InstanceSettingsFindManyArgs = $FindManyArgs<$Schema, "InstanceSettings">;
 export type InstanceSettingsFindUniqueArgs = $FindUniqueArgs<$Schema, "InstanceSettings">;
 export type InstanceSettingsFindFirstArgs = $FindFirstArgs<$Schema, "InstanceSettings">;
@@ -487,7 +487,7 @@ export type InstanceSettingsWhereInput = $WhereInput<$Schema, "InstanceSettings"
 export type InstanceSettingsSelect = $SelectInput<$Schema, "InstanceSettings">;
 export type InstanceSettingsInclude = $IncludeInput<$Schema, "InstanceSettings">;
 export type InstanceSettingsOmit = $OmitInput<$Schema, "InstanceSettings">;
-export type InstanceSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstanceSettings", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "InstanceSettings", Options, Args>;
+export type InstanceSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstanceSettings", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "InstanceSettings", Args, Options>;
 export type LicenseFindManyArgs = $FindManyArgs<$Schema, "License">;
 export type LicenseFindUniqueArgs = $FindUniqueArgs<$Schema, "License">;
 export type LicenseFindFirstArgs = $FindFirstArgs<$Schema, "License">;
@@ -507,7 +507,7 @@ export type LicenseWhereInput = $WhereInput<$Schema, "License">;
 export type LicenseSelect = $SelectInput<$Schema, "License">;
 export type LicenseInclude = $IncludeInput<$Schema, "License">;
 export type LicenseOmit = $OmitInput<$Schema, "License">;
-export type LicenseGetPayload<Args extends $SelectIncludeOmit<$Schema, "License", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "License", Options, Args>;
+export type LicenseGetPayload<Args extends $SelectIncludeOmit<$Schema, "License", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "License", Args, Options>;
 export type LicenseValidationFindManyArgs = $FindManyArgs<$Schema, "LicenseValidation">;
 export type LicenseValidationFindUniqueArgs = $FindUniqueArgs<$Schema, "LicenseValidation">;
 export type LicenseValidationFindFirstArgs = $FindFirstArgs<$Schema, "LicenseValidation">;
@@ -527,7 +527,7 @@ export type LicenseValidationWhereInput = $WhereInput<$Schema, "LicenseValidatio
 export type LicenseValidationSelect = $SelectInput<$Schema, "LicenseValidation">;
 export type LicenseValidationInclude = $IncludeInput<$Schema, "LicenseValidation">;
 export type LicenseValidationOmit = $OmitInput<$Schema, "LicenseValidation">;
-export type LicenseValidationGetPayload<Args extends $SelectIncludeOmit<$Schema, "LicenseValidation", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "LicenseValidation", Options, Args>;
+export type LicenseValidationGetPayload<Args extends $SelectIncludeOmit<$Schema, "LicenseValidation", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "LicenseValidation", Args, Options>;
 export type InstanceLicenseFindManyArgs = $FindManyArgs<$Schema, "InstanceLicense">;
 export type InstanceLicenseFindUniqueArgs = $FindUniqueArgs<$Schema, "InstanceLicense">;
 export type InstanceLicenseFindFirstArgs = $FindFirstArgs<$Schema, "InstanceLicense">;
@@ -547,4 +547,4 @@ export type InstanceLicenseWhereInput = $WhereInput<$Schema, "InstanceLicense">;
 export type InstanceLicenseSelect = $SelectInput<$Schema, "InstanceLicense">;
 export type InstanceLicenseInclude = $IncludeInput<$Schema, "InstanceLicense">;
 export type InstanceLicenseOmit = $OmitInput<$Schema, "InstanceLicense">;
-export type InstanceLicenseGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstanceLicense", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "InstanceLicense", Options, Args>;
+export type InstanceLicenseGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstanceLicense", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "InstanceLicense", Args, Options>;
diff --git a/tests/e2e/github-repos/cal.com/input.ts b/tests/e2e/github-repos/cal.com/input.ts
index 0ed661f72..85584068b 100644
--- a/tests/e2e/github-repos/cal.com/input.ts
+++ b/tests/e2e/github-repos/cal.com/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type HostFindManyArgs = $FindManyArgs<$Schema, "Host">;
 export type HostFindUniqueArgs = $FindUniqueArgs<$Schema, "Host">;
 export type HostFindFirstArgs = $FindFirstArgs<$Schema, "Host">;
@@ -27,7 +27,7 @@ export type HostWhereInput = $WhereInput<$Schema, "Host">;
 export type HostSelect = $SelectInput<$Schema, "Host">;
 export type HostInclude = $IncludeInput<$Schema, "Host">;
 export type HostOmit = $OmitInput<$Schema, "Host">;
-export type HostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Host", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Host", Options, Args>;
+export type HostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Host", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Host", Args, Options>;
 export type CalVideoSettingsFindManyArgs = $FindManyArgs<$Schema, "CalVideoSettings">;
 export type CalVideoSettingsFindUniqueArgs = $FindUniqueArgs<$Schema, "CalVideoSettings">;
 export type CalVideoSettingsFindFirstArgs = $FindFirstArgs<$Schema, "CalVideoSettings">;
@@ -47,7 +47,7 @@ export type CalVideoSettingsWhereInput = $WhereInput<$Schema, "CalVideoSettings"
 export type CalVideoSettingsSelect = $SelectInput<$Schema, "CalVideoSettings">;
 export type CalVideoSettingsInclude = $IncludeInput<$Schema, "CalVideoSettings">;
 export type CalVideoSettingsOmit = $OmitInput<$Schema, "CalVideoSettings">;
-export type CalVideoSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalVideoSettings", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CalVideoSettings", Options, Args>;
+export type CalVideoSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalVideoSettings", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CalVideoSettings", Args, Options>;
 export type EventTypeFindManyArgs = $FindManyArgs<$Schema, "EventType">;
 export type EventTypeFindUniqueArgs = $FindUniqueArgs<$Schema, "EventType">;
 export type EventTypeFindFirstArgs = $FindFirstArgs<$Schema, "EventType">;
@@ -67,7 +67,7 @@ export type EventTypeWhereInput = $WhereInput<$Schema, "EventType">;
 export type EventTypeSelect = $SelectInput<$Schema, "EventType">;
 export type EventTypeInclude = $IncludeInput<$Schema, "EventType">;
 export type EventTypeOmit = $OmitInput<$Schema, "EventType">;
-export type EventTypeGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventType", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "EventType", Options, Args>;
+export type EventTypeGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventType", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "EventType", Args, Options>;
 export type CredentialFindManyArgs = $FindManyArgs<$Schema, "Credential">;
 export type CredentialFindUniqueArgs = $FindUniqueArgs<$Schema, "Credential">;
 export type CredentialFindFirstArgs = $FindFirstArgs<$Schema, "Credential">;
@@ -87,7 +87,7 @@ export type CredentialWhereInput = $WhereInput<$Schema, "Credential">;
 export type CredentialSelect = $SelectInput<$Schema, "Credential">;
 export type CredentialInclude = $IncludeInput<$Schema, "Credential">;
 export type CredentialOmit = $OmitInput<$Schema, "Credential">;
-export type CredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "Credential", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Credential", Options, Args>;
+export type CredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "Credential", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Credential", Args, Options>;
 export type DestinationCalendarFindManyArgs = $FindManyArgs<$Schema, "DestinationCalendar">;
 export type DestinationCalendarFindUniqueArgs = $FindUniqueArgs<$Schema, "DestinationCalendar">;
 export type DestinationCalendarFindFirstArgs = $FindFirstArgs<$Schema, "DestinationCalendar">;
@@ -107,7 +107,7 @@ export type DestinationCalendarWhereInput = $WhereInput<$Schema, "DestinationCal
 export type DestinationCalendarSelect = $SelectInput<$Schema, "DestinationCalendar">;
 export type DestinationCalendarInclude = $IncludeInput<$Schema, "DestinationCalendar">;
 export type DestinationCalendarOmit = $OmitInput<$Schema, "DestinationCalendar">;
-export type DestinationCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "DestinationCalendar", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DestinationCalendar", Options, Args>;
+export type DestinationCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "DestinationCalendar", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DestinationCalendar", Args, Options>;
 export type UserPasswordFindManyArgs = $FindManyArgs<$Schema, "UserPassword">;
 export type UserPasswordFindUniqueArgs = $FindUniqueArgs<$Schema, "UserPassword">;
 export type UserPasswordFindFirstArgs = $FindFirstArgs<$Schema, "UserPassword">;
@@ -127,7 +127,7 @@ export type UserPasswordWhereInput = $WhereInput<$Schema, "UserPassword">;
 export type UserPasswordSelect = $SelectInput<$Schema, "UserPassword">;
 export type UserPasswordInclude = $IncludeInput<$Schema, "UserPassword">;
 export type UserPasswordOmit = $OmitInput<$Schema, "UserPassword">;
-export type UserPasswordGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserPassword", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "UserPassword", Options, Args>;
+export type UserPasswordGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserPassword", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "UserPassword", Args, Options>;
 export type TravelScheduleFindManyArgs = $FindManyArgs<$Schema, "TravelSchedule">;
 export type TravelScheduleFindUniqueArgs = $FindUniqueArgs<$Schema, "TravelSchedule">;
 export type TravelScheduleFindFirstArgs = $FindFirstArgs<$Schema, "TravelSchedule">;
@@ -147,7 +147,7 @@ export type TravelScheduleWhereInput = $WhereInput<$Schema, "TravelSchedule">;
 export type TravelScheduleSelect = $SelectInput<$Schema, "TravelSchedule">;
 export type TravelScheduleInclude = $IncludeInput<$Schema, "TravelSchedule">;
 export type TravelScheduleOmit = $OmitInput<$Schema, "TravelSchedule">;
-export type TravelScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "TravelSchedule", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TravelSchedule", Options, Args>;
+export type TravelScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "TravelSchedule", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TravelSchedule", Args, Options>;
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -167,7 +167,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type NotificationsSubscriptionsFindManyArgs = $FindManyArgs<$Schema, "NotificationsSubscriptions">;
 export type NotificationsSubscriptionsFindUniqueArgs = $FindUniqueArgs<$Schema, "NotificationsSubscriptions">;
 export type NotificationsSubscriptionsFindFirstArgs = $FindFirstArgs<$Schema, "NotificationsSubscriptions">;
@@ -187,7 +187,7 @@ export type NotificationsSubscriptionsWhereInput = $WhereInput<$Schema, "Notific
 export type NotificationsSubscriptionsSelect = $SelectInput<$Schema, "NotificationsSubscriptions">;
 export type NotificationsSubscriptionsInclude = $IncludeInput<$Schema, "NotificationsSubscriptions">;
 export type NotificationsSubscriptionsOmit = $OmitInput<$Schema, "NotificationsSubscriptions">;
-export type NotificationsSubscriptionsGetPayload<Args extends $SelectIncludeOmit<$Schema, "NotificationsSubscriptions", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "NotificationsSubscriptions", Options, Args>;
+export type NotificationsSubscriptionsGetPayload<Args extends $SelectIncludeOmit<$Schema, "NotificationsSubscriptions", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "NotificationsSubscriptions", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -207,7 +207,7 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
 export type TeamFindManyArgs = $FindManyArgs<$Schema, "Team">;
 export type TeamFindUniqueArgs = $FindUniqueArgs<$Schema, "Team">;
 export type TeamFindFirstArgs = $FindFirstArgs<$Schema, "Team">;
@@ -227,7 +227,7 @@ export type TeamWhereInput = $WhereInput<$Schema, "Team">;
 export type TeamSelect = $SelectInput<$Schema, "Team">;
 export type TeamInclude = $IncludeInput<$Schema, "Team">;
 export type TeamOmit = $OmitInput<$Schema, "Team">;
-export type TeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "Team", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Team", Options, Args>;
+export type TeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "Team", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Team", Args, Options>;
 export type CreditBalanceFindManyArgs = $FindManyArgs<$Schema, "CreditBalance">;
 export type CreditBalanceFindUniqueArgs = $FindUniqueArgs<$Schema, "CreditBalance">;
 export type CreditBalanceFindFirstArgs = $FindFirstArgs<$Schema, "CreditBalance">;
@@ -247,7 +247,7 @@ export type CreditBalanceWhereInput = $WhereInput<$Schema, "CreditBalance">;
 export type CreditBalanceSelect = $SelectInput<$Schema, "CreditBalance">;
 export type CreditBalanceInclude = $IncludeInput<$Schema, "CreditBalance">;
 export type CreditBalanceOmit = $OmitInput<$Schema, "CreditBalance">;
-export type CreditBalanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditBalance", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CreditBalance", Options, Args>;
+export type CreditBalanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditBalance", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CreditBalance", Args, Options>;
 export type CreditPurchaseLogFindManyArgs = $FindManyArgs<$Schema, "CreditPurchaseLog">;
 export type CreditPurchaseLogFindUniqueArgs = $FindUniqueArgs<$Schema, "CreditPurchaseLog">;
 export type CreditPurchaseLogFindFirstArgs = $FindFirstArgs<$Schema, "CreditPurchaseLog">;
@@ -267,7 +267,7 @@ export type CreditPurchaseLogWhereInput = $WhereInput<$Schema, "CreditPurchaseLo
 export type CreditPurchaseLogSelect = $SelectInput<$Schema, "CreditPurchaseLog">;
 export type CreditPurchaseLogInclude = $IncludeInput<$Schema, "CreditPurchaseLog">;
 export type CreditPurchaseLogOmit = $OmitInput<$Schema, "CreditPurchaseLog">;
-export type CreditPurchaseLogGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditPurchaseLog", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CreditPurchaseLog", Options, Args>;
+export type CreditPurchaseLogGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditPurchaseLog", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CreditPurchaseLog", Args, Options>;
 export type CreditExpenseLogFindManyArgs = $FindManyArgs<$Schema, "CreditExpenseLog">;
 export type CreditExpenseLogFindUniqueArgs = $FindUniqueArgs<$Schema, "CreditExpenseLog">;
 export type CreditExpenseLogFindFirstArgs = $FindFirstArgs<$Schema, "CreditExpenseLog">;
@@ -287,7 +287,7 @@ export type CreditExpenseLogWhereInput = $WhereInput<$Schema, "CreditExpenseLog"
 export type CreditExpenseLogSelect = $SelectInput<$Schema, "CreditExpenseLog">;
 export type CreditExpenseLogInclude = $IncludeInput<$Schema, "CreditExpenseLog">;
 export type CreditExpenseLogOmit = $OmitInput<$Schema, "CreditExpenseLog">;
-export type CreditExpenseLogGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditExpenseLog", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CreditExpenseLog", Options, Args>;
+export type CreditExpenseLogGetPayload<Args extends $SelectIncludeOmit<$Schema, "CreditExpenseLog", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CreditExpenseLog", Args, Options>;
 export type OrganizationSettingsFindManyArgs = $FindManyArgs<$Schema, "OrganizationSettings">;
 export type OrganizationSettingsFindUniqueArgs = $FindUniqueArgs<$Schema, "OrganizationSettings">;
 export type OrganizationSettingsFindFirstArgs = $FindFirstArgs<$Schema, "OrganizationSettings">;
@@ -307,7 +307,7 @@ export type OrganizationSettingsWhereInput = $WhereInput<$Schema, "OrganizationS
 export type OrganizationSettingsSelect = $SelectInput<$Schema, "OrganizationSettings">;
 export type OrganizationSettingsInclude = $IncludeInput<$Schema, "OrganizationSettings">;
 export type OrganizationSettingsOmit = $OmitInput<$Schema, "OrganizationSettings">;
-export type OrganizationSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationSettings", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OrganizationSettings", Options, Args>;
+export type OrganizationSettingsGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationSettings", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OrganizationSettings", Args, Options>;
 export type MembershipFindManyArgs = $FindManyArgs<$Schema, "Membership">;
 export type MembershipFindUniqueArgs = $FindUniqueArgs<$Schema, "Membership">;
 export type MembershipFindFirstArgs = $FindFirstArgs<$Schema, "Membership">;
@@ -327,7 +327,7 @@ export type MembershipWhereInput = $WhereInput<$Schema, "Membership">;
 export type MembershipSelect = $SelectInput<$Schema, "Membership">;
 export type MembershipInclude = $IncludeInput<$Schema, "Membership">;
 export type MembershipOmit = $OmitInput<$Schema, "Membership">;
-export type MembershipGetPayload<Args extends $SelectIncludeOmit<$Schema, "Membership", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Membership", Options, Args>;
+export type MembershipGetPayload<Args extends $SelectIncludeOmit<$Schema, "Membership", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Membership", Args, Options>;
 export type VerificationTokenFindManyArgs = $FindManyArgs<$Schema, "VerificationToken">;
 export type VerificationTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "VerificationToken">;
 export type VerificationTokenFindFirstArgs = $FindFirstArgs<$Schema, "VerificationToken">;
@@ -347,7 +347,7 @@ export type VerificationTokenWhereInput = $WhereInput<$Schema, "VerificationToke
 export type VerificationTokenSelect = $SelectInput<$Schema, "VerificationToken">;
 export type VerificationTokenInclude = $IncludeInput<$Schema, "VerificationToken">;
 export type VerificationTokenOmit = $OmitInput<$Schema, "VerificationToken">;
-export type VerificationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerificationToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "VerificationToken", Options, Args>;
+export type VerificationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerificationToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "VerificationToken", Args, Options>;
 export type InstantMeetingTokenFindManyArgs = $FindManyArgs<$Schema, "InstantMeetingToken">;
 export type InstantMeetingTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "InstantMeetingToken">;
 export type InstantMeetingTokenFindFirstArgs = $FindFirstArgs<$Schema, "InstantMeetingToken">;
@@ -367,7 +367,7 @@ export type InstantMeetingTokenWhereInput = $WhereInput<$Schema, "InstantMeeting
 export type InstantMeetingTokenSelect = $SelectInput<$Schema, "InstantMeetingToken">;
 export type InstantMeetingTokenInclude = $IncludeInput<$Schema, "InstantMeetingToken">;
 export type InstantMeetingTokenOmit = $OmitInput<$Schema, "InstantMeetingToken">;
-export type InstantMeetingTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstantMeetingToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "InstantMeetingToken", Options, Args>;
+export type InstantMeetingTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "InstantMeetingToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "InstantMeetingToken", Args, Options>;
 export type BookingReferenceFindManyArgs = $FindManyArgs<$Schema, "BookingReference">;
 export type BookingReferenceFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingReference">;
 export type BookingReferenceFindFirstArgs = $FindFirstArgs<$Schema, "BookingReference">;
@@ -387,7 +387,7 @@ export type BookingReferenceWhereInput = $WhereInput<$Schema, "BookingReference"
 export type BookingReferenceSelect = $SelectInput<$Schema, "BookingReference">;
 export type BookingReferenceInclude = $IncludeInput<$Schema, "BookingReference">;
 export type BookingReferenceOmit = $OmitInput<$Schema, "BookingReference">;
-export type BookingReferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingReference", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingReference", Options, Args>;
+export type BookingReferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingReference", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingReference", Args, Options>;
 export type AttendeeFindManyArgs = $FindManyArgs<$Schema, "Attendee">;
 export type AttendeeFindUniqueArgs = $FindUniqueArgs<$Schema, "Attendee">;
 export type AttendeeFindFirstArgs = $FindFirstArgs<$Schema, "Attendee">;
@@ -407,7 +407,7 @@ export type AttendeeWhereInput = $WhereInput<$Schema, "Attendee">;
 export type AttendeeSelect = $SelectInput<$Schema, "Attendee">;
 export type AttendeeInclude = $IncludeInput<$Schema, "Attendee">;
 export type AttendeeOmit = $OmitInput<$Schema, "Attendee">;
-export type AttendeeGetPayload<Args extends $SelectIncludeOmit<$Schema, "Attendee", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Attendee", Options, Args>;
+export type AttendeeGetPayload<Args extends $SelectIncludeOmit<$Schema, "Attendee", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Attendee", Args, Options>;
 export type BookingFindManyArgs = $FindManyArgs<$Schema, "Booking">;
 export type BookingFindUniqueArgs = $FindUniqueArgs<$Schema, "Booking">;
 export type BookingFindFirstArgs = $FindFirstArgs<$Schema, "Booking">;
@@ -427,7 +427,7 @@ export type BookingWhereInput = $WhereInput<$Schema, "Booking">;
 export type BookingSelect = $SelectInput<$Schema, "Booking">;
 export type BookingInclude = $IncludeInput<$Schema, "Booking">;
 export type BookingOmit = $OmitInput<$Schema, "Booking">;
-export type BookingGetPayload<Args extends $SelectIncludeOmit<$Schema, "Booking", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Booking", Options, Args>;
+export type BookingGetPayload<Args extends $SelectIncludeOmit<$Schema, "Booking", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Booking", Args, Options>;
 export type TrackingFindManyArgs = $FindManyArgs<$Schema, "Tracking">;
 export type TrackingFindUniqueArgs = $FindUniqueArgs<$Schema, "Tracking">;
 export type TrackingFindFirstArgs = $FindFirstArgs<$Schema, "Tracking">;
@@ -447,7 +447,7 @@ export type TrackingWhereInput = $WhereInput<$Schema, "Tracking">;
 export type TrackingSelect = $SelectInput<$Schema, "Tracking">;
 export type TrackingInclude = $IncludeInput<$Schema, "Tracking">;
 export type TrackingOmit = $OmitInput<$Schema, "Tracking">;
-export type TrackingGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tracking", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Tracking", Options, Args>;
+export type TrackingGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tracking", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Tracking", Args, Options>;
 export type ScheduleFindManyArgs = $FindManyArgs<$Schema, "Schedule">;
 export type ScheduleFindUniqueArgs = $FindUniqueArgs<$Schema, "Schedule">;
 export type ScheduleFindFirstArgs = $FindFirstArgs<$Schema, "Schedule">;
@@ -467,7 +467,7 @@ export type ScheduleWhereInput = $WhereInput<$Schema, "Schedule">;
 export type ScheduleSelect = $SelectInput<$Schema, "Schedule">;
 export type ScheduleInclude = $IncludeInput<$Schema, "Schedule">;
 export type ScheduleOmit = $OmitInput<$Schema, "Schedule">;
-export type ScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "Schedule", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Schedule", Options, Args>;
+export type ScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "Schedule", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Schedule", Args, Options>;
 export type AvailabilityFindManyArgs = $FindManyArgs<$Schema, "Availability">;
 export type AvailabilityFindUniqueArgs = $FindUniqueArgs<$Schema, "Availability">;
 export type AvailabilityFindFirstArgs = $FindFirstArgs<$Schema, "Availability">;
@@ -487,7 +487,7 @@ export type AvailabilityWhereInput = $WhereInput<$Schema, "Availability">;
 export type AvailabilitySelect = $SelectInput<$Schema, "Availability">;
 export type AvailabilityInclude = $IncludeInput<$Schema, "Availability">;
 export type AvailabilityOmit = $OmitInput<$Schema, "Availability">;
-export type AvailabilityGetPayload<Args extends $SelectIncludeOmit<$Schema, "Availability", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Availability", Options, Args>;
+export type AvailabilityGetPayload<Args extends $SelectIncludeOmit<$Schema, "Availability", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Availability", Args, Options>;
 export type SelectedCalendarFindManyArgs = $FindManyArgs<$Schema, "SelectedCalendar">;
 export type SelectedCalendarFindUniqueArgs = $FindUniqueArgs<$Schema, "SelectedCalendar">;
 export type SelectedCalendarFindFirstArgs = $FindFirstArgs<$Schema, "SelectedCalendar">;
@@ -507,7 +507,7 @@ export type SelectedCalendarWhereInput = $WhereInput<$Schema, "SelectedCalendar"
 export type SelectedCalendarSelect = $SelectInput<$Schema, "SelectedCalendar">;
 export type SelectedCalendarInclude = $IncludeInput<$Schema, "SelectedCalendar">;
 export type SelectedCalendarOmit = $OmitInput<$Schema, "SelectedCalendar">;
-export type SelectedCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "SelectedCalendar", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SelectedCalendar", Options, Args>;
+export type SelectedCalendarGetPayload<Args extends $SelectIncludeOmit<$Schema, "SelectedCalendar", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SelectedCalendar", Args, Options>;
 export type EventTypeCustomInputFindManyArgs = $FindManyArgs<$Schema, "EventTypeCustomInput">;
 export type EventTypeCustomInputFindUniqueArgs = $FindUniqueArgs<$Schema, "EventTypeCustomInput">;
 export type EventTypeCustomInputFindFirstArgs = $FindFirstArgs<$Schema, "EventTypeCustomInput">;
@@ -527,7 +527,7 @@ export type EventTypeCustomInputWhereInput = $WhereInput<$Schema, "EventTypeCust
 export type EventTypeCustomInputSelect = $SelectInput<$Schema, "EventTypeCustomInput">;
 export type EventTypeCustomInputInclude = $IncludeInput<$Schema, "EventTypeCustomInput">;
 export type EventTypeCustomInputOmit = $OmitInput<$Schema, "EventTypeCustomInput">;
-export type EventTypeCustomInputGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventTypeCustomInput", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "EventTypeCustomInput", Options, Args>;
+export type EventTypeCustomInputGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventTypeCustomInput", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "EventTypeCustomInput", Args, Options>;
 export type ResetPasswordRequestFindManyArgs = $FindManyArgs<$Schema, "ResetPasswordRequest">;
 export type ResetPasswordRequestFindUniqueArgs = $FindUniqueArgs<$Schema, "ResetPasswordRequest">;
 export type ResetPasswordRequestFindFirstArgs = $FindFirstArgs<$Schema, "ResetPasswordRequest">;
@@ -547,7 +547,7 @@ export type ResetPasswordRequestWhereInput = $WhereInput<$Schema, "ResetPassword
 export type ResetPasswordRequestSelect = $SelectInput<$Schema, "ResetPasswordRequest">;
 export type ResetPasswordRequestInclude = $IncludeInput<$Schema, "ResetPasswordRequest">;
 export type ResetPasswordRequestOmit = $OmitInput<$Schema, "ResetPasswordRequest">;
-export type ResetPasswordRequestGetPayload<Args extends $SelectIncludeOmit<$Schema, "ResetPasswordRequest", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ResetPasswordRequest", Options, Args>;
+export type ResetPasswordRequestGetPayload<Args extends $SelectIncludeOmit<$Schema, "ResetPasswordRequest", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ResetPasswordRequest", Args, Options>;
 export type ReminderMailFindManyArgs = $FindManyArgs<$Schema, "ReminderMail">;
 export type ReminderMailFindUniqueArgs = $FindUniqueArgs<$Schema, "ReminderMail">;
 export type ReminderMailFindFirstArgs = $FindFirstArgs<$Schema, "ReminderMail">;
@@ -567,7 +567,7 @@ export type ReminderMailWhereInput = $WhereInput<$Schema, "ReminderMail">;
 export type ReminderMailSelect = $SelectInput<$Schema, "ReminderMail">;
 export type ReminderMailInclude = $IncludeInput<$Schema, "ReminderMail">;
 export type ReminderMailOmit = $OmitInput<$Schema, "ReminderMail">;
-export type ReminderMailGetPayload<Args extends $SelectIncludeOmit<$Schema, "ReminderMail", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ReminderMail", Options, Args>;
+export type ReminderMailGetPayload<Args extends $SelectIncludeOmit<$Schema, "ReminderMail", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ReminderMail", Args, Options>;
 export type PaymentFindManyArgs = $FindManyArgs<$Schema, "Payment">;
 export type PaymentFindUniqueArgs = $FindUniqueArgs<$Schema, "Payment">;
 export type PaymentFindFirstArgs = $FindFirstArgs<$Schema, "Payment">;
@@ -587,7 +587,7 @@ export type PaymentWhereInput = $WhereInput<$Schema, "Payment">;
 export type PaymentSelect = $SelectInput<$Schema, "Payment">;
 export type PaymentInclude = $IncludeInput<$Schema, "Payment">;
 export type PaymentOmit = $OmitInput<$Schema, "Payment">;
-export type PaymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Payment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Payment", Options, Args>;
+export type PaymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Payment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Payment", Args, Options>;
 export type WebhookFindManyArgs = $FindManyArgs<$Schema, "Webhook">;
 export type WebhookFindUniqueArgs = $FindUniqueArgs<$Schema, "Webhook">;
 export type WebhookFindFirstArgs = $FindFirstArgs<$Schema, "Webhook">;
@@ -607,7 +607,7 @@ export type WebhookWhereInput = $WhereInput<$Schema, "Webhook">;
 export type WebhookSelect = $SelectInput<$Schema, "Webhook">;
 export type WebhookInclude = $IncludeInput<$Schema, "Webhook">;
 export type WebhookOmit = $OmitInput<$Schema, "Webhook">;
-export type WebhookGetPayload<Args extends $SelectIncludeOmit<$Schema, "Webhook", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Webhook", Options, Args>;
+export type WebhookGetPayload<Args extends $SelectIncludeOmit<$Schema, "Webhook", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Webhook", Args, Options>;
 export type ImpersonationsFindManyArgs = $FindManyArgs<$Schema, "Impersonations">;
 export type ImpersonationsFindUniqueArgs = $FindUniqueArgs<$Schema, "Impersonations">;
 export type ImpersonationsFindFirstArgs = $FindFirstArgs<$Schema, "Impersonations">;
@@ -627,7 +627,7 @@ export type ImpersonationsWhereInput = $WhereInput<$Schema, "Impersonations">;
 export type ImpersonationsSelect = $SelectInput<$Schema, "Impersonations">;
 export type ImpersonationsInclude = $IncludeInput<$Schema, "Impersonations">;
 export type ImpersonationsOmit = $OmitInput<$Schema, "Impersonations">;
-export type ImpersonationsGetPayload<Args extends $SelectIncludeOmit<$Schema, "Impersonations", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Impersonations", Options, Args>;
+export type ImpersonationsGetPayload<Args extends $SelectIncludeOmit<$Schema, "Impersonations", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Impersonations", Args, Options>;
 export type ApiKeyFindManyArgs = $FindManyArgs<$Schema, "ApiKey">;
 export type ApiKeyFindUniqueArgs = $FindUniqueArgs<$Schema, "ApiKey">;
 export type ApiKeyFindFirstArgs = $FindFirstArgs<$Schema, "ApiKey">;
@@ -647,7 +647,7 @@ export type ApiKeyWhereInput = $WhereInput<$Schema, "ApiKey">;
 export type ApiKeySelect = $SelectInput<$Schema, "ApiKey">;
 export type ApiKeyInclude = $IncludeInput<$Schema, "ApiKey">;
 export type ApiKeyOmit = $OmitInput<$Schema, "ApiKey">;
-export type ApiKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKey", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ApiKey", Options, Args>;
+export type ApiKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKey", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ApiKey", Args, Options>;
 export type RateLimitFindManyArgs = $FindManyArgs<$Schema, "RateLimit">;
 export type RateLimitFindUniqueArgs = $FindUniqueArgs<$Schema, "RateLimit">;
 export type RateLimitFindFirstArgs = $FindFirstArgs<$Schema, "RateLimit">;
@@ -667,7 +667,7 @@ export type RateLimitWhereInput = $WhereInput<$Schema, "RateLimit">;
 export type RateLimitSelect = $SelectInput<$Schema, "RateLimit">;
 export type RateLimitInclude = $IncludeInput<$Schema, "RateLimit">;
 export type RateLimitOmit = $OmitInput<$Schema, "RateLimit">;
-export type RateLimitGetPayload<Args extends $SelectIncludeOmit<$Schema, "RateLimit", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RateLimit", Options, Args>;
+export type RateLimitGetPayload<Args extends $SelectIncludeOmit<$Schema, "RateLimit", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RateLimit", Args, Options>;
 export type HashedLinkFindManyArgs = $FindManyArgs<$Schema, "HashedLink">;
 export type HashedLinkFindUniqueArgs = $FindUniqueArgs<$Schema, "HashedLink">;
 export type HashedLinkFindFirstArgs = $FindFirstArgs<$Schema, "HashedLink">;
@@ -687,7 +687,7 @@ export type HashedLinkWhereInput = $WhereInput<$Schema, "HashedLink">;
 export type HashedLinkSelect = $SelectInput<$Schema, "HashedLink">;
 export type HashedLinkInclude = $IncludeInput<$Schema, "HashedLink">;
 export type HashedLinkOmit = $OmitInput<$Schema, "HashedLink">;
-export type HashedLinkGetPayload<Args extends $SelectIncludeOmit<$Schema, "HashedLink", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "HashedLink", Options, Args>;
+export type HashedLinkGetPayload<Args extends $SelectIncludeOmit<$Schema, "HashedLink", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "HashedLink", Args, Options>;
 export type AccountFindManyArgs = $FindManyArgs<$Schema, "Account">;
 export type AccountFindUniqueArgs = $FindUniqueArgs<$Schema, "Account">;
 export type AccountFindFirstArgs = $FindFirstArgs<$Schema, "Account">;
@@ -707,7 +707,7 @@ export type AccountWhereInput = $WhereInput<$Schema, "Account">;
 export type AccountSelect = $SelectInput<$Schema, "Account">;
 export type AccountInclude = $IncludeInput<$Schema, "Account">;
 export type AccountOmit = $OmitInput<$Schema, "Account">;
-export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Account", Options, Args>;
+export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Account", Args, Options>;
 export type SessionFindManyArgs = $FindManyArgs<$Schema, "Session">;
 export type SessionFindUniqueArgs = $FindUniqueArgs<$Schema, "Session">;
 export type SessionFindFirstArgs = $FindFirstArgs<$Schema, "Session">;
@@ -727,7 +727,7 @@ export type SessionWhereInput = $WhereInput<$Schema, "Session">;
 export type SessionSelect = $SelectInput<$Schema, "Session">;
 export type SessionInclude = $IncludeInput<$Schema, "Session">;
 export type SessionOmit = $OmitInput<$Schema, "Session">;
-export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Session", Options, Args>;
+export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Session", Args, Options>;
 export type AppFindManyArgs = $FindManyArgs<$Schema, "App">;
 export type AppFindUniqueArgs = $FindUniqueArgs<$Schema, "App">;
 export type AppFindFirstArgs = $FindFirstArgs<$Schema, "App">;
@@ -747,7 +747,7 @@ export type AppWhereInput = $WhereInput<$Schema, "App">;
 export type AppSelect = $SelectInput<$Schema, "App">;
 export type AppInclude = $IncludeInput<$Schema, "App">;
 export type AppOmit = $OmitInput<$Schema, "App">;
-export type AppGetPayload<Args extends $SelectIncludeOmit<$Schema, "App", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "App", Options, Args>;
+export type AppGetPayload<Args extends $SelectIncludeOmit<$Schema, "App", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "App", Args, Options>;
 export type App_RoutingForms_FormFindManyArgs = $FindManyArgs<$Schema, "App_RoutingForms_Form">;
 export type App_RoutingForms_FormFindUniqueArgs = $FindUniqueArgs<$Schema, "App_RoutingForms_Form">;
 export type App_RoutingForms_FormFindFirstArgs = $FindFirstArgs<$Schema, "App_RoutingForms_Form">;
@@ -767,7 +767,7 @@ export type App_RoutingForms_FormWhereInput = $WhereInput<$Schema, "App_RoutingF
 export type App_RoutingForms_FormSelect = $SelectInput<$Schema, "App_RoutingForms_Form">;
 export type App_RoutingForms_FormInclude = $IncludeInput<$Schema, "App_RoutingForms_Form">;
 export type App_RoutingForms_FormOmit = $OmitInput<$Schema, "App_RoutingForms_Form">;
-export type App_RoutingForms_FormGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_Form", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "App_RoutingForms_Form", Options, Args>;
+export type App_RoutingForms_FormGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_Form", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "App_RoutingForms_Form", Args, Options>;
 export type App_RoutingForms_FormResponseFindManyArgs = $FindManyArgs<$Schema, "App_RoutingForms_FormResponse">;
 export type App_RoutingForms_FormResponseFindUniqueArgs = $FindUniqueArgs<$Schema, "App_RoutingForms_FormResponse">;
 export type App_RoutingForms_FormResponseFindFirstArgs = $FindFirstArgs<$Schema, "App_RoutingForms_FormResponse">;
@@ -787,7 +787,7 @@ export type App_RoutingForms_FormResponseWhereInput = $WhereInput<$Schema, "App_
 export type App_RoutingForms_FormResponseSelect = $SelectInput<$Schema, "App_RoutingForms_FormResponse">;
 export type App_RoutingForms_FormResponseInclude = $IncludeInput<$Schema, "App_RoutingForms_FormResponse">;
 export type App_RoutingForms_FormResponseOmit = $OmitInput<$Schema, "App_RoutingForms_FormResponse">;
-export type App_RoutingForms_FormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_FormResponse", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "App_RoutingForms_FormResponse", Options, Args>;
+export type App_RoutingForms_FormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_FormResponse", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "App_RoutingForms_FormResponse", Args, Options>;
 export type App_RoutingForms_QueuedFormResponseFindManyArgs = $FindManyArgs<$Schema, "App_RoutingForms_QueuedFormResponse">;
 export type App_RoutingForms_QueuedFormResponseFindUniqueArgs = $FindUniqueArgs<$Schema, "App_RoutingForms_QueuedFormResponse">;
 export type App_RoutingForms_QueuedFormResponseFindFirstArgs = $FindFirstArgs<$Schema, "App_RoutingForms_QueuedFormResponse">;
@@ -807,7 +807,7 @@ export type App_RoutingForms_QueuedFormResponseWhereInput = $WhereInput<$Schema,
 export type App_RoutingForms_QueuedFormResponseSelect = $SelectInput<$Schema, "App_RoutingForms_QueuedFormResponse">;
 export type App_RoutingForms_QueuedFormResponseInclude = $IncludeInput<$Schema, "App_RoutingForms_QueuedFormResponse">;
 export type App_RoutingForms_QueuedFormResponseOmit = $OmitInput<$Schema, "App_RoutingForms_QueuedFormResponse">;
-export type App_RoutingForms_QueuedFormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_QueuedFormResponse", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "App_RoutingForms_QueuedFormResponse", Options, Args>;
+export type App_RoutingForms_QueuedFormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_QueuedFormResponse", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "App_RoutingForms_QueuedFormResponse", Args, Options>;
 export type RoutingFormResponseFieldFindManyArgs = $FindManyArgs<$Schema, "RoutingFormResponseField">;
 export type RoutingFormResponseFieldFindUniqueArgs = $FindUniqueArgs<$Schema, "RoutingFormResponseField">;
 export type RoutingFormResponseFieldFindFirstArgs = $FindFirstArgs<$Schema, "RoutingFormResponseField">;
@@ -827,7 +827,7 @@ export type RoutingFormResponseFieldWhereInput = $WhereInput<$Schema, "RoutingFo
 export type RoutingFormResponseFieldSelect = $SelectInput<$Schema, "RoutingFormResponseField">;
 export type RoutingFormResponseFieldInclude = $IncludeInput<$Schema, "RoutingFormResponseField">;
 export type RoutingFormResponseFieldOmit = $OmitInput<$Schema, "RoutingFormResponseField">;
-export type RoutingFormResponseFieldGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponseField", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RoutingFormResponseField", Options, Args>;
+export type RoutingFormResponseFieldGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponseField", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RoutingFormResponseField", Args, Options>;
 export type RoutingFormResponseFindManyArgs = $FindManyArgs<$Schema, "RoutingFormResponse">;
 export type RoutingFormResponseFindUniqueArgs = $FindUniqueArgs<$Schema, "RoutingFormResponse">;
 export type RoutingFormResponseFindFirstArgs = $FindFirstArgs<$Schema, "RoutingFormResponse">;
@@ -847,7 +847,7 @@ export type RoutingFormResponseWhereInput = $WhereInput<$Schema, "RoutingFormRes
 export type RoutingFormResponseSelect = $SelectInput<$Schema, "RoutingFormResponse">;
 export type RoutingFormResponseInclude = $IncludeInput<$Schema, "RoutingFormResponse">;
 export type RoutingFormResponseOmit = $OmitInput<$Schema, "RoutingFormResponse">;
-export type RoutingFormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponse", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RoutingFormResponse", Options, Args>;
+export type RoutingFormResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponse", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RoutingFormResponse", Args, Options>;
 export type RoutingFormResponseDenormalizedFindManyArgs = $FindManyArgs<$Schema, "RoutingFormResponseDenormalized">;
 export type RoutingFormResponseDenormalizedFindUniqueArgs = $FindUniqueArgs<$Schema, "RoutingFormResponseDenormalized">;
 export type RoutingFormResponseDenormalizedFindFirstArgs = $FindFirstArgs<$Schema, "RoutingFormResponseDenormalized">;
@@ -867,7 +867,7 @@ export type RoutingFormResponseDenormalizedWhereInput = $WhereInput<$Schema, "Ro
 export type RoutingFormResponseDenormalizedSelect = $SelectInput<$Schema, "RoutingFormResponseDenormalized">;
 export type RoutingFormResponseDenormalizedInclude = $IncludeInput<$Schema, "RoutingFormResponseDenormalized">;
 export type RoutingFormResponseDenormalizedOmit = $OmitInput<$Schema, "RoutingFormResponseDenormalized">;
-export type RoutingFormResponseDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponseDenormalized", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RoutingFormResponseDenormalized", Options, Args>;
+export type RoutingFormResponseDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "RoutingFormResponseDenormalized", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RoutingFormResponseDenormalized", Args, Options>;
 export type FeedbackFindManyArgs = $FindManyArgs<$Schema, "Feedback">;
 export type FeedbackFindUniqueArgs = $FindUniqueArgs<$Schema, "Feedback">;
 export type FeedbackFindFirstArgs = $FindFirstArgs<$Schema, "Feedback">;
@@ -887,7 +887,7 @@ export type FeedbackWhereInput = $WhereInput<$Schema, "Feedback">;
 export type FeedbackSelect = $SelectInput<$Schema, "Feedback">;
 export type FeedbackInclude = $IncludeInput<$Schema, "Feedback">;
 export type FeedbackOmit = $OmitInput<$Schema, "Feedback">;
-export type FeedbackGetPayload<Args extends $SelectIncludeOmit<$Schema, "Feedback", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Feedback", Options, Args>;
+export type FeedbackGetPayload<Args extends $SelectIncludeOmit<$Schema, "Feedback", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Feedback", Args, Options>;
 export type WorkflowStepFindManyArgs = $FindManyArgs<$Schema, "WorkflowStep">;
 export type WorkflowStepFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkflowStep">;
 export type WorkflowStepFindFirstArgs = $FindFirstArgs<$Schema, "WorkflowStep">;
@@ -907,7 +907,7 @@ export type WorkflowStepWhereInput = $WhereInput<$Schema, "WorkflowStep">;
 export type WorkflowStepSelect = $SelectInput<$Schema, "WorkflowStep">;
 export type WorkflowStepInclude = $IncludeInput<$Schema, "WorkflowStep">;
 export type WorkflowStepOmit = $OmitInput<$Schema, "WorkflowStep">;
-export type WorkflowStepGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowStep", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkflowStep", Options, Args>;
+export type WorkflowStepGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowStep", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkflowStep", Args, Options>;
 export type WorkflowFindManyArgs = $FindManyArgs<$Schema, "Workflow">;
 export type WorkflowFindUniqueArgs = $FindUniqueArgs<$Schema, "Workflow">;
 export type WorkflowFindFirstArgs = $FindFirstArgs<$Schema, "Workflow">;
@@ -927,7 +927,7 @@ export type WorkflowWhereInput = $WhereInput<$Schema, "Workflow">;
 export type WorkflowSelect = $SelectInput<$Schema, "Workflow">;
 export type WorkflowInclude = $IncludeInput<$Schema, "Workflow">;
 export type WorkflowOmit = $OmitInput<$Schema, "Workflow">;
-export type WorkflowGetPayload<Args extends $SelectIncludeOmit<$Schema, "Workflow", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Workflow", Options, Args>;
+export type WorkflowGetPayload<Args extends $SelectIncludeOmit<$Schema, "Workflow", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Workflow", Args, Options>;
 export type AIPhoneCallConfigurationFindManyArgs = $FindManyArgs<$Schema, "AIPhoneCallConfiguration">;
 export type AIPhoneCallConfigurationFindUniqueArgs = $FindUniqueArgs<$Schema, "AIPhoneCallConfiguration">;
 export type AIPhoneCallConfigurationFindFirstArgs = $FindFirstArgs<$Schema, "AIPhoneCallConfiguration">;
@@ -947,7 +947,7 @@ export type AIPhoneCallConfigurationWhereInput = $WhereInput<$Schema, "AIPhoneCa
 export type AIPhoneCallConfigurationSelect = $SelectInput<$Schema, "AIPhoneCallConfiguration">;
 export type AIPhoneCallConfigurationInclude = $IncludeInput<$Schema, "AIPhoneCallConfiguration">;
 export type AIPhoneCallConfigurationOmit = $OmitInput<$Schema, "AIPhoneCallConfiguration">;
-export type AIPhoneCallConfigurationGetPayload<Args extends $SelectIncludeOmit<$Schema, "AIPhoneCallConfiguration", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AIPhoneCallConfiguration", Options, Args>;
+export type AIPhoneCallConfigurationGetPayload<Args extends $SelectIncludeOmit<$Schema, "AIPhoneCallConfiguration", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AIPhoneCallConfiguration", Args, Options>;
 export type WorkflowsOnEventTypesFindManyArgs = $FindManyArgs<$Schema, "WorkflowsOnEventTypes">;
 export type WorkflowsOnEventTypesFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkflowsOnEventTypes">;
 export type WorkflowsOnEventTypesFindFirstArgs = $FindFirstArgs<$Schema, "WorkflowsOnEventTypes">;
@@ -967,7 +967,7 @@ export type WorkflowsOnEventTypesWhereInput = $WhereInput<$Schema, "WorkflowsOnE
 export type WorkflowsOnEventTypesSelect = $SelectInput<$Schema, "WorkflowsOnEventTypes">;
 export type WorkflowsOnEventTypesInclude = $IncludeInput<$Schema, "WorkflowsOnEventTypes">;
 export type WorkflowsOnEventTypesOmit = $OmitInput<$Schema, "WorkflowsOnEventTypes">;
-export type WorkflowsOnEventTypesGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowsOnEventTypes", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkflowsOnEventTypes", Options, Args>;
+export type WorkflowsOnEventTypesGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowsOnEventTypes", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkflowsOnEventTypes", Args, Options>;
 export type WorkflowsOnTeamsFindManyArgs = $FindManyArgs<$Schema, "WorkflowsOnTeams">;
 export type WorkflowsOnTeamsFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkflowsOnTeams">;
 export type WorkflowsOnTeamsFindFirstArgs = $FindFirstArgs<$Schema, "WorkflowsOnTeams">;
@@ -987,7 +987,7 @@ export type WorkflowsOnTeamsWhereInput = $WhereInput<$Schema, "WorkflowsOnTeams"
 export type WorkflowsOnTeamsSelect = $SelectInput<$Schema, "WorkflowsOnTeams">;
 export type WorkflowsOnTeamsInclude = $IncludeInput<$Schema, "WorkflowsOnTeams">;
 export type WorkflowsOnTeamsOmit = $OmitInput<$Schema, "WorkflowsOnTeams">;
-export type WorkflowsOnTeamsGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowsOnTeams", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkflowsOnTeams", Options, Args>;
+export type WorkflowsOnTeamsGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowsOnTeams", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkflowsOnTeams", Args, Options>;
 export type DeploymentFindManyArgs = $FindManyArgs<$Schema, "Deployment">;
 export type DeploymentFindUniqueArgs = $FindUniqueArgs<$Schema, "Deployment">;
 export type DeploymentFindFirstArgs = $FindFirstArgs<$Schema, "Deployment">;
@@ -1007,7 +1007,7 @@ export type DeploymentWhereInput = $WhereInput<$Schema, "Deployment">;
 export type DeploymentSelect = $SelectInput<$Schema, "Deployment">;
 export type DeploymentInclude = $IncludeInput<$Schema, "Deployment">;
 export type DeploymentOmit = $OmitInput<$Schema, "Deployment">;
-export type DeploymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Deployment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Deployment", Options, Args>;
+export type DeploymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Deployment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Deployment", Args, Options>;
 export type WorkflowReminderFindManyArgs = $FindManyArgs<$Schema, "WorkflowReminder">;
 export type WorkflowReminderFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkflowReminder">;
 export type WorkflowReminderFindFirstArgs = $FindFirstArgs<$Schema, "WorkflowReminder">;
@@ -1027,7 +1027,7 @@ export type WorkflowReminderWhereInput = $WhereInput<$Schema, "WorkflowReminder"
 export type WorkflowReminderSelect = $SelectInput<$Schema, "WorkflowReminder">;
 export type WorkflowReminderInclude = $IncludeInput<$Schema, "WorkflowReminder">;
 export type WorkflowReminderOmit = $OmitInput<$Schema, "WorkflowReminder">;
-export type WorkflowReminderGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowReminder", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkflowReminder", Options, Args>;
+export type WorkflowReminderGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowReminder", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkflowReminder", Args, Options>;
 export type WebhookScheduledTriggersFindManyArgs = $FindManyArgs<$Schema, "WebhookScheduledTriggers">;
 export type WebhookScheduledTriggersFindUniqueArgs = $FindUniqueArgs<$Schema, "WebhookScheduledTriggers">;
 export type WebhookScheduledTriggersFindFirstArgs = $FindFirstArgs<$Schema, "WebhookScheduledTriggers">;
@@ -1047,7 +1047,7 @@ export type WebhookScheduledTriggersWhereInput = $WhereInput<$Schema, "WebhookSc
 export type WebhookScheduledTriggersSelect = $SelectInput<$Schema, "WebhookScheduledTriggers">;
 export type WebhookScheduledTriggersInclude = $IncludeInput<$Schema, "WebhookScheduledTriggers">;
 export type WebhookScheduledTriggersOmit = $OmitInput<$Schema, "WebhookScheduledTriggers">;
-export type WebhookScheduledTriggersGetPayload<Args extends $SelectIncludeOmit<$Schema, "WebhookScheduledTriggers", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WebhookScheduledTriggers", Options, Args>;
+export type WebhookScheduledTriggersGetPayload<Args extends $SelectIncludeOmit<$Schema, "WebhookScheduledTriggers", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WebhookScheduledTriggers", Args, Options>;
 export type BookingSeatFindManyArgs = $FindManyArgs<$Schema, "BookingSeat">;
 export type BookingSeatFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingSeat">;
 export type BookingSeatFindFirstArgs = $FindFirstArgs<$Schema, "BookingSeat">;
@@ -1067,7 +1067,7 @@ export type BookingSeatWhereInput = $WhereInput<$Schema, "BookingSeat">;
 export type BookingSeatSelect = $SelectInput<$Schema, "BookingSeat">;
 export type BookingSeatInclude = $IncludeInput<$Schema, "BookingSeat">;
 export type BookingSeatOmit = $OmitInput<$Schema, "BookingSeat">;
-export type BookingSeatGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingSeat", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingSeat", Options, Args>;
+export type BookingSeatGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingSeat", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingSeat", Args, Options>;
 export type VerifiedNumberFindManyArgs = $FindManyArgs<$Schema, "VerifiedNumber">;
 export type VerifiedNumberFindUniqueArgs = $FindUniqueArgs<$Schema, "VerifiedNumber">;
 export type VerifiedNumberFindFirstArgs = $FindFirstArgs<$Schema, "VerifiedNumber">;
@@ -1087,7 +1087,7 @@ export type VerifiedNumberWhereInput = $WhereInput<$Schema, "VerifiedNumber">;
 export type VerifiedNumberSelect = $SelectInput<$Schema, "VerifiedNumber">;
 export type VerifiedNumberInclude = $IncludeInput<$Schema, "VerifiedNumber">;
 export type VerifiedNumberOmit = $OmitInput<$Schema, "VerifiedNumber">;
-export type VerifiedNumberGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerifiedNumber", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "VerifiedNumber", Options, Args>;
+export type VerifiedNumberGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerifiedNumber", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "VerifiedNumber", Args, Options>;
 export type VerifiedEmailFindManyArgs = $FindManyArgs<$Schema, "VerifiedEmail">;
 export type VerifiedEmailFindUniqueArgs = $FindUniqueArgs<$Schema, "VerifiedEmail">;
 export type VerifiedEmailFindFirstArgs = $FindFirstArgs<$Schema, "VerifiedEmail">;
@@ -1107,7 +1107,7 @@ export type VerifiedEmailWhereInput = $WhereInput<$Schema, "VerifiedEmail">;
 export type VerifiedEmailSelect = $SelectInput<$Schema, "VerifiedEmail">;
 export type VerifiedEmailInclude = $IncludeInput<$Schema, "VerifiedEmail">;
 export type VerifiedEmailOmit = $OmitInput<$Schema, "VerifiedEmail">;
-export type VerifiedEmailGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerifiedEmail", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "VerifiedEmail", Options, Args>;
+export type VerifiedEmailGetPayload<Args extends $SelectIncludeOmit<$Schema, "VerifiedEmail", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "VerifiedEmail", Args, Options>;
 export type FeatureFindManyArgs = $FindManyArgs<$Schema, "Feature">;
 export type FeatureFindUniqueArgs = $FindUniqueArgs<$Schema, "Feature">;
 export type FeatureFindFirstArgs = $FindFirstArgs<$Schema, "Feature">;
@@ -1127,7 +1127,7 @@ export type FeatureWhereInput = $WhereInput<$Schema, "Feature">;
 export type FeatureSelect = $SelectInput<$Schema, "Feature">;
 export type FeatureInclude = $IncludeInput<$Schema, "Feature">;
 export type FeatureOmit = $OmitInput<$Schema, "Feature">;
-export type FeatureGetPayload<Args extends $SelectIncludeOmit<$Schema, "Feature", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Feature", Options, Args>;
+export type FeatureGetPayload<Args extends $SelectIncludeOmit<$Schema, "Feature", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Feature", Args, Options>;
 export type UserFeaturesFindManyArgs = $FindManyArgs<$Schema, "UserFeatures">;
 export type UserFeaturesFindUniqueArgs = $FindUniqueArgs<$Schema, "UserFeatures">;
 export type UserFeaturesFindFirstArgs = $FindFirstArgs<$Schema, "UserFeatures">;
@@ -1147,7 +1147,7 @@ export type UserFeaturesWhereInput = $WhereInput<$Schema, "UserFeatures">;
 export type UserFeaturesSelect = $SelectInput<$Schema, "UserFeatures">;
 export type UserFeaturesInclude = $IncludeInput<$Schema, "UserFeatures">;
 export type UserFeaturesOmit = $OmitInput<$Schema, "UserFeatures">;
-export type UserFeaturesGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserFeatures", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "UserFeatures", Options, Args>;
+export type UserFeaturesGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserFeatures", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "UserFeatures", Args, Options>;
 export type TeamFeaturesFindManyArgs = $FindManyArgs<$Schema, "TeamFeatures">;
 export type TeamFeaturesFindUniqueArgs = $FindUniqueArgs<$Schema, "TeamFeatures">;
 export type TeamFeaturesFindFirstArgs = $FindFirstArgs<$Schema, "TeamFeatures">;
@@ -1167,7 +1167,7 @@ export type TeamFeaturesWhereInput = $WhereInput<$Schema, "TeamFeatures">;
 export type TeamFeaturesSelect = $SelectInput<$Schema, "TeamFeatures">;
 export type TeamFeaturesInclude = $IncludeInput<$Schema, "TeamFeatures">;
 export type TeamFeaturesOmit = $OmitInput<$Schema, "TeamFeatures">;
-export type TeamFeaturesGetPayload<Args extends $SelectIncludeOmit<$Schema, "TeamFeatures", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TeamFeatures", Options, Args>;
+export type TeamFeaturesGetPayload<Args extends $SelectIncludeOmit<$Schema, "TeamFeatures", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TeamFeatures", Args, Options>;
 export type SelectedSlotsFindManyArgs = $FindManyArgs<$Schema, "SelectedSlots">;
 export type SelectedSlotsFindUniqueArgs = $FindUniqueArgs<$Schema, "SelectedSlots">;
 export type SelectedSlotsFindFirstArgs = $FindFirstArgs<$Schema, "SelectedSlots">;
@@ -1187,7 +1187,7 @@ export type SelectedSlotsWhereInput = $WhereInput<$Schema, "SelectedSlots">;
 export type SelectedSlotsSelect = $SelectInput<$Schema, "SelectedSlots">;
 export type SelectedSlotsInclude = $IncludeInput<$Schema, "SelectedSlots">;
 export type SelectedSlotsOmit = $OmitInput<$Schema, "SelectedSlots">;
-export type SelectedSlotsGetPayload<Args extends $SelectIncludeOmit<$Schema, "SelectedSlots", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SelectedSlots", Options, Args>;
+export type SelectedSlotsGetPayload<Args extends $SelectIncludeOmit<$Schema, "SelectedSlots", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SelectedSlots", Args, Options>;
 export type OAuthClientFindManyArgs = $FindManyArgs<$Schema, "OAuthClient">;
 export type OAuthClientFindUniqueArgs = $FindUniqueArgs<$Schema, "OAuthClient">;
 export type OAuthClientFindFirstArgs = $FindFirstArgs<$Schema, "OAuthClient">;
@@ -1207,7 +1207,7 @@ export type OAuthClientWhereInput = $WhereInput<$Schema, "OAuthClient">;
 export type OAuthClientSelect = $SelectInput<$Schema, "OAuthClient">;
 export type OAuthClientInclude = $IncludeInput<$Schema, "OAuthClient">;
 export type OAuthClientOmit = $OmitInput<$Schema, "OAuthClient">;
-export type OAuthClientGetPayload<Args extends $SelectIncludeOmit<$Schema, "OAuthClient", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OAuthClient", Options, Args>;
+export type OAuthClientGetPayload<Args extends $SelectIncludeOmit<$Schema, "OAuthClient", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OAuthClient", Args, Options>;
 export type AccessCodeFindManyArgs = $FindManyArgs<$Schema, "AccessCode">;
 export type AccessCodeFindUniqueArgs = $FindUniqueArgs<$Schema, "AccessCode">;
 export type AccessCodeFindFirstArgs = $FindFirstArgs<$Schema, "AccessCode">;
@@ -1227,7 +1227,7 @@ export type AccessCodeWhereInput = $WhereInput<$Schema, "AccessCode">;
 export type AccessCodeSelect = $SelectInput<$Schema, "AccessCode">;
 export type AccessCodeInclude = $IncludeInput<$Schema, "AccessCode">;
 export type AccessCodeOmit = $OmitInput<$Schema, "AccessCode">;
-export type AccessCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "AccessCode", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AccessCode", Options, Args>;
+export type AccessCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "AccessCode", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AccessCode", Args, Options>;
 export type BookingTimeStatusFindManyArgs = $FindManyArgs<$Schema, "BookingTimeStatus">;
 export type BookingTimeStatusFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingTimeStatus">;
 export type BookingTimeStatusFindFirstArgs = $FindFirstArgs<$Schema, "BookingTimeStatus">;
@@ -1247,7 +1247,7 @@ export type BookingTimeStatusWhereInput = $WhereInput<$Schema, "BookingTimeStatu
 export type BookingTimeStatusSelect = $SelectInput<$Schema, "BookingTimeStatus">;
 export type BookingTimeStatusInclude = $IncludeInput<$Schema, "BookingTimeStatus">;
 export type BookingTimeStatusOmit = $OmitInput<$Schema, "BookingTimeStatus">;
-export type BookingTimeStatusGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingTimeStatus", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingTimeStatus", Options, Args>;
+export type BookingTimeStatusGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingTimeStatus", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingTimeStatus", Args, Options>;
 export type BookingDenormalizedFindManyArgs = $FindManyArgs<$Schema, "BookingDenormalized">;
 export type BookingDenormalizedFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingDenormalized">;
 export type BookingDenormalizedFindFirstArgs = $FindFirstArgs<$Schema, "BookingDenormalized">;
@@ -1267,7 +1267,7 @@ export type BookingDenormalizedWhereInput = $WhereInput<$Schema, "BookingDenorma
 export type BookingDenormalizedSelect = $SelectInput<$Schema, "BookingDenormalized">;
 export type BookingDenormalizedInclude = $IncludeInput<$Schema, "BookingDenormalized">;
 export type BookingDenormalizedOmit = $OmitInput<$Schema, "BookingDenormalized">;
-export type BookingDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingDenormalized", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingDenormalized", Options, Args>;
+export type BookingDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingDenormalized", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingDenormalized", Args, Options>;
 export type BookingTimeStatusDenormalizedFindManyArgs = $FindManyArgs<$Schema, "BookingTimeStatusDenormalized">;
 export type BookingTimeStatusDenormalizedFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingTimeStatusDenormalized">;
 export type BookingTimeStatusDenormalizedFindFirstArgs = $FindFirstArgs<$Schema, "BookingTimeStatusDenormalized">;
@@ -1287,7 +1287,7 @@ export type BookingTimeStatusDenormalizedWhereInput = $WhereInput<$Schema, "Book
 export type BookingTimeStatusDenormalizedSelect = $SelectInput<$Schema, "BookingTimeStatusDenormalized">;
 export type BookingTimeStatusDenormalizedInclude = $IncludeInput<$Schema, "BookingTimeStatusDenormalized">;
 export type BookingTimeStatusDenormalizedOmit = $OmitInput<$Schema, "BookingTimeStatusDenormalized">;
-export type BookingTimeStatusDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingTimeStatusDenormalized", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingTimeStatusDenormalized", Options, Args>;
+export type BookingTimeStatusDenormalizedGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingTimeStatusDenormalized", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingTimeStatusDenormalized", Args, Options>;
 export type CalendarCacheFindManyArgs = $FindManyArgs<$Schema, "CalendarCache">;
 export type CalendarCacheFindUniqueArgs = $FindUniqueArgs<$Schema, "CalendarCache">;
 export type CalendarCacheFindFirstArgs = $FindFirstArgs<$Schema, "CalendarCache">;
@@ -1307,7 +1307,7 @@ export type CalendarCacheWhereInput = $WhereInput<$Schema, "CalendarCache">;
 export type CalendarCacheSelect = $SelectInput<$Schema, "CalendarCache">;
 export type CalendarCacheInclude = $IncludeInput<$Schema, "CalendarCache">;
 export type CalendarCacheOmit = $OmitInput<$Schema, "CalendarCache">;
-export type CalendarCacheGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalendarCache", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CalendarCache", Options, Args>;
+export type CalendarCacheGetPayload<Args extends $SelectIncludeOmit<$Schema, "CalendarCache", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CalendarCache", Args, Options>;
 export type TempOrgRedirectFindManyArgs = $FindManyArgs<$Schema, "TempOrgRedirect">;
 export type TempOrgRedirectFindUniqueArgs = $FindUniqueArgs<$Schema, "TempOrgRedirect">;
 export type TempOrgRedirectFindFirstArgs = $FindFirstArgs<$Schema, "TempOrgRedirect">;
@@ -1327,7 +1327,7 @@ export type TempOrgRedirectWhereInput = $WhereInput<$Schema, "TempOrgRedirect">;
 export type TempOrgRedirectSelect = $SelectInput<$Schema, "TempOrgRedirect">;
 export type TempOrgRedirectInclude = $IncludeInput<$Schema, "TempOrgRedirect">;
 export type TempOrgRedirectOmit = $OmitInput<$Schema, "TempOrgRedirect">;
-export type TempOrgRedirectGetPayload<Args extends $SelectIncludeOmit<$Schema, "TempOrgRedirect", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TempOrgRedirect", Options, Args>;
+export type TempOrgRedirectGetPayload<Args extends $SelectIncludeOmit<$Schema, "TempOrgRedirect", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TempOrgRedirect", Args, Options>;
 export type AvatarFindManyArgs = $FindManyArgs<$Schema, "Avatar">;
 export type AvatarFindUniqueArgs = $FindUniqueArgs<$Schema, "Avatar">;
 export type AvatarFindFirstArgs = $FindFirstArgs<$Schema, "Avatar">;
@@ -1347,7 +1347,7 @@ export type AvatarWhereInput = $WhereInput<$Schema, "Avatar">;
 export type AvatarSelect = $SelectInput<$Schema, "Avatar">;
 export type AvatarInclude = $IncludeInput<$Schema, "Avatar">;
 export type AvatarOmit = $OmitInput<$Schema, "Avatar">;
-export type AvatarGetPayload<Args extends $SelectIncludeOmit<$Schema, "Avatar", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Avatar", Options, Args>;
+export type AvatarGetPayload<Args extends $SelectIncludeOmit<$Schema, "Avatar", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Avatar", Args, Options>;
 export type OutOfOfficeEntryFindManyArgs = $FindManyArgs<$Schema, "OutOfOfficeEntry">;
 export type OutOfOfficeEntryFindUniqueArgs = $FindUniqueArgs<$Schema, "OutOfOfficeEntry">;
 export type OutOfOfficeEntryFindFirstArgs = $FindFirstArgs<$Schema, "OutOfOfficeEntry">;
@@ -1367,7 +1367,7 @@ export type OutOfOfficeEntryWhereInput = $WhereInput<$Schema, "OutOfOfficeEntry"
 export type OutOfOfficeEntrySelect = $SelectInput<$Schema, "OutOfOfficeEntry">;
 export type OutOfOfficeEntryInclude = $IncludeInput<$Schema, "OutOfOfficeEntry">;
 export type OutOfOfficeEntryOmit = $OmitInput<$Schema, "OutOfOfficeEntry">;
-export type OutOfOfficeEntryGetPayload<Args extends $SelectIncludeOmit<$Schema, "OutOfOfficeEntry", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OutOfOfficeEntry", Options, Args>;
+export type OutOfOfficeEntryGetPayload<Args extends $SelectIncludeOmit<$Schema, "OutOfOfficeEntry", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OutOfOfficeEntry", Args, Options>;
 export type OutOfOfficeReasonFindManyArgs = $FindManyArgs<$Schema, "OutOfOfficeReason">;
 export type OutOfOfficeReasonFindUniqueArgs = $FindUniqueArgs<$Schema, "OutOfOfficeReason">;
 export type OutOfOfficeReasonFindFirstArgs = $FindFirstArgs<$Schema, "OutOfOfficeReason">;
@@ -1387,7 +1387,7 @@ export type OutOfOfficeReasonWhereInput = $WhereInput<$Schema, "OutOfOfficeReaso
 export type OutOfOfficeReasonSelect = $SelectInput<$Schema, "OutOfOfficeReason">;
 export type OutOfOfficeReasonInclude = $IncludeInput<$Schema, "OutOfOfficeReason">;
 export type OutOfOfficeReasonOmit = $OmitInput<$Schema, "OutOfOfficeReason">;
-export type OutOfOfficeReasonGetPayload<Args extends $SelectIncludeOmit<$Schema, "OutOfOfficeReason", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OutOfOfficeReason", Options, Args>;
+export type OutOfOfficeReasonGetPayload<Args extends $SelectIncludeOmit<$Schema, "OutOfOfficeReason", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OutOfOfficeReason", Args, Options>;
 export type PlatformOAuthClientFindManyArgs = $FindManyArgs<$Schema, "PlatformOAuthClient">;
 export type PlatformOAuthClientFindUniqueArgs = $FindUniqueArgs<$Schema, "PlatformOAuthClient">;
 export type PlatformOAuthClientFindFirstArgs = $FindFirstArgs<$Schema, "PlatformOAuthClient">;
@@ -1407,7 +1407,7 @@ export type PlatformOAuthClientWhereInput = $WhereInput<$Schema, "PlatformOAuthC
 export type PlatformOAuthClientSelect = $SelectInput<$Schema, "PlatformOAuthClient">;
 export type PlatformOAuthClientInclude = $IncludeInput<$Schema, "PlatformOAuthClient">;
 export type PlatformOAuthClientOmit = $OmitInput<$Schema, "PlatformOAuthClient">;
-export type PlatformOAuthClientGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformOAuthClient", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PlatformOAuthClient", Options, Args>;
+export type PlatformOAuthClientGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformOAuthClient", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PlatformOAuthClient", Args, Options>;
 export type PlatformAuthorizationTokenFindManyArgs = $FindManyArgs<$Schema, "PlatformAuthorizationToken">;
 export type PlatformAuthorizationTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "PlatformAuthorizationToken">;
 export type PlatformAuthorizationTokenFindFirstArgs = $FindFirstArgs<$Schema, "PlatformAuthorizationToken">;
@@ -1427,7 +1427,7 @@ export type PlatformAuthorizationTokenWhereInput = $WhereInput<$Schema, "Platfor
 export type PlatformAuthorizationTokenSelect = $SelectInput<$Schema, "PlatformAuthorizationToken">;
 export type PlatformAuthorizationTokenInclude = $IncludeInput<$Schema, "PlatformAuthorizationToken">;
 export type PlatformAuthorizationTokenOmit = $OmitInput<$Schema, "PlatformAuthorizationToken">;
-export type PlatformAuthorizationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformAuthorizationToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PlatformAuthorizationToken", Options, Args>;
+export type PlatformAuthorizationTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformAuthorizationToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PlatformAuthorizationToken", Args, Options>;
 export type AccessTokenFindManyArgs = $FindManyArgs<$Schema, "AccessToken">;
 export type AccessTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "AccessToken">;
 export type AccessTokenFindFirstArgs = $FindFirstArgs<$Schema, "AccessToken">;
@@ -1447,7 +1447,7 @@ export type AccessTokenWhereInput = $WhereInput<$Schema, "AccessToken">;
 export type AccessTokenSelect = $SelectInput<$Schema, "AccessToken">;
 export type AccessTokenInclude = $IncludeInput<$Schema, "AccessToken">;
 export type AccessTokenOmit = $OmitInput<$Schema, "AccessToken">;
-export type AccessTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "AccessToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AccessToken", Options, Args>;
+export type AccessTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "AccessToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AccessToken", Args, Options>;
 export type RefreshTokenFindManyArgs = $FindManyArgs<$Schema, "RefreshToken">;
 export type RefreshTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "RefreshToken">;
 export type RefreshTokenFindFirstArgs = $FindFirstArgs<$Schema, "RefreshToken">;
@@ -1467,7 +1467,7 @@ export type RefreshTokenWhereInput = $WhereInput<$Schema, "RefreshToken">;
 export type RefreshTokenSelect = $SelectInput<$Schema, "RefreshToken">;
 export type RefreshTokenInclude = $IncludeInput<$Schema, "RefreshToken">;
 export type RefreshTokenOmit = $OmitInput<$Schema, "RefreshToken">;
-export type RefreshTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "RefreshToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RefreshToken", Options, Args>;
+export type RefreshTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "RefreshToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RefreshToken", Args, Options>;
 export type DSyncDataFindManyArgs = $FindManyArgs<$Schema, "DSyncData">;
 export type DSyncDataFindUniqueArgs = $FindUniqueArgs<$Schema, "DSyncData">;
 export type DSyncDataFindFirstArgs = $FindFirstArgs<$Schema, "DSyncData">;
@@ -1487,7 +1487,7 @@ export type DSyncDataWhereInput = $WhereInput<$Schema, "DSyncData">;
 export type DSyncDataSelect = $SelectInput<$Schema, "DSyncData">;
 export type DSyncDataInclude = $IncludeInput<$Schema, "DSyncData">;
 export type DSyncDataOmit = $OmitInput<$Schema, "DSyncData">;
-export type DSyncDataGetPayload<Args extends $SelectIncludeOmit<$Schema, "DSyncData", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DSyncData", Options, Args>;
+export type DSyncDataGetPayload<Args extends $SelectIncludeOmit<$Schema, "DSyncData", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DSyncData", Args, Options>;
 export type DSyncTeamGroupMappingFindManyArgs = $FindManyArgs<$Schema, "DSyncTeamGroupMapping">;
 export type DSyncTeamGroupMappingFindUniqueArgs = $FindUniqueArgs<$Schema, "DSyncTeamGroupMapping">;
 export type DSyncTeamGroupMappingFindFirstArgs = $FindFirstArgs<$Schema, "DSyncTeamGroupMapping">;
@@ -1507,7 +1507,7 @@ export type DSyncTeamGroupMappingWhereInput = $WhereInput<$Schema, "DSyncTeamGro
 export type DSyncTeamGroupMappingSelect = $SelectInput<$Schema, "DSyncTeamGroupMapping">;
 export type DSyncTeamGroupMappingInclude = $IncludeInput<$Schema, "DSyncTeamGroupMapping">;
 export type DSyncTeamGroupMappingOmit = $OmitInput<$Schema, "DSyncTeamGroupMapping">;
-export type DSyncTeamGroupMappingGetPayload<Args extends $SelectIncludeOmit<$Schema, "DSyncTeamGroupMapping", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DSyncTeamGroupMapping", Options, Args>;
+export type DSyncTeamGroupMappingGetPayload<Args extends $SelectIncludeOmit<$Schema, "DSyncTeamGroupMapping", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DSyncTeamGroupMapping", Args, Options>;
 export type SecondaryEmailFindManyArgs = $FindManyArgs<$Schema, "SecondaryEmail">;
 export type SecondaryEmailFindUniqueArgs = $FindUniqueArgs<$Schema, "SecondaryEmail">;
 export type SecondaryEmailFindFirstArgs = $FindFirstArgs<$Schema, "SecondaryEmail">;
@@ -1527,7 +1527,7 @@ export type SecondaryEmailWhereInput = $WhereInput<$Schema, "SecondaryEmail">;
 export type SecondaryEmailSelect = $SelectInput<$Schema, "SecondaryEmail">;
 export type SecondaryEmailInclude = $IncludeInput<$Schema, "SecondaryEmail">;
 export type SecondaryEmailOmit = $OmitInput<$Schema, "SecondaryEmail">;
-export type SecondaryEmailGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecondaryEmail", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SecondaryEmail", Options, Args>;
+export type SecondaryEmailGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecondaryEmail", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SecondaryEmail", Args, Options>;
 export type TaskFindManyArgs = $FindManyArgs<$Schema, "Task">;
 export type TaskFindUniqueArgs = $FindUniqueArgs<$Schema, "Task">;
 export type TaskFindFirstArgs = $FindFirstArgs<$Schema, "Task">;
@@ -1547,7 +1547,7 @@ export type TaskWhereInput = $WhereInput<$Schema, "Task">;
 export type TaskSelect = $SelectInput<$Schema, "Task">;
 export type TaskInclude = $IncludeInput<$Schema, "Task">;
 export type TaskOmit = $OmitInput<$Schema, "Task">;
-export type TaskGetPayload<Args extends $SelectIncludeOmit<$Schema, "Task", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Task", Options, Args>;
+export type TaskGetPayload<Args extends $SelectIncludeOmit<$Schema, "Task", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Task", Args, Options>;
 export type ManagedOrganizationFindManyArgs = $FindManyArgs<$Schema, "ManagedOrganization">;
 export type ManagedOrganizationFindUniqueArgs = $FindUniqueArgs<$Schema, "ManagedOrganization">;
 export type ManagedOrganizationFindFirstArgs = $FindFirstArgs<$Schema, "ManagedOrganization">;
@@ -1567,7 +1567,7 @@ export type ManagedOrganizationWhereInput = $WhereInput<$Schema, "ManagedOrganiz
 export type ManagedOrganizationSelect = $SelectInput<$Schema, "ManagedOrganization">;
 export type ManagedOrganizationInclude = $IncludeInput<$Schema, "ManagedOrganization">;
 export type ManagedOrganizationOmit = $OmitInput<$Schema, "ManagedOrganization">;
-export type ManagedOrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "ManagedOrganization", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ManagedOrganization", Options, Args>;
+export type ManagedOrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "ManagedOrganization", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ManagedOrganization", Args, Options>;
 export type PlatformBillingFindManyArgs = $FindManyArgs<$Schema, "PlatformBilling">;
 export type PlatformBillingFindUniqueArgs = $FindUniqueArgs<$Schema, "PlatformBilling">;
 export type PlatformBillingFindFirstArgs = $FindFirstArgs<$Schema, "PlatformBilling">;
@@ -1587,7 +1587,7 @@ export type PlatformBillingWhereInput = $WhereInput<$Schema, "PlatformBilling">;
 export type PlatformBillingSelect = $SelectInput<$Schema, "PlatformBilling">;
 export type PlatformBillingInclude = $IncludeInput<$Schema, "PlatformBilling">;
 export type PlatformBillingOmit = $OmitInput<$Schema, "PlatformBilling">;
-export type PlatformBillingGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformBilling", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PlatformBilling", Options, Args>;
+export type PlatformBillingGetPayload<Args extends $SelectIncludeOmit<$Schema, "PlatformBilling", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PlatformBilling", Args, Options>;
 export type AttributeOptionFindManyArgs = $FindManyArgs<$Schema, "AttributeOption">;
 export type AttributeOptionFindUniqueArgs = $FindUniqueArgs<$Schema, "AttributeOption">;
 export type AttributeOptionFindFirstArgs = $FindFirstArgs<$Schema, "AttributeOption">;
@@ -1607,7 +1607,7 @@ export type AttributeOptionWhereInput = $WhereInput<$Schema, "AttributeOption">;
 export type AttributeOptionSelect = $SelectInput<$Schema, "AttributeOption">;
 export type AttributeOptionInclude = $IncludeInput<$Schema, "AttributeOption">;
 export type AttributeOptionOmit = $OmitInput<$Schema, "AttributeOption">;
-export type AttributeOptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "AttributeOption", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AttributeOption", Options, Args>;
+export type AttributeOptionGetPayload<Args extends $SelectIncludeOmit<$Schema, "AttributeOption", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AttributeOption", Args, Options>;
 export type AttributeFindManyArgs = $FindManyArgs<$Schema, "Attribute">;
 export type AttributeFindUniqueArgs = $FindUniqueArgs<$Schema, "Attribute">;
 export type AttributeFindFirstArgs = $FindFirstArgs<$Schema, "Attribute">;
@@ -1627,7 +1627,7 @@ export type AttributeWhereInput = $WhereInput<$Schema, "Attribute">;
 export type AttributeSelect = $SelectInput<$Schema, "Attribute">;
 export type AttributeInclude = $IncludeInput<$Schema, "Attribute">;
 export type AttributeOmit = $OmitInput<$Schema, "Attribute">;
-export type AttributeGetPayload<Args extends $SelectIncludeOmit<$Schema, "Attribute", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Attribute", Options, Args>;
+export type AttributeGetPayload<Args extends $SelectIncludeOmit<$Schema, "Attribute", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Attribute", Args, Options>;
 export type AttributeToUserFindManyArgs = $FindManyArgs<$Schema, "AttributeToUser">;
 export type AttributeToUserFindUniqueArgs = $FindUniqueArgs<$Schema, "AttributeToUser">;
 export type AttributeToUserFindFirstArgs = $FindFirstArgs<$Schema, "AttributeToUser">;
@@ -1647,7 +1647,7 @@ export type AttributeToUserWhereInput = $WhereInput<$Schema, "AttributeToUser">;
 export type AttributeToUserSelect = $SelectInput<$Schema, "AttributeToUser">;
 export type AttributeToUserInclude = $IncludeInput<$Schema, "AttributeToUser">;
 export type AttributeToUserOmit = $OmitInput<$Schema, "AttributeToUser">;
-export type AttributeToUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "AttributeToUser", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AttributeToUser", Options, Args>;
+export type AttributeToUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "AttributeToUser", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AttributeToUser", Args, Options>;
 export type AssignmentReasonFindManyArgs = $FindManyArgs<$Schema, "AssignmentReason">;
 export type AssignmentReasonFindUniqueArgs = $FindUniqueArgs<$Schema, "AssignmentReason">;
 export type AssignmentReasonFindFirstArgs = $FindFirstArgs<$Schema, "AssignmentReason">;
@@ -1667,7 +1667,7 @@ export type AssignmentReasonWhereInput = $WhereInput<$Schema, "AssignmentReason"
 export type AssignmentReasonSelect = $SelectInput<$Schema, "AssignmentReason">;
 export type AssignmentReasonInclude = $IncludeInput<$Schema, "AssignmentReason">;
 export type AssignmentReasonOmit = $OmitInput<$Schema, "AssignmentReason">;
-export type AssignmentReasonGetPayload<Args extends $SelectIncludeOmit<$Schema, "AssignmentReason", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AssignmentReason", Options, Args>;
+export type AssignmentReasonGetPayload<Args extends $SelectIncludeOmit<$Schema, "AssignmentReason", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AssignmentReason", Args, Options>;
 export type DelegationCredentialFindManyArgs = $FindManyArgs<$Schema, "DelegationCredential">;
 export type DelegationCredentialFindUniqueArgs = $FindUniqueArgs<$Schema, "DelegationCredential">;
 export type DelegationCredentialFindFirstArgs = $FindFirstArgs<$Schema, "DelegationCredential">;
@@ -1687,7 +1687,7 @@ export type DelegationCredentialWhereInput = $WhereInput<$Schema, "DelegationCre
 export type DelegationCredentialSelect = $SelectInput<$Schema, "DelegationCredential">;
 export type DelegationCredentialInclude = $IncludeInput<$Schema, "DelegationCredential">;
 export type DelegationCredentialOmit = $OmitInput<$Schema, "DelegationCredential">;
-export type DelegationCredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "DelegationCredential", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DelegationCredential", Options, Args>;
+export type DelegationCredentialGetPayload<Args extends $SelectIncludeOmit<$Schema, "DelegationCredential", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DelegationCredential", Args, Options>;
 export type DomainWideDelegationFindManyArgs = $FindManyArgs<$Schema, "DomainWideDelegation">;
 export type DomainWideDelegationFindUniqueArgs = $FindUniqueArgs<$Schema, "DomainWideDelegation">;
 export type DomainWideDelegationFindFirstArgs = $FindFirstArgs<$Schema, "DomainWideDelegation">;
@@ -1707,7 +1707,7 @@ export type DomainWideDelegationWhereInput = $WhereInput<$Schema, "DomainWideDel
 export type DomainWideDelegationSelect = $SelectInput<$Schema, "DomainWideDelegation">;
 export type DomainWideDelegationInclude = $IncludeInput<$Schema, "DomainWideDelegation">;
 export type DomainWideDelegationOmit = $OmitInput<$Schema, "DomainWideDelegation">;
-export type DomainWideDelegationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DomainWideDelegation", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DomainWideDelegation", Options, Args>;
+export type DomainWideDelegationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DomainWideDelegation", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DomainWideDelegation", Args, Options>;
 export type WorkspacePlatformFindManyArgs = $FindManyArgs<$Schema, "WorkspacePlatform">;
 export type WorkspacePlatformFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkspacePlatform">;
 export type WorkspacePlatformFindFirstArgs = $FindFirstArgs<$Schema, "WorkspacePlatform">;
@@ -1727,7 +1727,7 @@ export type WorkspacePlatformWhereInput = $WhereInput<$Schema, "WorkspacePlatfor
 export type WorkspacePlatformSelect = $SelectInput<$Schema, "WorkspacePlatform">;
 export type WorkspacePlatformInclude = $IncludeInput<$Schema, "WorkspacePlatform">;
 export type WorkspacePlatformOmit = $OmitInput<$Schema, "WorkspacePlatform">;
-export type WorkspacePlatformGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkspacePlatform", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkspacePlatform", Options, Args>;
+export type WorkspacePlatformGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkspacePlatform", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkspacePlatform", Args, Options>;
 export type EventTypeTranslationFindManyArgs = $FindManyArgs<$Schema, "EventTypeTranslation">;
 export type EventTypeTranslationFindUniqueArgs = $FindUniqueArgs<$Schema, "EventTypeTranslation">;
 export type EventTypeTranslationFindFirstArgs = $FindFirstArgs<$Schema, "EventTypeTranslation">;
@@ -1747,7 +1747,7 @@ export type EventTypeTranslationWhereInput = $WhereInput<$Schema, "EventTypeTran
 export type EventTypeTranslationSelect = $SelectInput<$Schema, "EventTypeTranslation">;
 export type EventTypeTranslationInclude = $IncludeInput<$Schema, "EventTypeTranslation">;
 export type EventTypeTranslationOmit = $OmitInput<$Schema, "EventTypeTranslation">;
-export type EventTypeTranslationGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventTypeTranslation", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "EventTypeTranslation", Options, Args>;
+export type EventTypeTranslationGetPayload<Args extends $SelectIncludeOmit<$Schema, "EventTypeTranslation", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "EventTypeTranslation", Args, Options>;
 export type WatchlistFindManyArgs = $FindManyArgs<$Schema, "Watchlist">;
 export type WatchlistFindUniqueArgs = $FindUniqueArgs<$Schema, "Watchlist">;
 export type WatchlistFindFirstArgs = $FindFirstArgs<$Schema, "Watchlist">;
@@ -1767,7 +1767,7 @@ export type WatchlistWhereInput = $WhereInput<$Schema, "Watchlist">;
 export type WatchlistSelect = $SelectInput<$Schema, "Watchlist">;
 export type WatchlistInclude = $IncludeInput<$Schema, "Watchlist">;
 export type WatchlistOmit = $OmitInput<$Schema, "Watchlist">;
-export type WatchlistGetPayload<Args extends $SelectIncludeOmit<$Schema, "Watchlist", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Watchlist", Options, Args>;
+export type WatchlistGetPayload<Args extends $SelectIncludeOmit<$Schema, "Watchlist", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Watchlist", Args, Options>;
 export type OrganizationOnboardingFindManyArgs = $FindManyArgs<$Schema, "OrganizationOnboarding">;
 export type OrganizationOnboardingFindUniqueArgs = $FindUniqueArgs<$Schema, "OrganizationOnboarding">;
 export type OrganizationOnboardingFindFirstArgs = $FindFirstArgs<$Schema, "OrganizationOnboarding">;
@@ -1787,7 +1787,7 @@ export type OrganizationOnboardingWhereInput = $WhereInput<$Schema, "Organizatio
 export type OrganizationOnboardingSelect = $SelectInput<$Schema, "OrganizationOnboarding">;
 export type OrganizationOnboardingInclude = $IncludeInput<$Schema, "OrganizationOnboarding">;
 export type OrganizationOnboardingOmit = $OmitInput<$Schema, "OrganizationOnboarding">;
-export type OrganizationOnboardingGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationOnboarding", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OrganizationOnboarding", Options, Args>;
+export type OrganizationOnboardingGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationOnboarding", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OrganizationOnboarding", Args, Options>;
 export type App_RoutingForms_IncompleteBookingActionsFindManyArgs = $FindManyArgs<$Schema, "App_RoutingForms_IncompleteBookingActions">;
 export type App_RoutingForms_IncompleteBookingActionsFindUniqueArgs = $FindUniqueArgs<$Schema, "App_RoutingForms_IncompleteBookingActions">;
 export type App_RoutingForms_IncompleteBookingActionsFindFirstArgs = $FindFirstArgs<$Schema, "App_RoutingForms_IncompleteBookingActions">;
@@ -1807,7 +1807,7 @@ export type App_RoutingForms_IncompleteBookingActionsWhereInput = $WhereInput<$S
 export type App_RoutingForms_IncompleteBookingActionsSelect = $SelectInput<$Schema, "App_RoutingForms_IncompleteBookingActions">;
 export type App_RoutingForms_IncompleteBookingActionsInclude = $IncludeInput<$Schema, "App_RoutingForms_IncompleteBookingActions">;
 export type App_RoutingForms_IncompleteBookingActionsOmit = $OmitInput<$Schema, "App_RoutingForms_IncompleteBookingActions">;
-export type App_RoutingForms_IncompleteBookingActionsGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_IncompleteBookingActions", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "App_RoutingForms_IncompleteBookingActions", Options, Args>;
+export type App_RoutingForms_IncompleteBookingActionsGetPayload<Args extends $SelectIncludeOmit<$Schema, "App_RoutingForms_IncompleteBookingActions", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "App_RoutingForms_IncompleteBookingActions", Args, Options>;
 export type InternalNotePresetFindManyArgs = $FindManyArgs<$Schema, "InternalNotePreset">;
 export type InternalNotePresetFindUniqueArgs = $FindUniqueArgs<$Schema, "InternalNotePreset">;
 export type InternalNotePresetFindFirstArgs = $FindFirstArgs<$Schema, "InternalNotePreset">;
@@ -1827,7 +1827,7 @@ export type InternalNotePresetWhereInput = $WhereInput<$Schema, "InternalNotePre
 export type InternalNotePresetSelect = $SelectInput<$Schema, "InternalNotePreset">;
 export type InternalNotePresetInclude = $IncludeInput<$Schema, "InternalNotePreset">;
 export type InternalNotePresetOmit = $OmitInput<$Schema, "InternalNotePreset">;
-export type InternalNotePresetGetPayload<Args extends $SelectIncludeOmit<$Schema, "InternalNotePreset", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "InternalNotePreset", Options, Args>;
+export type InternalNotePresetGetPayload<Args extends $SelectIncludeOmit<$Schema, "InternalNotePreset", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "InternalNotePreset", Args, Options>;
 export type FilterSegmentFindManyArgs = $FindManyArgs<$Schema, "FilterSegment">;
 export type FilterSegmentFindUniqueArgs = $FindUniqueArgs<$Schema, "FilterSegment">;
 export type FilterSegmentFindFirstArgs = $FindFirstArgs<$Schema, "FilterSegment">;
@@ -1847,7 +1847,7 @@ export type FilterSegmentWhereInput = $WhereInput<$Schema, "FilterSegment">;
 export type FilterSegmentSelect = $SelectInput<$Schema, "FilterSegment">;
 export type FilterSegmentInclude = $IncludeInput<$Schema, "FilterSegment">;
 export type FilterSegmentOmit = $OmitInput<$Schema, "FilterSegment">;
-export type FilterSegmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "FilterSegment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "FilterSegment", Options, Args>;
+export type FilterSegmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "FilterSegment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "FilterSegment", Args, Options>;
 export type UserFilterSegmentPreferenceFindManyArgs = $FindManyArgs<$Schema, "UserFilterSegmentPreference">;
 export type UserFilterSegmentPreferenceFindUniqueArgs = $FindUniqueArgs<$Schema, "UserFilterSegmentPreference">;
 export type UserFilterSegmentPreferenceFindFirstArgs = $FindFirstArgs<$Schema, "UserFilterSegmentPreference">;
@@ -1867,7 +1867,7 @@ export type UserFilterSegmentPreferenceWhereInput = $WhereInput<$Schema, "UserFi
 export type UserFilterSegmentPreferenceSelect = $SelectInput<$Schema, "UserFilterSegmentPreference">;
 export type UserFilterSegmentPreferenceInclude = $IncludeInput<$Schema, "UserFilterSegmentPreference">;
 export type UserFilterSegmentPreferenceOmit = $OmitInput<$Schema, "UserFilterSegmentPreference">;
-export type UserFilterSegmentPreferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserFilterSegmentPreference", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "UserFilterSegmentPreference", Options, Args>;
+export type UserFilterSegmentPreferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "UserFilterSegmentPreference", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "UserFilterSegmentPreference", Args, Options>;
 export type BookingInternalNoteFindManyArgs = $FindManyArgs<$Schema, "BookingInternalNote">;
 export type BookingInternalNoteFindUniqueArgs = $FindUniqueArgs<$Schema, "BookingInternalNote">;
 export type BookingInternalNoteFindFirstArgs = $FindFirstArgs<$Schema, "BookingInternalNote">;
@@ -1887,7 +1887,7 @@ export type BookingInternalNoteWhereInput = $WhereInput<$Schema, "BookingInterna
 export type BookingInternalNoteSelect = $SelectInput<$Schema, "BookingInternalNote">;
 export type BookingInternalNoteInclude = $IncludeInput<$Schema, "BookingInternalNote">;
 export type BookingInternalNoteOmit = $OmitInput<$Schema, "BookingInternalNote">;
-export type BookingInternalNoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingInternalNote", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BookingInternalNote", Options, Args>;
+export type BookingInternalNoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "BookingInternalNote", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BookingInternalNote", Args, Options>;
 export type WorkflowOptOutContactFindManyArgs = $FindManyArgs<$Schema, "WorkflowOptOutContact">;
 export type WorkflowOptOutContactFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkflowOptOutContact">;
 export type WorkflowOptOutContactFindFirstArgs = $FindFirstArgs<$Schema, "WorkflowOptOutContact">;
@@ -1907,7 +1907,7 @@ export type WorkflowOptOutContactWhereInput = $WhereInput<$Schema, "WorkflowOptO
 export type WorkflowOptOutContactSelect = $SelectInput<$Schema, "WorkflowOptOutContact">;
 export type WorkflowOptOutContactInclude = $IncludeInput<$Schema, "WorkflowOptOutContact">;
 export type WorkflowOptOutContactOmit = $OmitInput<$Schema, "WorkflowOptOutContact">;
-export type WorkflowOptOutContactGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowOptOutContact", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkflowOptOutContact", Options, Args>;
+export type WorkflowOptOutContactGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkflowOptOutContact", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkflowOptOutContact", Args, Options>;
 export type RoleFindManyArgs = $FindManyArgs<$Schema, "Role">;
 export type RoleFindUniqueArgs = $FindUniqueArgs<$Schema, "Role">;
 export type RoleFindFirstArgs = $FindFirstArgs<$Schema, "Role">;
@@ -1927,7 +1927,7 @@ export type RoleWhereInput = $WhereInput<$Schema, "Role">;
 export type RoleSelect = $SelectInput<$Schema, "Role">;
 export type RoleInclude = $IncludeInput<$Schema, "Role">;
 export type RoleOmit = $OmitInput<$Schema, "Role">;
-export type RoleGetPayload<Args extends $SelectIncludeOmit<$Schema, "Role", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Role", Options, Args>;
+export type RoleGetPayload<Args extends $SelectIncludeOmit<$Schema, "Role", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Role", Args, Options>;
 export type RolePermissionFindManyArgs = $FindManyArgs<$Schema, "RolePermission">;
 export type RolePermissionFindUniqueArgs = $FindUniqueArgs<$Schema, "RolePermission">;
 export type RolePermissionFindFirstArgs = $FindFirstArgs<$Schema, "RolePermission">;
@@ -1947,4 +1947,4 @@ export type RolePermissionWhereInput = $WhereInput<$Schema, "RolePermission">;
 export type RolePermissionSelect = $SelectInput<$Schema, "RolePermission">;
 export type RolePermissionInclude = $IncludeInput<$Schema, "RolePermission">;
 export type RolePermissionOmit = $OmitInput<$Schema, "RolePermission">;
-export type RolePermissionGetPayload<Args extends $SelectIncludeOmit<$Schema, "RolePermission", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RolePermission", Options, Args>;
+export type RolePermissionGetPayload<Args extends $SelectIncludeOmit<$Schema, "RolePermission", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RolePermission", Args, Options>;
diff --git a/tests/e2e/github-repos/formbricks/input.ts b/tests/e2e/github-repos/formbricks/input.ts
index b50d380e4..5cce0a960 100644
--- a/tests/e2e/github-repos/formbricks/input.ts
+++ b/tests/e2e/github-repos/formbricks/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type WebhookFindManyArgs = $FindManyArgs<$Schema, "Webhook">;
 export type WebhookFindUniqueArgs = $FindUniqueArgs<$Schema, "Webhook">;
 export type WebhookFindFirstArgs = $FindFirstArgs<$Schema, "Webhook">;
@@ -27,7 +27,7 @@ export type WebhookWhereInput = $WhereInput<$Schema, "Webhook">;
 export type WebhookSelect = $SelectInput<$Schema, "Webhook">;
 export type WebhookInclude = $IncludeInput<$Schema, "Webhook">;
 export type WebhookOmit = $OmitInput<$Schema, "Webhook">;
-export type WebhookGetPayload<Args extends $SelectIncludeOmit<$Schema, "Webhook", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Webhook", Options, Args>;
+export type WebhookGetPayload<Args extends $SelectIncludeOmit<$Schema, "Webhook", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Webhook", Args, Options>;
 export type ContactAttributeFindManyArgs = $FindManyArgs<$Schema, "ContactAttribute">;
 export type ContactAttributeFindUniqueArgs = $FindUniqueArgs<$Schema, "ContactAttribute">;
 export type ContactAttributeFindFirstArgs = $FindFirstArgs<$Schema, "ContactAttribute">;
@@ -47,7 +47,7 @@ export type ContactAttributeWhereInput = $WhereInput<$Schema, "ContactAttribute"
 export type ContactAttributeSelect = $SelectInput<$Schema, "ContactAttribute">;
 export type ContactAttributeInclude = $IncludeInput<$Schema, "ContactAttribute">;
 export type ContactAttributeOmit = $OmitInput<$Schema, "ContactAttribute">;
-export type ContactAttributeGetPayload<Args extends $SelectIncludeOmit<$Schema, "ContactAttribute", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ContactAttribute", Options, Args>;
+export type ContactAttributeGetPayload<Args extends $SelectIncludeOmit<$Schema, "ContactAttribute", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ContactAttribute", Args, Options>;
 export type ContactAttributeKeyFindManyArgs = $FindManyArgs<$Schema, "ContactAttributeKey">;
 export type ContactAttributeKeyFindUniqueArgs = $FindUniqueArgs<$Schema, "ContactAttributeKey">;
 export type ContactAttributeKeyFindFirstArgs = $FindFirstArgs<$Schema, "ContactAttributeKey">;
@@ -67,7 +67,7 @@ export type ContactAttributeKeyWhereInput = $WhereInput<$Schema, "ContactAttribu
 export type ContactAttributeKeySelect = $SelectInput<$Schema, "ContactAttributeKey">;
 export type ContactAttributeKeyInclude = $IncludeInput<$Schema, "ContactAttributeKey">;
 export type ContactAttributeKeyOmit = $OmitInput<$Schema, "ContactAttributeKey">;
-export type ContactAttributeKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ContactAttributeKey", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ContactAttributeKey", Options, Args>;
+export type ContactAttributeKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ContactAttributeKey", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ContactAttributeKey", Args, Options>;
 export type ContactFindManyArgs = $FindManyArgs<$Schema, "Contact">;
 export type ContactFindUniqueArgs = $FindUniqueArgs<$Schema, "Contact">;
 export type ContactFindFirstArgs = $FindFirstArgs<$Schema, "Contact">;
@@ -87,7 +87,7 @@ export type ContactWhereInput = $WhereInput<$Schema, "Contact">;
 export type ContactSelect = $SelectInput<$Schema, "Contact">;
 export type ContactInclude = $IncludeInput<$Schema, "Contact">;
 export type ContactOmit = $OmitInput<$Schema, "Contact">;
-export type ContactGetPayload<Args extends $SelectIncludeOmit<$Schema, "Contact", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Contact", Options, Args>;
+export type ContactGetPayload<Args extends $SelectIncludeOmit<$Schema, "Contact", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Contact", Args, Options>;
 export type ResponseFindManyArgs = $FindManyArgs<$Schema, "Response">;
 export type ResponseFindUniqueArgs = $FindUniqueArgs<$Schema, "Response">;
 export type ResponseFindFirstArgs = $FindFirstArgs<$Schema, "Response">;
@@ -107,7 +107,7 @@ export type ResponseWhereInput = $WhereInput<$Schema, "Response">;
 export type ResponseSelect = $SelectInput<$Schema, "Response">;
 export type ResponseInclude = $IncludeInput<$Schema, "Response">;
 export type ResponseOmit = $OmitInput<$Schema, "Response">;
-export type ResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "Response", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Response", Options, Args>;
+export type ResponseGetPayload<Args extends $SelectIncludeOmit<$Schema, "Response", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Response", Args, Options>;
 export type ResponseNoteFindManyArgs = $FindManyArgs<$Schema, "ResponseNote">;
 export type ResponseNoteFindUniqueArgs = $FindUniqueArgs<$Schema, "ResponseNote">;
 export type ResponseNoteFindFirstArgs = $FindFirstArgs<$Schema, "ResponseNote">;
@@ -127,7 +127,7 @@ export type ResponseNoteWhereInput = $WhereInput<$Schema, "ResponseNote">;
 export type ResponseNoteSelect = $SelectInput<$Schema, "ResponseNote">;
 export type ResponseNoteInclude = $IncludeInput<$Schema, "ResponseNote">;
 export type ResponseNoteOmit = $OmitInput<$Schema, "ResponseNote">;
-export type ResponseNoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "ResponseNote", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ResponseNote", Options, Args>;
+export type ResponseNoteGetPayload<Args extends $SelectIncludeOmit<$Schema, "ResponseNote", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ResponseNote", Args, Options>;
 export type TagFindManyArgs = $FindManyArgs<$Schema, "Tag">;
 export type TagFindUniqueArgs = $FindUniqueArgs<$Schema, "Tag">;
 export type TagFindFirstArgs = $FindFirstArgs<$Schema, "Tag">;
@@ -147,7 +147,7 @@ export type TagWhereInput = $WhereInput<$Schema, "Tag">;
 export type TagSelect = $SelectInput<$Schema, "Tag">;
 export type TagInclude = $IncludeInput<$Schema, "Tag">;
 export type TagOmit = $OmitInput<$Schema, "Tag">;
-export type TagGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tag", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Tag", Options, Args>;
+export type TagGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tag", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Tag", Args, Options>;
 export type TagsOnResponsesFindManyArgs = $FindManyArgs<$Schema, "TagsOnResponses">;
 export type TagsOnResponsesFindUniqueArgs = $FindUniqueArgs<$Schema, "TagsOnResponses">;
 export type TagsOnResponsesFindFirstArgs = $FindFirstArgs<$Schema, "TagsOnResponses">;
@@ -167,7 +167,7 @@ export type TagsOnResponsesWhereInput = $WhereInput<$Schema, "TagsOnResponses">;
 export type TagsOnResponsesSelect = $SelectInput<$Schema, "TagsOnResponses">;
 export type TagsOnResponsesInclude = $IncludeInput<$Schema, "TagsOnResponses">;
 export type TagsOnResponsesOmit = $OmitInput<$Schema, "TagsOnResponses">;
-export type TagsOnResponsesGetPayload<Args extends $SelectIncludeOmit<$Schema, "TagsOnResponses", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TagsOnResponses", Options, Args>;
+export type TagsOnResponsesGetPayload<Args extends $SelectIncludeOmit<$Schema, "TagsOnResponses", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TagsOnResponses", Args, Options>;
 export type DisplayFindManyArgs = $FindManyArgs<$Schema, "Display">;
 export type DisplayFindUniqueArgs = $FindUniqueArgs<$Schema, "Display">;
 export type DisplayFindFirstArgs = $FindFirstArgs<$Schema, "Display">;
@@ -187,7 +187,7 @@ export type DisplayWhereInput = $WhereInput<$Schema, "Display">;
 export type DisplaySelect = $SelectInput<$Schema, "Display">;
 export type DisplayInclude = $IncludeInput<$Schema, "Display">;
 export type DisplayOmit = $OmitInput<$Schema, "Display">;
-export type DisplayGetPayload<Args extends $SelectIncludeOmit<$Schema, "Display", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Display", Options, Args>;
+export type DisplayGetPayload<Args extends $SelectIncludeOmit<$Schema, "Display", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Display", Args, Options>;
 export type SurveyTriggerFindManyArgs = $FindManyArgs<$Schema, "SurveyTrigger">;
 export type SurveyTriggerFindUniqueArgs = $FindUniqueArgs<$Schema, "SurveyTrigger">;
 export type SurveyTriggerFindFirstArgs = $FindFirstArgs<$Schema, "SurveyTrigger">;
@@ -207,7 +207,7 @@ export type SurveyTriggerWhereInput = $WhereInput<$Schema, "SurveyTrigger">;
 export type SurveyTriggerSelect = $SelectInput<$Schema, "SurveyTrigger">;
 export type SurveyTriggerInclude = $IncludeInput<$Schema, "SurveyTrigger">;
 export type SurveyTriggerOmit = $OmitInput<$Schema, "SurveyTrigger">;
-export type SurveyTriggerGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyTrigger", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SurveyTrigger", Options, Args>;
+export type SurveyTriggerGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyTrigger", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SurveyTrigger", Args, Options>;
 export type SurveyAttributeFilterFindManyArgs = $FindManyArgs<$Schema, "SurveyAttributeFilter">;
 export type SurveyAttributeFilterFindUniqueArgs = $FindUniqueArgs<$Schema, "SurveyAttributeFilter">;
 export type SurveyAttributeFilterFindFirstArgs = $FindFirstArgs<$Schema, "SurveyAttributeFilter">;
@@ -227,7 +227,7 @@ export type SurveyAttributeFilterWhereInput = $WhereInput<$Schema, "SurveyAttrib
 export type SurveyAttributeFilterSelect = $SelectInput<$Schema, "SurveyAttributeFilter">;
 export type SurveyAttributeFilterInclude = $IncludeInput<$Schema, "SurveyAttributeFilter">;
 export type SurveyAttributeFilterOmit = $OmitInput<$Schema, "SurveyAttributeFilter">;
-export type SurveyAttributeFilterGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyAttributeFilter", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SurveyAttributeFilter", Options, Args>;
+export type SurveyAttributeFilterGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyAttributeFilter", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SurveyAttributeFilter", Args, Options>;
 export type SurveyFindManyArgs = $FindManyArgs<$Schema, "Survey">;
 export type SurveyFindUniqueArgs = $FindUniqueArgs<$Schema, "Survey">;
 export type SurveyFindFirstArgs = $FindFirstArgs<$Schema, "Survey">;
@@ -247,7 +247,7 @@ export type SurveyWhereInput = $WhereInput<$Schema, "Survey">;
 export type SurveySelect = $SelectInput<$Schema, "Survey">;
 export type SurveyInclude = $IncludeInput<$Schema, "Survey">;
 export type SurveyOmit = $OmitInput<$Schema, "Survey">;
-export type SurveyGetPayload<Args extends $SelectIncludeOmit<$Schema, "Survey", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Survey", Options, Args>;
+export type SurveyGetPayload<Args extends $SelectIncludeOmit<$Schema, "Survey", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Survey", Args, Options>;
 export type SurveyFollowUpFindManyArgs = $FindManyArgs<$Schema, "SurveyFollowUp">;
 export type SurveyFollowUpFindUniqueArgs = $FindUniqueArgs<$Schema, "SurveyFollowUp">;
 export type SurveyFollowUpFindFirstArgs = $FindFirstArgs<$Schema, "SurveyFollowUp">;
@@ -267,7 +267,7 @@ export type SurveyFollowUpWhereInput = $WhereInput<$Schema, "SurveyFollowUp">;
 export type SurveyFollowUpSelect = $SelectInput<$Schema, "SurveyFollowUp">;
 export type SurveyFollowUpInclude = $IncludeInput<$Schema, "SurveyFollowUp">;
 export type SurveyFollowUpOmit = $OmitInput<$Schema, "SurveyFollowUp">;
-export type SurveyFollowUpGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyFollowUp", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SurveyFollowUp", Options, Args>;
+export type SurveyFollowUpGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyFollowUp", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SurveyFollowUp", Args, Options>;
 export type ActionClassFindManyArgs = $FindManyArgs<$Schema, "ActionClass">;
 export type ActionClassFindUniqueArgs = $FindUniqueArgs<$Schema, "ActionClass">;
 export type ActionClassFindFirstArgs = $FindFirstArgs<$Schema, "ActionClass">;
@@ -287,7 +287,7 @@ export type ActionClassWhereInput = $WhereInput<$Schema, "ActionClass">;
 export type ActionClassSelect = $SelectInput<$Schema, "ActionClass">;
 export type ActionClassInclude = $IncludeInput<$Schema, "ActionClass">;
 export type ActionClassOmit = $OmitInput<$Schema, "ActionClass">;
-export type ActionClassGetPayload<Args extends $SelectIncludeOmit<$Schema, "ActionClass", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ActionClass", Options, Args>;
+export type ActionClassGetPayload<Args extends $SelectIncludeOmit<$Schema, "ActionClass", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ActionClass", Args, Options>;
 export type IntegrationFindManyArgs = $FindManyArgs<$Schema, "Integration">;
 export type IntegrationFindUniqueArgs = $FindUniqueArgs<$Schema, "Integration">;
 export type IntegrationFindFirstArgs = $FindFirstArgs<$Schema, "Integration">;
@@ -307,7 +307,7 @@ export type IntegrationWhereInput = $WhereInput<$Schema, "Integration">;
 export type IntegrationSelect = $SelectInput<$Schema, "Integration">;
 export type IntegrationInclude = $IncludeInput<$Schema, "Integration">;
 export type IntegrationOmit = $OmitInput<$Schema, "Integration">;
-export type IntegrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Integration", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Integration", Options, Args>;
+export type IntegrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Integration", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Integration", Args, Options>;
 export type DataMigrationFindManyArgs = $FindManyArgs<$Schema, "DataMigration">;
 export type DataMigrationFindUniqueArgs = $FindUniqueArgs<$Schema, "DataMigration">;
 export type DataMigrationFindFirstArgs = $FindFirstArgs<$Schema, "DataMigration">;
@@ -327,7 +327,7 @@ export type DataMigrationWhereInput = $WhereInput<$Schema, "DataMigration">;
 export type DataMigrationSelect = $SelectInput<$Schema, "DataMigration">;
 export type DataMigrationInclude = $IncludeInput<$Schema, "DataMigration">;
 export type DataMigrationOmit = $OmitInput<$Schema, "DataMigration">;
-export type DataMigrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DataMigration", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DataMigration", Options, Args>;
+export type DataMigrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DataMigration", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DataMigration", Args, Options>;
 export type EnvironmentFindManyArgs = $FindManyArgs<$Schema, "Environment">;
 export type EnvironmentFindUniqueArgs = $FindUniqueArgs<$Schema, "Environment">;
 export type EnvironmentFindFirstArgs = $FindFirstArgs<$Schema, "Environment">;
@@ -347,7 +347,7 @@ export type EnvironmentWhereInput = $WhereInput<$Schema, "Environment">;
 export type EnvironmentSelect = $SelectInput<$Schema, "Environment">;
 export type EnvironmentInclude = $IncludeInput<$Schema, "Environment">;
 export type EnvironmentOmit = $OmitInput<$Schema, "Environment">;
-export type EnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Environment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Environment", Options, Args>;
+export type EnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Environment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Environment", Args, Options>;
 export type ProjectFindManyArgs = $FindManyArgs<$Schema, "Project">;
 export type ProjectFindUniqueArgs = $FindUniqueArgs<$Schema, "Project">;
 export type ProjectFindFirstArgs = $FindFirstArgs<$Schema, "Project">;
@@ -367,7 +367,7 @@ export type ProjectWhereInput = $WhereInput<$Schema, "Project">;
 export type ProjectSelect = $SelectInput<$Schema, "Project">;
 export type ProjectInclude = $IncludeInput<$Schema, "Project">;
 export type ProjectOmit = $OmitInput<$Schema, "Project">;
-export type ProjectGetPayload<Args extends $SelectIncludeOmit<$Schema, "Project", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Project", Options, Args>;
+export type ProjectGetPayload<Args extends $SelectIncludeOmit<$Schema, "Project", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Project", Args, Options>;
 export type OrganizationFindManyArgs = $FindManyArgs<$Schema, "Organization">;
 export type OrganizationFindUniqueArgs = $FindUniqueArgs<$Schema, "Organization">;
 export type OrganizationFindFirstArgs = $FindFirstArgs<$Schema, "Organization">;
@@ -387,7 +387,7 @@ export type OrganizationWhereInput = $WhereInput<$Schema, "Organization">;
 export type OrganizationSelect = $SelectInput<$Schema, "Organization">;
 export type OrganizationInclude = $IncludeInput<$Schema, "Organization">;
 export type OrganizationOmit = $OmitInput<$Schema, "Organization">;
-export type OrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Organization", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Organization", Options, Args>;
+export type OrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Organization", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Organization", Args, Options>;
 export type MembershipFindManyArgs = $FindManyArgs<$Schema, "Membership">;
 export type MembershipFindUniqueArgs = $FindUniqueArgs<$Schema, "Membership">;
 export type MembershipFindFirstArgs = $FindFirstArgs<$Schema, "Membership">;
@@ -407,7 +407,7 @@ export type MembershipWhereInput = $WhereInput<$Schema, "Membership">;
 export type MembershipSelect = $SelectInput<$Schema, "Membership">;
 export type MembershipInclude = $IncludeInput<$Schema, "Membership">;
 export type MembershipOmit = $OmitInput<$Schema, "Membership">;
-export type MembershipGetPayload<Args extends $SelectIncludeOmit<$Schema, "Membership", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Membership", Options, Args>;
+export type MembershipGetPayload<Args extends $SelectIncludeOmit<$Schema, "Membership", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Membership", Args, Options>;
 export type InviteFindManyArgs = $FindManyArgs<$Schema, "Invite">;
 export type InviteFindUniqueArgs = $FindUniqueArgs<$Schema, "Invite">;
 export type InviteFindFirstArgs = $FindFirstArgs<$Schema, "Invite">;
@@ -427,7 +427,7 @@ export type InviteWhereInput = $WhereInput<$Schema, "Invite">;
 export type InviteSelect = $SelectInput<$Schema, "Invite">;
 export type InviteInclude = $IncludeInput<$Schema, "Invite">;
 export type InviteOmit = $OmitInput<$Schema, "Invite">;
-export type InviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "Invite", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Invite", Options, Args>;
+export type InviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "Invite", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Invite", Args, Options>;
 export type ApiKeyFindManyArgs = $FindManyArgs<$Schema, "ApiKey">;
 export type ApiKeyFindUniqueArgs = $FindUniqueArgs<$Schema, "ApiKey">;
 export type ApiKeyFindFirstArgs = $FindFirstArgs<$Schema, "ApiKey">;
@@ -447,7 +447,7 @@ export type ApiKeyWhereInput = $WhereInput<$Schema, "ApiKey">;
 export type ApiKeySelect = $SelectInput<$Schema, "ApiKey">;
 export type ApiKeyInclude = $IncludeInput<$Schema, "ApiKey">;
 export type ApiKeyOmit = $OmitInput<$Schema, "ApiKey">;
-export type ApiKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKey", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ApiKey", Options, Args>;
+export type ApiKeyGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKey", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ApiKey", Args, Options>;
 export type ApiKeyEnvironmentFindManyArgs = $FindManyArgs<$Schema, "ApiKeyEnvironment">;
 export type ApiKeyEnvironmentFindUniqueArgs = $FindUniqueArgs<$Schema, "ApiKeyEnvironment">;
 export type ApiKeyEnvironmentFindFirstArgs = $FindFirstArgs<$Schema, "ApiKeyEnvironment">;
@@ -467,7 +467,7 @@ export type ApiKeyEnvironmentWhereInput = $WhereInput<$Schema, "ApiKeyEnvironmen
 export type ApiKeyEnvironmentSelect = $SelectInput<$Schema, "ApiKeyEnvironment">;
 export type ApiKeyEnvironmentInclude = $IncludeInput<$Schema, "ApiKeyEnvironment">;
 export type ApiKeyEnvironmentOmit = $OmitInput<$Schema, "ApiKeyEnvironment">;
-export type ApiKeyEnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKeyEnvironment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ApiKeyEnvironment", Options, Args>;
+export type ApiKeyEnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "ApiKeyEnvironment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ApiKeyEnvironment", Args, Options>;
 export type AccountFindManyArgs = $FindManyArgs<$Schema, "Account">;
 export type AccountFindUniqueArgs = $FindUniqueArgs<$Schema, "Account">;
 export type AccountFindFirstArgs = $FindFirstArgs<$Schema, "Account">;
@@ -487,7 +487,7 @@ export type AccountWhereInput = $WhereInput<$Schema, "Account">;
 export type AccountSelect = $SelectInput<$Schema, "Account">;
 export type AccountInclude = $IncludeInput<$Schema, "Account">;
 export type AccountOmit = $OmitInput<$Schema, "Account">;
-export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Account", Options, Args>;
+export type AccountGetPayload<Args extends $SelectIncludeOmit<$Schema, "Account", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Account", Args, Options>;
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -507,7 +507,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type ShortUrlFindManyArgs = $FindManyArgs<$Schema, "ShortUrl">;
 export type ShortUrlFindUniqueArgs = $FindUniqueArgs<$Schema, "ShortUrl">;
 export type ShortUrlFindFirstArgs = $FindFirstArgs<$Schema, "ShortUrl">;
@@ -527,7 +527,7 @@ export type ShortUrlWhereInput = $WhereInput<$Schema, "ShortUrl">;
 export type ShortUrlSelect = $SelectInput<$Schema, "ShortUrl">;
 export type ShortUrlInclude = $IncludeInput<$Schema, "ShortUrl">;
 export type ShortUrlOmit = $OmitInput<$Schema, "ShortUrl">;
-export type ShortUrlGetPayload<Args extends $SelectIncludeOmit<$Schema, "ShortUrl", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ShortUrl", Options, Args>;
+export type ShortUrlGetPayload<Args extends $SelectIncludeOmit<$Schema, "ShortUrl", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ShortUrl", Args, Options>;
 export type SegmentFindManyArgs = $FindManyArgs<$Schema, "Segment">;
 export type SegmentFindUniqueArgs = $FindUniqueArgs<$Schema, "Segment">;
 export type SegmentFindFirstArgs = $FindFirstArgs<$Schema, "Segment">;
@@ -547,7 +547,7 @@ export type SegmentWhereInput = $WhereInput<$Schema, "Segment">;
 export type SegmentSelect = $SelectInput<$Schema, "Segment">;
 export type SegmentInclude = $IncludeInput<$Schema, "Segment">;
 export type SegmentOmit = $OmitInput<$Schema, "Segment">;
-export type SegmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Segment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Segment", Options, Args>;
+export type SegmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Segment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Segment", Args, Options>;
 export type LanguageFindManyArgs = $FindManyArgs<$Schema, "Language">;
 export type LanguageFindUniqueArgs = $FindUniqueArgs<$Schema, "Language">;
 export type LanguageFindFirstArgs = $FindFirstArgs<$Schema, "Language">;
@@ -567,7 +567,7 @@ export type LanguageWhereInput = $WhereInput<$Schema, "Language">;
 export type LanguageSelect = $SelectInput<$Schema, "Language">;
 export type LanguageInclude = $IncludeInput<$Schema, "Language">;
 export type LanguageOmit = $OmitInput<$Schema, "Language">;
-export type LanguageGetPayload<Args extends $SelectIncludeOmit<$Schema, "Language", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Language", Options, Args>;
+export type LanguageGetPayload<Args extends $SelectIncludeOmit<$Schema, "Language", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Language", Args, Options>;
 export type SurveyLanguageFindManyArgs = $FindManyArgs<$Schema, "SurveyLanguage">;
 export type SurveyLanguageFindUniqueArgs = $FindUniqueArgs<$Schema, "SurveyLanguage">;
 export type SurveyLanguageFindFirstArgs = $FindFirstArgs<$Schema, "SurveyLanguage">;
@@ -587,7 +587,7 @@ export type SurveyLanguageWhereInput = $WhereInput<$Schema, "SurveyLanguage">;
 export type SurveyLanguageSelect = $SelectInput<$Schema, "SurveyLanguage">;
 export type SurveyLanguageInclude = $IncludeInput<$Schema, "SurveyLanguage">;
 export type SurveyLanguageOmit = $OmitInput<$Schema, "SurveyLanguage">;
-export type SurveyLanguageGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyLanguage", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SurveyLanguage", Options, Args>;
+export type SurveyLanguageGetPayload<Args extends $SelectIncludeOmit<$Schema, "SurveyLanguage", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SurveyLanguage", Args, Options>;
 export type InsightFindManyArgs = $FindManyArgs<$Schema, "Insight">;
 export type InsightFindUniqueArgs = $FindUniqueArgs<$Schema, "Insight">;
 export type InsightFindFirstArgs = $FindFirstArgs<$Schema, "Insight">;
@@ -607,7 +607,7 @@ export type InsightWhereInput = $WhereInput<$Schema, "Insight">;
 export type InsightSelect = $SelectInput<$Schema, "Insight">;
 export type InsightInclude = $IncludeInput<$Schema, "Insight">;
 export type InsightOmit = $OmitInput<$Schema, "Insight">;
-export type InsightGetPayload<Args extends $SelectIncludeOmit<$Schema, "Insight", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Insight", Options, Args>;
+export type InsightGetPayload<Args extends $SelectIncludeOmit<$Schema, "Insight", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Insight", Args, Options>;
 export type DocumentInsightFindManyArgs = $FindManyArgs<$Schema, "DocumentInsight">;
 export type DocumentInsightFindUniqueArgs = $FindUniqueArgs<$Schema, "DocumentInsight">;
 export type DocumentInsightFindFirstArgs = $FindFirstArgs<$Schema, "DocumentInsight">;
@@ -627,7 +627,7 @@ export type DocumentInsightWhereInput = $WhereInput<$Schema, "DocumentInsight">;
 export type DocumentInsightSelect = $SelectInput<$Schema, "DocumentInsight">;
 export type DocumentInsightInclude = $IncludeInput<$Schema, "DocumentInsight">;
 export type DocumentInsightOmit = $OmitInput<$Schema, "DocumentInsight">;
-export type DocumentInsightGetPayload<Args extends $SelectIncludeOmit<$Schema, "DocumentInsight", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DocumentInsight", Options, Args>;
+export type DocumentInsightGetPayload<Args extends $SelectIncludeOmit<$Schema, "DocumentInsight", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DocumentInsight", Args, Options>;
 export type DocumentFindManyArgs = $FindManyArgs<$Schema, "Document">;
 export type DocumentFindUniqueArgs = $FindUniqueArgs<$Schema, "Document">;
 export type DocumentFindFirstArgs = $FindFirstArgs<$Schema, "Document">;
@@ -647,7 +647,7 @@ export type DocumentWhereInput = $WhereInput<$Schema, "Document">;
 export type DocumentSelect = $SelectInput<$Schema, "Document">;
 export type DocumentInclude = $IncludeInput<$Schema, "Document">;
 export type DocumentOmit = $OmitInput<$Schema, "Document">;
-export type DocumentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Document", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Document", Options, Args>;
+export type DocumentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Document", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Document", Args, Options>;
 export type TeamFindManyArgs = $FindManyArgs<$Schema, "Team">;
 export type TeamFindUniqueArgs = $FindUniqueArgs<$Schema, "Team">;
 export type TeamFindFirstArgs = $FindFirstArgs<$Schema, "Team">;
@@ -667,7 +667,7 @@ export type TeamWhereInput = $WhereInput<$Schema, "Team">;
 export type TeamSelect = $SelectInput<$Schema, "Team">;
 export type TeamInclude = $IncludeInput<$Schema, "Team">;
 export type TeamOmit = $OmitInput<$Schema, "Team">;
-export type TeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "Team", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Team", Options, Args>;
+export type TeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "Team", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Team", Args, Options>;
 export type TeamUserFindManyArgs = $FindManyArgs<$Schema, "TeamUser">;
 export type TeamUserFindUniqueArgs = $FindUniqueArgs<$Schema, "TeamUser">;
 export type TeamUserFindFirstArgs = $FindFirstArgs<$Schema, "TeamUser">;
@@ -687,7 +687,7 @@ export type TeamUserWhereInput = $WhereInput<$Schema, "TeamUser">;
 export type TeamUserSelect = $SelectInput<$Schema, "TeamUser">;
 export type TeamUserInclude = $IncludeInput<$Schema, "TeamUser">;
 export type TeamUserOmit = $OmitInput<$Schema, "TeamUser">;
-export type TeamUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "TeamUser", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TeamUser", Options, Args>;
+export type TeamUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "TeamUser", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TeamUser", Args, Options>;
 export type ProjectTeamFindManyArgs = $FindManyArgs<$Schema, "ProjectTeam">;
 export type ProjectTeamFindUniqueArgs = $FindUniqueArgs<$Schema, "ProjectTeam">;
 export type ProjectTeamFindFirstArgs = $FindFirstArgs<$Schema, "ProjectTeam">;
@@ -707,4 +707,4 @@ export type ProjectTeamWhereInput = $WhereInput<$Schema, "ProjectTeam">;
 export type ProjectTeamSelect = $SelectInput<$Schema, "ProjectTeam">;
 export type ProjectTeamInclude = $IncludeInput<$Schema, "ProjectTeam">;
 export type ProjectTeamOmit = $OmitInput<$Schema, "ProjectTeam">;
-export type ProjectTeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectTeam", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ProjectTeam", Options, Args>;
+export type ProjectTeamGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectTeam", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ProjectTeam", Args, Options>;
diff --git a/tests/e2e/github-repos/trigger.dev/input.ts b/tests/e2e/github-repos/trigger.dev/input.ts
index 55c0cfa8a..ac5e40dec 100644
--- a/tests/e2e/github-repos/trigger.dev/input.ts
+++ b/tests/e2e/github-repos/trigger.dev/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type InvitationCodeFindManyArgs = $FindManyArgs<$Schema, "InvitationCode">;
 export type InvitationCodeFindUniqueArgs = $FindUniqueArgs<$Schema, "InvitationCode">;
 export type InvitationCodeFindFirstArgs = $FindFirstArgs<$Schema, "InvitationCode">;
@@ -47,7 +47,7 @@ export type InvitationCodeWhereInput = $WhereInput<$Schema, "InvitationCode">;
 export type InvitationCodeSelect = $SelectInput<$Schema, "InvitationCode">;
 export type InvitationCodeInclude = $IncludeInput<$Schema, "InvitationCode">;
 export type InvitationCodeOmit = $OmitInput<$Schema, "InvitationCode">;
-export type InvitationCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "InvitationCode", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "InvitationCode", Options, Args>;
+export type InvitationCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "InvitationCode", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "InvitationCode", Args, Options>;
 export type AuthorizationCodeFindManyArgs = $FindManyArgs<$Schema, "AuthorizationCode">;
 export type AuthorizationCodeFindUniqueArgs = $FindUniqueArgs<$Schema, "AuthorizationCode">;
 export type AuthorizationCodeFindFirstArgs = $FindFirstArgs<$Schema, "AuthorizationCode">;
@@ -67,7 +67,7 @@ export type AuthorizationCodeWhereInput = $WhereInput<$Schema, "AuthorizationCod
 export type AuthorizationCodeSelect = $SelectInput<$Schema, "AuthorizationCode">;
 export type AuthorizationCodeInclude = $IncludeInput<$Schema, "AuthorizationCode">;
 export type AuthorizationCodeOmit = $OmitInput<$Schema, "AuthorizationCode">;
-export type AuthorizationCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "AuthorizationCode", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "AuthorizationCode", Options, Args>;
+export type AuthorizationCodeGetPayload<Args extends $SelectIncludeOmit<$Schema, "AuthorizationCode", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "AuthorizationCode", Args, Options>;
 export type PersonalAccessTokenFindManyArgs = $FindManyArgs<$Schema, "PersonalAccessToken">;
 export type PersonalAccessTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "PersonalAccessToken">;
 export type PersonalAccessTokenFindFirstArgs = $FindFirstArgs<$Schema, "PersonalAccessToken">;
@@ -87,7 +87,7 @@ export type PersonalAccessTokenWhereInput = $WhereInput<$Schema, "PersonalAccess
 export type PersonalAccessTokenSelect = $SelectInput<$Schema, "PersonalAccessToken">;
 export type PersonalAccessTokenInclude = $IncludeInput<$Schema, "PersonalAccessToken">;
 export type PersonalAccessTokenOmit = $OmitInput<$Schema, "PersonalAccessToken">;
-export type PersonalAccessTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "PersonalAccessToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "PersonalAccessToken", Options, Args>;
+export type PersonalAccessTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "PersonalAccessToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "PersonalAccessToken", Args, Options>;
 export type OrganizationFindManyArgs = $FindManyArgs<$Schema, "Organization">;
 export type OrganizationFindUniqueArgs = $FindUniqueArgs<$Schema, "Organization">;
 export type OrganizationFindFirstArgs = $FindFirstArgs<$Schema, "Organization">;
@@ -107,7 +107,7 @@ export type OrganizationWhereInput = $WhereInput<$Schema, "Organization">;
 export type OrganizationSelect = $SelectInput<$Schema, "Organization">;
 export type OrganizationInclude = $IncludeInput<$Schema, "Organization">;
 export type OrganizationOmit = $OmitInput<$Schema, "Organization">;
-export type OrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Organization", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Organization", Options, Args>;
+export type OrganizationGetPayload<Args extends $SelectIncludeOmit<$Schema, "Organization", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Organization", Args, Options>;
 export type OrgMemberFindManyArgs = $FindManyArgs<$Schema, "OrgMember">;
 export type OrgMemberFindUniqueArgs = $FindUniqueArgs<$Schema, "OrgMember">;
 export type OrgMemberFindFirstArgs = $FindFirstArgs<$Schema, "OrgMember">;
@@ -127,7 +127,7 @@ export type OrgMemberWhereInput = $WhereInput<$Schema, "OrgMember">;
 export type OrgMemberSelect = $SelectInput<$Schema, "OrgMember">;
 export type OrgMemberInclude = $IncludeInput<$Schema, "OrgMember">;
 export type OrgMemberOmit = $OmitInput<$Schema, "OrgMember">;
-export type OrgMemberGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrgMember", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OrgMember", Options, Args>;
+export type OrgMemberGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrgMember", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OrgMember", Args, Options>;
 export type OrgMemberInviteFindManyArgs = $FindManyArgs<$Schema, "OrgMemberInvite">;
 export type OrgMemberInviteFindUniqueArgs = $FindUniqueArgs<$Schema, "OrgMemberInvite">;
 export type OrgMemberInviteFindFirstArgs = $FindFirstArgs<$Schema, "OrgMemberInvite">;
@@ -147,7 +147,7 @@ export type OrgMemberInviteWhereInput = $WhereInput<$Schema, "OrgMemberInvite">;
 export type OrgMemberInviteSelect = $SelectInput<$Schema, "OrgMemberInvite">;
 export type OrgMemberInviteInclude = $IncludeInput<$Schema, "OrgMemberInvite">;
 export type OrgMemberInviteOmit = $OmitInput<$Schema, "OrgMemberInvite">;
-export type OrgMemberInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrgMemberInvite", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OrgMemberInvite", Options, Args>;
+export type OrgMemberInviteGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrgMemberInvite", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OrgMemberInvite", Args, Options>;
 export type RuntimeEnvironmentFindManyArgs = $FindManyArgs<$Schema, "RuntimeEnvironment">;
 export type RuntimeEnvironmentFindUniqueArgs = $FindUniqueArgs<$Schema, "RuntimeEnvironment">;
 export type RuntimeEnvironmentFindFirstArgs = $FindFirstArgs<$Schema, "RuntimeEnvironment">;
@@ -167,7 +167,7 @@ export type RuntimeEnvironmentWhereInput = $WhereInput<$Schema, "RuntimeEnvironm
 export type RuntimeEnvironmentSelect = $SelectInput<$Schema, "RuntimeEnvironment">;
 export type RuntimeEnvironmentInclude = $IncludeInput<$Schema, "RuntimeEnvironment">;
 export type RuntimeEnvironmentOmit = $OmitInput<$Schema, "RuntimeEnvironment">;
-export type RuntimeEnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "RuntimeEnvironment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RuntimeEnvironment", Options, Args>;
+export type RuntimeEnvironmentGetPayload<Args extends $SelectIncludeOmit<$Schema, "RuntimeEnvironment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RuntimeEnvironment", Args, Options>;
 export type ProjectFindManyArgs = $FindManyArgs<$Schema, "Project">;
 export type ProjectFindUniqueArgs = $FindUniqueArgs<$Schema, "Project">;
 export type ProjectFindFirstArgs = $FindFirstArgs<$Schema, "Project">;
@@ -187,7 +187,7 @@ export type ProjectWhereInput = $WhereInput<$Schema, "Project">;
 export type ProjectSelect = $SelectInput<$Schema, "Project">;
 export type ProjectInclude = $IncludeInput<$Schema, "Project">;
 export type ProjectOmit = $OmitInput<$Schema, "Project">;
-export type ProjectGetPayload<Args extends $SelectIncludeOmit<$Schema, "Project", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Project", Options, Args>;
+export type ProjectGetPayload<Args extends $SelectIncludeOmit<$Schema, "Project", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Project", Args, Options>;
 export type SecretReferenceFindManyArgs = $FindManyArgs<$Schema, "SecretReference">;
 export type SecretReferenceFindUniqueArgs = $FindUniqueArgs<$Schema, "SecretReference">;
 export type SecretReferenceFindFirstArgs = $FindFirstArgs<$Schema, "SecretReference">;
@@ -207,7 +207,7 @@ export type SecretReferenceWhereInput = $WhereInput<$Schema, "SecretReference">;
 export type SecretReferenceSelect = $SelectInput<$Schema, "SecretReference">;
 export type SecretReferenceInclude = $IncludeInput<$Schema, "SecretReference">;
 export type SecretReferenceOmit = $OmitInput<$Schema, "SecretReference">;
-export type SecretReferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecretReference", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SecretReference", Options, Args>;
+export type SecretReferenceGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecretReference", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SecretReference", Args, Options>;
 export type SecretStoreFindManyArgs = $FindManyArgs<$Schema, "SecretStore">;
 export type SecretStoreFindUniqueArgs = $FindUniqueArgs<$Schema, "SecretStore">;
 export type SecretStoreFindFirstArgs = $FindFirstArgs<$Schema, "SecretStore">;
@@ -227,7 +227,7 @@ export type SecretStoreWhereInput = $WhereInput<$Schema, "SecretStore">;
 export type SecretStoreSelect = $SelectInput<$Schema, "SecretStore">;
 export type SecretStoreInclude = $IncludeInput<$Schema, "SecretStore">;
 export type SecretStoreOmit = $OmitInput<$Schema, "SecretStore">;
-export type SecretStoreGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecretStore", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SecretStore", Options, Args>;
+export type SecretStoreGetPayload<Args extends $SelectIncludeOmit<$Schema, "SecretStore", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SecretStore", Args, Options>;
 export type DataMigrationFindManyArgs = $FindManyArgs<$Schema, "DataMigration">;
 export type DataMigrationFindUniqueArgs = $FindUniqueArgs<$Schema, "DataMigration">;
 export type DataMigrationFindFirstArgs = $FindFirstArgs<$Schema, "DataMigration">;
@@ -247,7 +247,7 @@ export type DataMigrationWhereInput = $WhereInput<$Schema, "DataMigration">;
 export type DataMigrationSelect = $SelectInput<$Schema, "DataMigration">;
 export type DataMigrationInclude = $IncludeInput<$Schema, "DataMigration">;
 export type DataMigrationOmit = $OmitInput<$Schema, "DataMigration">;
-export type DataMigrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DataMigration", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "DataMigration", Options, Args>;
+export type DataMigrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "DataMigration", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "DataMigration", Args, Options>;
 export type BackgroundWorkerFindManyArgs = $FindManyArgs<$Schema, "BackgroundWorker">;
 export type BackgroundWorkerFindUniqueArgs = $FindUniqueArgs<$Schema, "BackgroundWorker">;
 export type BackgroundWorkerFindFirstArgs = $FindFirstArgs<$Schema, "BackgroundWorker">;
@@ -267,7 +267,7 @@ export type BackgroundWorkerWhereInput = $WhereInput<$Schema, "BackgroundWorker"
 export type BackgroundWorkerSelect = $SelectInput<$Schema, "BackgroundWorker">;
 export type BackgroundWorkerInclude = $IncludeInput<$Schema, "BackgroundWorker">;
 export type BackgroundWorkerOmit = $OmitInput<$Schema, "BackgroundWorker">;
-export type BackgroundWorkerGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorker", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BackgroundWorker", Options, Args>;
+export type BackgroundWorkerGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorker", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BackgroundWorker", Args, Options>;
 export type BackgroundWorkerFileFindManyArgs = $FindManyArgs<$Schema, "BackgroundWorkerFile">;
 export type BackgroundWorkerFileFindUniqueArgs = $FindUniqueArgs<$Schema, "BackgroundWorkerFile">;
 export type BackgroundWorkerFileFindFirstArgs = $FindFirstArgs<$Schema, "BackgroundWorkerFile">;
@@ -287,7 +287,7 @@ export type BackgroundWorkerFileWhereInput = $WhereInput<$Schema, "BackgroundWor
 export type BackgroundWorkerFileSelect = $SelectInput<$Schema, "BackgroundWorkerFile">;
 export type BackgroundWorkerFileInclude = $IncludeInput<$Schema, "BackgroundWorkerFile">;
 export type BackgroundWorkerFileOmit = $OmitInput<$Schema, "BackgroundWorkerFile">;
-export type BackgroundWorkerFileGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorkerFile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BackgroundWorkerFile", Options, Args>;
+export type BackgroundWorkerFileGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorkerFile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BackgroundWorkerFile", Args, Options>;
 export type BackgroundWorkerTaskFindManyArgs = $FindManyArgs<$Schema, "BackgroundWorkerTask">;
 export type BackgroundWorkerTaskFindUniqueArgs = $FindUniqueArgs<$Schema, "BackgroundWorkerTask">;
 export type BackgroundWorkerTaskFindFirstArgs = $FindFirstArgs<$Schema, "BackgroundWorkerTask">;
@@ -307,7 +307,7 @@ export type BackgroundWorkerTaskWhereInput = $WhereInput<$Schema, "BackgroundWor
 export type BackgroundWorkerTaskSelect = $SelectInput<$Schema, "BackgroundWorkerTask">;
 export type BackgroundWorkerTaskInclude = $IncludeInput<$Schema, "BackgroundWorkerTask">;
 export type BackgroundWorkerTaskOmit = $OmitInput<$Schema, "BackgroundWorkerTask">;
-export type BackgroundWorkerTaskGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorkerTask", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BackgroundWorkerTask", Options, Args>;
+export type BackgroundWorkerTaskGetPayload<Args extends $SelectIncludeOmit<$Schema, "BackgroundWorkerTask", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BackgroundWorkerTask", Args, Options>;
 export type TaskRunFindManyArgs = $FindManyArgs<$Schema, "TaskRun">;
 export type TaskRunFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRun">;
 export type TaskRunFindFirstArgs = $FindFirstArgs<$Schema, "TaskRun">;
@@ -327,7 +327,7 @@ export type TaskRunWhereInput = $WhereInput<$Schema, "TaskRun">;
 export type TaskRunSelect = $SelectInput<$Schema, "TaskRun">;
 export type TaskRunInclude = $IncludeInput<$Schema, "TaskRun">;
 export type TaskRunOmit = $OmitInput<$Schema, "TaskRun">;
-export type TaskRunGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRun", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRun", Options, Args>;
+export type TaskRunGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRun", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRun", Args, Options>;
 export type TaskRunExecutionSnapshotFindManyArgs = $FindManyArgs<$Schema, "TaskRunExecutionSnapshot">;
 export type TaskRunExecutionSnapshotFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunExecutionSnapshot">;
 export type TaskRunExecutionSnapshotFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunExecutionSnapshot">;
@@ -347,7 +347,7 @@ export type TaskRunExecutionSnapshotWhereInput = $WhereInput<$Schema, "TaskRunEx
 export type TaskRunExecutionSnapshotSelect = $SelectInput<$Schema, "TaskRunExecutionSnapshot">;
 export type TaskRunExecutionSnapshotInclude = $IncludeInput<$Schema, "TaskRunExecutionSnapshot">;
 export type TaskRunExecutionSnapshotOmit = $OmitInput<$Schema, "TaskRunExecutionSnapshot">;
-export type TaskRunExecutionSnapshotGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunExecutionSnapshot", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunExecutionSnapshot", Options, Args>;
+export type TaskRunExecutionSnapshotGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunExecutionSnapshot", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunExecutionSnapshot", Args, Options>;
 export type TaskRunCheckpointFindManyArgs = $FindManyArgs<$Schema, "TaskRunCheckpoint">;
 export type TaskRunCheckpointFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunCheckpoint">;
 export type TaskRunCheckpointFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunCheckpoint">;
@@ -367,7 +367,7 @@ export type TaskRunCheckpointWhereInput = $WhereInput<$Schema, "TaskRunCheckpoin
 export type TaskRunCheckpointSelect = $SelectInput<$Schema, "TaskRunCheckpoint">;
 export type TaskRunCheckpointInclude = $IncludeInput<$Schema, "TaskRunCheckpoint">;
 export type TaskRunCheckpointOmit = $OmitInput<$Schema, "TaskRunCheckpoint">;
-export type TaskRunCheckpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunCheckpoint", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunCheckpoint", Options, Args>;
+export type TaskRunCheckpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunCheckpoint", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunCheckpoint", Args, Options>;
 export type WaitpointFindManyArgs = $FindManyArgs<$Schema, "Waitpoint">;
 export type WaitpointFindUniqueArgs = $FindUniqueArgs<$Schema, "Waitpoint">;
 export type WaitpointFindFirstArgs = $FindFirstArgs<$Schema, "Waitpoint">;
@@ -387,7 +387,7 @@ export type WaitpointWhereInput = $WhereInput<$Schema, "Waitpoint">;
 export type WaitpointSelect = $SelectInput<$Schema, "Waitpoint">;
 export type WaitpointInclude = $IncludeInput<$Schema, "Waitpoint">;
 export type WaitpointOmit = $OmitInput<$Schema, "Waitpoint">;
-export type WaitpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "Waitpoint", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Waitpoint", Options, Args>;
+export type WaitpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "Waitpoint", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Waitpoint", Args, Options>;
 export type TaskRunWaitpointFindManyArgs = $FindManyArgs<$Schema, "TaskRunWaitpoint">;
 export type TaskRunWaitpointFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunWaitpoint">;
 export type TaskRunWaitpointFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunWaitpoint">;
@@ -407,7 +407,7 @@ export type TaskRunWaitpointWhereInput = $WhereInput<$Schema, "TaskRunWaitpoint"
 export type TaskRunWaitpointSelect = $SelectInput<$Schema, "TaskRunWaitpoint">;
 export type TaskRunWaitpointInclude = $IncludeInput<$Schema, "TaskRunWaitpoint">;
 export type TaskRunWaitpointOmit = $OmitInput<$Schema, "TaskRunWaitpoint">;
-export type TaskRunWaitpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunWaitpoint", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunWaitpoint", Options, Args>;
+export type TaskRunWaitpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunWaitpoint", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunWaitpoint", Args, Options>;
 export type WaitpointTagFindManyArgs = $FindManyArgs<$Schema, "WaitpointTag">;
 export type WaitpointTagFindUniqueArgs = $FindUniqueArgs<$Schema, "WaitpointTag">;
 export type WaitpointTagFindFirstArgs = $FindFirstArgs<$Schema, "WaitpointTag">;
@@ -427,7 +427,7 @@ export type WaitpointTagWhereInput = $WhereInput<$Schema, "WaitpointTag">;
 export type WaitpointTagSelect = $SelectInput<$Schema, "WaitpointTag">;
 export type WaitpointTagInclude = $IncludeInput<$Schema, "WaitpointTag">;
 export type WaitpointTagOmit = $OmitInput<$Schema, "WaitpointTag">;
-export type WaitpointTagGetPayload<Args extends $SelectIncludeOmit<$Schema, "WaitpointTag", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WaitpointTag", Options, Args>;
+export type WaitpointTagGetPayload<Args extends $SelectIncludeOmit<$Schema, "WaitpointTag", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WaitpointTag", Args, Options>;
 export type FeatureFlagFindManyArgs = $FindManyArgs<$Schema, "FeatureFlag">;
 export type FeatureFlagFindUniqueArgs = $FindUniqueArgs<$Schema, "FeatureFlag">;
 export type FeatureFlagFindFirstArgs = $FindFirstArgs<$Schema, "FeatureFlag">;
@@ -447,7 +447,7 @@ export type FeatureFlagWhereInput = $WhereInput<$Schema, "FeatureFlag">;
 export type FeatureFlagSelect = $SelectInput<$Schema, "FeatureFlag">;
 export type FeatureFlagInclude = $IncludeInput<$Schema, "FeatureFlag">;
 export type FeatureFlagOmit = $OmitInput<$Schema, "FeatureFlag">;
-export type FeatureFlagGetPayload<Args extends $SelectIncludeOmit<$Schema, "FeatureFlag", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "FeatureFlag", Options, Args>;
+export type FeatureFlagGetPayload<Args extends $SelectIncludeOmit<$Schema, "FeatureFlag", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "FeatureFlag", Args, Options>;
 export type WorkerInstanceFindManyArgs = $FindManyArgs<$Schema, "WorkerInstance">;
 export type WorkerInstanceFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkerInstance">;
 export type WorkerInstanceFindFirstArgs = $FindFirstArgs<$Schema, "WorkerInstance">;
@@ -467,7 +467,7 @@ export type WorkerInstanceWhereInput = $WhereInput<$Schema, "WorkerInstance">;
 export type WorkerInstanceSelect = $SelectInput<$Schema, "WorkerInstance">;
 export type WorkerInstanceInclude = $IncludeInput<$Schema, "WorkerInstance">;
 export type WorkerInstanceOmit = $OmitInput<$Schema, "WorkerInstance">;
-export type WorkerInstanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerInstance", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkerInstance", Options, Args>;
+export type WorkerInstanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerInstance", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkerInstance", Args, Options>;
 export type WorkerInstanceGroupFindManyArgs = $FindManyArgs<$Schema, "WorkerInstanceGroup">;
 export type WorkerInstanceGroupFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkerInstanceGroup">;
 export type WorkerInstanceGroupFindFirstArgs = $FindFirstArgs<$Schema, "WorkerInstanceGroup">;
@@ -487,7 +487,7 @@ export type WorkerInstanceGroupWhereInput = $WhereInput<$Schema, "WorkerInstance
 export type WorkerInstanceGroupSelect = $SelectInput<$Schema, "WorkerInstanceGroup">;
 export type WorkerInstanceGroupInclude = $IncludeInput<$Schema, "WorkerInstanceGroup">;
 export type WorkerInstanceGroupOmit = $OmitInput<$Schema, "WorkerInstanceGroup">;
-export type WorkerInstanceGroupGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerInstanceGroup", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkerInstanceGroup", Options, Args>;
+export type WorkerInstanceGroupGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerInstanceGroup", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkerInstanceGroup", Args, Options>;
 export type WorkerGroupTokenFindManyArgs = $FindManyArgs<$Schema, "WorkerGroupToken">;
 export type WorkerGroupTokenFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkerGroupToken">;
 export type WorkerGroupTokenFindFirstArgs = $FindFirstArgs<$Schema, "WorkerGroupToken">;
@@ -507,7 +507,7 @@ export type WorkerGroupTokenWhereInput = $WhereInput<$Schema, "WorkerGroupToken"
 export type WorkerGroupTokenSelect = $SelectInput<$Schema, "WorkerGroupToken">;
 export type WorkerGroupTokenInclude = $IncludeInput<$Schema, "WorkerGroupToken">;
 export type WorkerGroupTokenOmit = $OmitInput<$Schema, "WorkerGroupToken">;
-export type WorkerGroupTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerGroupToken", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkerGroupToken", Options, Args>;
+export type WorkerGroupTokenGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerGroupToken", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkerGroupToken", Args, Options>;
 export type TaskRunTagFindManyArgs = $FindManyArgs<$Schema, "TaskRunTag">;
 export type TaskRunTagFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunTag">;
 export type TaskRunTagFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunTag">;
@@ -527,7 +527,7 @@ export type TaskRunTagWhereInput = $WhereInput<$Schema, "TaskRunTag">;
 export type TaskRunTagSelect = $SelectInput<$Schema, "TaskRunTag">;
 export type TaskRunTagInclude = $IncludeInput<$Schema, "TaskRunTag">;
 export type TaskRunTagOmit = $OmitInput<$Schema, "TaskRunTag">;
-export type TaskRunTagGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunTag", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunTag", Options, Args>;
+export type TaskRunTagGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunTag", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunTag", Args, Options>;
 export type TaskRunDependencyFindManyArgs = $FindManyArgs<$Schema, "TaskRunDependency">;
 export type TaskRunDependencyFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunDependency">;
 export type TaskRunDependencyFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunDependency">;
@@ -547,7 +547,7 @@ export type TaskRunDependencyWhereInput = $WhereInput<$Schema, "TaskRunDependenc
 export type TaskRunDependencySelect = $SelectInput<$Schema, "TaskRunDependency">;
 export type TaskRunDependencyInclude = $IncludeInput<$Schema, "TaskRunDependency">;
 export type TaskRunDependencyOmit = $OmitInput<$Schema, "TaskRunDependency">;
-export type TaskRunDependencyGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunDependency", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunDependency", Options, Args>;
+export type TaskRunDependencyGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunDependency", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunDependency", Args, Options>;
 export type TaskRunCounterFindManyArgs = $FindManyArgs<$Schema, "TaskRunCounter">;
 export type TaskRunCounterFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunCounter">;
 export type TaskRunCounterFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunCounter">;
@@ -567,7 +567,7 @@ export type TaskRunCounterWhereInput = $WhereInput<$Schema, "TaskRunCounter">;
 export type TaskRunCounterSelect = $SelectInput<$Schema, "TaskRunCounter">;
 export type TaskRunCounterInclude = $IncludeInput<$Schema, "TaskRunCounter">;
 export type TaskRunCounterOmit = $OmitInput<$Schema, "TaskRunCounter">;
-export type TaskRunCounterGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunCounter", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunCounter", Options, Args>;
+export type TaskRunCounterGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunCounter", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunCounter", Args, Options>;
 export type TaskRunNumberCounterFindManyArgs = $FindManyArgs<$Schema, "TaskRunNumberCounter">;
 export type TaskRunNumberCounterFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunNumberCounter">;
 export type TaskRunNumberCounterFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunNumberCounter">;
@@ -587,7 +587,7 @@ export type TaskRunNumberCounterWhereInput = $WhereInput<$Schema, "TaskRunNumber
 export type TaskRunNumberCounterSelect = $SelectInput<$Schema, "TaskRunNumberCounter">;
 export type TaskRunNumberCounterInclude = $IncludeInput<$Schema, "TaskRunNumberCounter">;
 export type TaskRunNumberCounterOmit = $OmitInput<$Schema, "TaskRunNumberCounter">;
-export type TaskRunNumberCounterGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunNumberCounter", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunNumberCounter", Options, Args>;
+export type TaskRunNumberCounterGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunNumberCounter", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunNumberCounter", Args, Options>;
 export type TaskRunAttemptFindManyArgs = $FindManyArgs<$Schema, "TaskRunAttempt">;
 export type TaskRunAttemptFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskRunAttempt">;
 export type TaskRunAttemptFindFirstArgs = $FindFirstArgs<$Schema, "TaskRunAttempt">;
@@ -607,7 +607,7 @@ export type TaskRunAttemptWhereInput = $WhereInput<$Schema, "TaskRunAttempt">;
 export type TaskRunAttemptSelect = $SelectInput<$Schema, "TaskRunAttempt">;
 export type TaskRunAttemptInclude = $IncludeInput<$Schema, "TaskRunAttempt">;
 export type TaskRunAttemptOmit = $OmitInput<$Schema, "TaskRunAttempt">;
-export type TaskRunAttemptGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunAttempt", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskRunAttempt", Options, Args>;
+export type TaskRunAttemptGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskRunAttempt", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskRunAttempt", Args, Options>;
 export type TaskEventFindManyArgs = $FindManyArgs<$Schema, "TaskEvent">;
 export type TaskEventFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskEvent">;
 export type TaskEventFindFirstArgs = $FindFirstArgs<$Schema, "TaskEvent">;
@@ -627,7 +627,7 @@ export type TaskEventWhereInput = $WhereInput<$Schema, "TaskEvent">;
 export type TaskEventSelect = $SelectInput<$Schema, "TaskEvent">;
 export type TaskEventInclude = $IncludeInput<$Schema, "TaskEvent">;
 export type TaskEventOmit = $OmitInput<$Schema, "TaskEvent">;
-export type TaskEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskEvent", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskEvent", Options, Args>;
+export type TaskEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskEvent", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskEvent", Args, Options>;
 export type TaskQueueFindManyArgs = $FindManyArgs<$Schema, "TaskQueue">;
 export type TaskQueueFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskQueue">;
 export type TaskQueueFindFirstArgs = $FindFirstArgs<$Schema, "TaskQueue">;
@@ -647,7 +647,7 @@ export type TaskQueueWhereInput = $WhereInput<$Schema, "TaskQueue">;
 export type TaskQueueSelect = $SelectInput<$Schema, "TaskQueue">;
 export type TaskQueueInclude = $IncludeInput<$Schema, "TaskQueue">;
 export type TaskQueueOmit = $OmitInput<$Schema, "TaskQueue">;
-export type TaskQueueGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskQueue", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskQueue", Options, Args>;
+export type TaskQueueGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskQueue", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskQueue", Args, Options>;
 export type BatchTaskRunFindManyArgs = $FindManyArgs<$Schema, "BatchTaskRun">;
 export type BatchTaskRunFindUniqueArgs = $FindUniqueArgs<$Schema, "BatchTaskRun">;
 export type BatchTaskRunFindFirstArgs = $FindFirstArgs<$Schema, "BatchTaskRun">;
@@ -667,7 +667,7 @@ export type BatchTaskRunWhereInput = $WhereInput<$Schema, "BatchTaskRun">;
 export type BatchTaskRunSelect = $SelectInput<$Schema, "BatchTaskRun">;
 export type BatchTaskRunInclude = $IncludeInput<$Schema, "BatchTaskRun">;
 export type BatchTaskRunOmit = $OmitInput<$Schema, "BatchTaskRun">;
-export type BatchTaskRunGetPayload<Args extends $SelectIncludeOmit<$Schema, "BatchTaskRun", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BatchTaskRun", Options, Args>;
+export type BatchTaskRunGetPayload<Args extends $SelectIncludeOmit<$Schema, "BatchTaskRun", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BatchTaskRun", Args, Options>;
 export type BatchTaskRunItemFindManyArgs = $FindManyArgs<$Schema, "BatchTaskRunItem">;
 export type BatchTaskRunItemFindUniqueArgs = $FindUniqueArgs<$Schema, "BatchTaskRunItem">;
 export type BatchTaskRunItemFindFirstArgs = $FindFirstArgs<$Schema, "BatchTaskRunItem">;
@@ -687,7 +687,7 @@ export type BatchTaskRunItemWhereInput = $WhereInput<$Schema, "BatchTaskRunItem"
 export type BatchTaskRunItemSelect = $SelectInput<$Schema, "BatchTaskRunItem">;
 export type BatchTaskRunItemInclude = $IncludeInput<$Schema, "BatchTaskRunItem">;
 export type BatchTaskRunItemOmit = $OmitInput<$Schema, "BatchTaskRunItem">;
-export type BatchTaskRunItemGetPayload<Args extends $SelectIncludeOmit<$Schema, "BatchTaskRunItem", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BatchTaskRunItem", Options, Args>;
+export type BatchTaskRunItemGetPayload<Args extends $SelectIncludeOmit<$Schema, "BatchTaskRunItem", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BatchTaskRunItem", Args, Options>;
 export type EnvironmentVariableFindManyArgs = $FindManyArgs<$Schema, "EnvironmentVariable">;
 export type EnvironmentVariableFindUniqueArgs = $FindUniqueArgs<$Schema, "EnvironmentVariable">;
 export type EnvironmentVariableFindFirstArgs = $FindFirstArgs<$Schema, "EnvironmentVariable">;
@@ -707,7 +707,7 @@ export type EnvironmentVariableWhereInput = $WhereInput<$Schema, "EnvironmentVar
 export type EnvironmentVariableSelect = $SelectInput<$Schema, "EnvironmentVariable">;
 export type EnvironmentVariableInclude = $IncludeInput<$Schema, "EnvironmentVariable">;
 export type EnvironmentVariableOmit = $OmitInput<$Schema, "EnvironmentVariable">;
-export type EnvironmentVariableGetPayload<Args extends $SelectIncludeOmit<$Schema, "EnvironmentVariable", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "EnvironmentVariable", Options, Args>;
+export type EnvironmentVariableGetPayload<Args extends $SelectIncludeOmit<$Schema, "EnvironmentVariable", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "EnvironmentVariable", Args, Options>;
 export type EnvironmentVariableValueFindManyArgs = $FindManyArgs<$Schema, "EnvironmentVariableValue">;
 export type EnvironmentVariableValueFindUniqueArgs = $FindUniqueArgs<$Schema, "EnvironmentVariableValue">;
 export type EnvironmentVariableValueFindFirstArgs = $FindFirstArgs<$Schema, "EnvironmentVariableValue">;
@@ -727,7 +727,7 @@ export type EnvironmentVariableValueWhereInput = $WhereInput<$Schema, "Environme
 export type EnvironmentVariableValueSelect = $SelectInput<$Schema, "EnvironmentVariableValue">;
 export type EnvironmentVariableValueInclude = $IncludeInput<$Schema, "EnvironmentVariableValue">;
 export type EnvironmentVariableValueOmit = $OmitInput<$Schema, "EnvironmentVariableValue">;
-export type EnvironmentVariableValueGetPayload<Args extends $SelectIncludeOmit<$Schema, "EnvironmentVariableValue", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "EnvironmentVariableValue", Options, Args>;
+export type EnvironmentVariableValueGetPayload<Args extends $SelectIncludeOmit<$Schema, "EnvironmentVariableValue", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "EnvironmentVariableValue", Args, Options>;
 export type CheckpointFindManyArgs = $FindManyArgs<$Schema, "Checkpoint">;
 export type CheckpointFindUniqueArgs = $FindUniqueArgs<$Schema, "Checkpoint">;
 export type CheckpointFindFirstArgs = $FindFirstArgs<$Schema, "Checkpoint">;
@@ -747,7 +747,7 @@ export type CheckpointWhereInput = $WhereInput<$Schema, "Checkpoint">;
 export type CheckpointSelect = $SelectInput<$Schema, "Checkpoint">;
 export type CheckpointInclude = $IncludeInput<$Schema, "Checkpoint">;
 export type CheckpointOmit = $OmitInput<$Schema, "Checkpoint">;
-export type CheckpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "Checkpoint", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Checkpoint", Options, Args>;
+export type CheckpointGetPayload<Args extends $SelectIncludeOmit<$Schema, "Checkpoint", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Checkpoint", Args, Options>;
 export type CheckpointRestoreEventFindManyArgs = $FindManyArgs<$Schema, "CheckpointRestoreEvent">;
 export type CheckpointRestoreEventFindUniqueArgs = $FindUniqueArgs<$Schema, "CheckpointRestoreEvent">;
 export type CheckpointRestoreEventFindFirstArgs = $FindFirstArgs<$Schema, "CheckpointRestoreEvent">;
@@ -767,7 +767,7 @@ export type CheckpointRestoreEventWhereInput = $WhereInput<$Schema, "CheckpointR
 export type CheckpointRestoreEventSelect = $SelectInput<$Schema, "CheckpointRestoreEvent">;
 export type CheckpointRestoreEventInclude = $IncludeInput<$Schema, "CheckpointRestoreEvent">;
 export type CheckpointRestoreEventOmit = $OmitInput<$Schema, "CheckpointRestoreEvent">;
-export type CheckpointRestoreEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "CheckpointRestoreEvent", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "CheckpointRestoreEvent", Options, Args>;
+export type CheckpointRestoreEventGetPayload<Args extends $SelectIncludeOmit<$Schema, "CheckpointRestoreEvent", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "CheckpointRestoreEvent", Args, Options>;
 export type WorkerDeploymentFindManyArgs = $FindManyArgs<$Schema, "WorkerDeployment">;
 export type WorkerDeploymentFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkerDeployment">;
 export type WorkerDeploymentFindFirstArgs = $FindFirstArgs<$Schema, "WorkerDeployment">;
@@ -787,7 +787,7 @@ export type WorkerDeploymentWhereInput = $WhereInput<$Schema, "WorkerDeployment"
 export type WorkerDeploymentSelect = $SelectInput<$Schema, "WorkerDeployment">;
 export type WorkerDeploymentInclude = $IncludeInput<$Schema, "WorkerDeployment">;
 export type WorkerDeploymentOmit = $OmitInput<$Schema, "WorkerDeployment">;
-export type WorkerDeploymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerDeployment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkerDeployment", Options, Args>;
+export type WorkerDeploymentGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerDeployment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkerDeployment", Args, Options>;
 export type WorkerDeploymentPromotionFindManyArgs = $FindManyArgs<$Schema, "WorkerDeploymentPromotion">;
 export type WorkerDeploymentPromotionFindUniqueArgs = $FindUniqueArgs<$Schema, "WorkerDeploymentPromotion">;
 export type WorkerDeploymentPromotionFindFirstArgs = $FindFirstArgs<$Schema, "WorkerDeploymentPromotion">;
@@ -807,7 +807,7 @@ export type WorkerDeploymentPromotionWhereInput = $WhereInput<$Schema, "WorkerDe
 export type WorkerDeploymentPromotionSelect = $SelectInput<$Schema, "WorkerDeploymentPromotion">;
 export type WorkerDeploymentPromotionInclude = $IncludeInput<$Schema, "WorkerDeploymentPromotion">;
 export type WorkerDeploymentPromotionOmit = $OmitInput<$Schema, "WorkerDeploymentPromotion">;
-export type WorkerDeploymentPromotionGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerDeploymentPromotion", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "WorkerDeploymentPromotion", Options, Args>;
+export type WorkerDeploymentPromotionGetPayload<Args extends $SelectIncludeOmit<$Schema, "WorkerDeploymentPromotion", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "WorkerDeploymentPromotion", Args, Options>;
 export type TaskScheduleFindManyArgs = $FindManyArgs<$Schema, "TaskSchedule">;
 export type TaskScheduleFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskSchedule">;
 export type TaskScheduleFindFirstArgs = $FindFirstArgs<$Schema, "TaskSchedule">;
@@ -827,7 +827,7 @@ export type TaskScheduleWhereInput = $WhereInput<$Schema, "TaskSchedule">;
 export type TaskScheduleSelect = $SelectInput<$Schema, "TaskSchedule">;
 export type TaskScheduleInclude = $IncludeInput<$Schema, "TaskSchedule">;
 export type TaskScheduleOmit = $OmitInput<$Schema, "TaskSchedule">;
-export type TaskScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskSchedule", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskSchedule", Options, Args>;
+export type TaskScheduleGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskSchedule", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskSchedule", Args, Options>;
 export type TaskScheduleInstanceFindManyArgs = $FindManyArgs<$Schema, "TaskScheduleInstance">;
 export type TaskScheduleInstanceFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskScheduleInstance">;
 export type TaskScheduleInstanceFindFirstArgs = $FindFirstArgs<$Schema, "TaskScheduleInstance">;
@@ -847,7 +847,7 @@ export type TaskScheduleInstanceWhereInput = $WhereInput<$Schema, "TaskScheduleI
 export type TaskScheduleInstanceSelect = $SelectInput<$Schema, "TaskScheduleInstance">;
 export type TaskScheduleInstanceInclude = $IncludeInput<$Schema, "TaskScheduleInstance">;
 export type TaskScheduleInstanceOmit = $OmitInput<$Schema, "TaskScheduleInstance">;
-export type TaskScheduleInstanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskScheduleInstance", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskScheduleInstance", Options, Args>;
+export type TaskScheduleInstanceGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskScheduleInstance", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskScheduleInstance", Args, Options>;
 export type RuntimeEnvironmentSessionFindManyArgs = $FindManyArgs<$Schema, "RuntimeEnvironmentSession">;
 export type RuntimeEnvironmentSessionFindUniqueArgs = $FindUniqueArgs<$Schema, "RuntimeEnvironmentSession">;
 export type RuntimeEnvironmentSessionFindFirstArgs = $FindFirstArgs<$Schema, "RuntimeEnvironmentSession">;
@@ -867,7 +867,7 @@ export type RuntimeEnvironmentSessionWhereInput = $WhereInput<$Schema, "RuntimeE
 export type RuntimeEnvironmentSessionSelect = $SelectInput<$Schema, "RuntimeEnvironmentSession">;
 export type RuntimeEnvironmentSessionInclude = $IncludeInput<$Schema, "RuntimeEnvironmentSession">;
 export type RuntimeEnvironmentSessionOmit = $OmitInput<$Schema, "RuntimeEnvironmentSession">;
-export type RuntimeEnvironmentSessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "RuntimeEnvironmentSession", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RuntimeEnvironmentSession", Options, Args>;
+export type RuntimeEnvironmentSessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "RuntimeEnvironmentSession", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RuntimeEnvironmentSession", Args, Options>;
 export type ProjectAlertChannelFindManyArgs = $FindManyArgs<$Schema, "ProjectAlertChannel">;
 export type ProjectAlertChannelFindUniqueArgs = $FindUniqueArgs<$Schema, "ProjectAlertChannel">;
 export type ProjectAlertChannelFindFirstArgs = $FindFirstArgs<$Schema, "ProjectAlertChannel">;
@@ -887,7 +887,7 @@ export type ProjectAlertChannelWhereInput = $WhereInput<$Schema, "ProjectAlertCh
 export type ProjectAlertChannelSelect = $SelectInput<$Schema, "ProjectAlertChannel">;
 export type ProjectAlertChannelInclude = $IncludeInput<$Schema, "ProjectAlertChannel">;
 export type ProjectAlertChannelOmit = $OmitInput<$Schema, "ProjectAlertChannel">;
-export type ProjectAlertChannelGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlertChannel", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ProjectAlertChannel", Options, Args>;
+export type ProjectAlertChannelGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlertChannel", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ProjectAlertChannel", Args, Options>;
 export type ProjectAlertFindManyArgs = $FindManyArgs<$Schema, "ProjectAlert">;
 export type ProjectAlertFindUniqueArgs = $FindUniqueArgs<$Schema, "ProjectAlert">;
 export type ProjectAlertFindFirstArgs = $FindFirstArgs<$Schema, "ProjectAlert">;
@@ -907,7 +907,7 @@ export type ProjectAlertWhereInput = $WhereInput<$Schema, "ProjectAlert">;
 export type ProjectAlertSelect = $SelectInput<$Schema, "ProjectAlert">;
 export type ProjectAlertInclude = $IncludeInput<$Schema, "ProjectAlert">;
 export type ProjectAlertOmit = $OmitInput<$Schema, "ProjectAlert">;
-export type ProjectAlertGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlert", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ProjectAlert", Options, Args>;
+export type ProjectAlertGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlert", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ProjectAlert", Args, Options>;
 export type ProjectAlertStorageFindManyArgs = $FindManyArgs<$Schema, "ProjectAlertStorage">;
 export type ProjectAlertStorageFindUniqueArgs = $FindUniqueArgs<$Schema, "ProjectAlertStorage">;
 export type ProjectAlertStorageFindFirstArgs = $FindFirstArgs<$Schema, "ProjectAlertStorage">;
@@ -927,7 +927,7 @@ export type ProjectAlertStorageWhereInput = $WhereInput<$Schema, "ProjectAlertSt
 export type ProjectAlertStorageSelect = $SelectInput<$Schema, "ProjectAlertStorage">;
 export type ProjectAlertStorageInclude = $IncludeInput<$Schema, "ProjectAlertStorage">;
 export type ProjectAlertStorageOmit = $OmitInput<$Schema, "ProjectAlertStorage">;
-export type ProjectAlertStorageGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlertStorage", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "ProjectAlertStorage", Options, Args>;
+export type ProjectAlertStorageGetPayload<Args extends $SelectIncludeOmit<$Schema, "ProjectAlertStorage", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "ProjectAlertStorage", Args, Options>;
 export type OrganizationIntegrationFindManyArgs = $FindManyArgs<$Schema, "OrganizationIntegration">;
 export type OrganizationIntegrationFindUniqueArgs = $FindUniqueArgs<$Schema, "OrganizationIntegration">;
 export type OrganizationIntegrationFindFirstArgs = $FindFirstArgs<$Schema, "OrganizationIntegration">;
@@ -947,7 +947,7 @@ export type OrganizationIntegrationWhereInput = $WhereInput<$Schema, "Organizati
 export type OrganizationIntegrationSelect = $SelectInput<$Schema, "OrganizationIntegration">;
 export type OrganizationIntegrationInclude = $IncludeInput<$Schema, "OrganizationIntegration">;
 export type OrganizationIntegrationOmit = $OmitInput<$Schema, "OrganizationIntegration">;
-export type OrganizationIntegrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationIntegration", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "OrganizationIntegration", Options, Args>;
+export type OrganizationIntegrationGetPayload<Args extends $SelectIncludeOmit<$Schema, "OrganizationIntegration", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "OrganizationIntegration", Args, Options>;
 export type BulkActionGroupFindManyArgs = $FindManyArgs<$Schema, "BulkActionGroup">;
 export type BulkActionGroupFindUniqueArgs = $FindUniqueArgs<$Schema, "BulkActionGroup">;
 export type BulkActionGroupFindFirstArgs = $FindFirstArgs<$Schema, "BulkActionGroup">;
@@ -967,7 +967,7 @@ export type BulkActionGroupWhereInput = $WhereInput<$Schema, "BulkActionGroup">;
 export type BulkActionGroupSelect = $SelectInput<$Schema, "BulkActionGroup">;
 export type BulkActionGroupInclude = $IncludeInput<$Schema, "BulkActionGroup">;
 export type BulkActionGroupOmit = $OmitInput<$Schema, "BulkActionGroup">;
-export type BulkActionGroupGetPayload<Args extends $SelectIncludeOmit<$Schema, "BulkActionGroup", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BulkActionGroup", Options, Args>;
+export type BulkActionGroupGetPayload<Args extends $SelectIncludeOmit<$Schema, "BulkActionGroup", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BulkActionGroup", Args, Options>;
 export type BulkActionItemFindManyArgs = $FindManyArgs<$Schema, "BulkActionItem">;
 export type BulkActionItemFindUniqueArgs = $FindUniqueArgs<$Schema, "BulkActionItem">;
 export type BulkActionItemFindFirstArgs = $FindFirstArgs<$Schema, "BulkActionItem">;
@@ -987,7 +987,7 @@ export type BulkActionItemWhereInput = $WhereInput<$Schema, "BulkActionItem">;
 export type BulkActionItemSelect = $SelectInput<$Schema, "BulkActionItem">;
 export type BulkActionItemInclude = $IncludeInput<$Schema, "BulkActionItem">;
 export type BulkActionItemOmit = $OmitInput<$Schema, "BulkActionItem">;
-export type BulkActionItemGetPayload<Args extends $SelectIncludeOmit<$Schema, "BulkActionItem", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "BulkActionItem", Options, Args>;
+export type BulkActionItemGetPayload<Args extends $SelectIncludeOmit<$Schema, "BulkActionItem", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "BulkActionItem", Args, Options>;
 export type RealtimeStreamChunkFindManyArgs = $FindManyArgs<$Schema, "RealtimeStreamChunk">;
 export type RealtimeStreamChunkFindUniqueArgs = $FindUniqueArgs<$Schema, "RealtimeStreamChunk">;
 export type RealtimeStreamChunkFindFirstArgs = $FindFirstArgs<$Schema, "RealtimeStreamChunk">;
@@ -1007,7 +1007,7 @@ export type RealtimeStreamChunkWhereInput = $WhereInput<$Schema, "RealtimeStream
 export type RealtimeStreamChunkSelect = $SelectInput<$Schema, "RealtimeStreamChunk">;
 export type RealtimeStreamChunkInclude = $IncludeInput<$Schema, "RealtimeStreamChunk">;
 export type RealtimeStreamChunkOmit = $OmitInput<$Schema, "RealtimeStreamChunk">;
-export type RealtimeStreamChunkGetPayload<Args extends $SelectIncludeOmit<$Schema, "RealtimeStreamChunk", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RealtimeStreamChunk", Options, Args>;
+export type RealtimeStreamChunkGetPayload<Args extends $SelectIncludeOmit<$Schema, "RealtimeStreamChunk", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RealtimeStreamChunk", Args, Options>;
 export type TaskEventPartitionedFindManyArgs = $FindManyArgs<$Schema, "TaskEventPartitioned">;
 export type TaskEventPartitionedFindUniqueArgs = $FindUniqueArgs<$Schema, "TaskEventPartitioned">;
 export type TaskEventPartitionedFindFirstArgs = $FindFirstArgs<$Schema, "TaskEventPartitioned">;
@@ -1027,4 +1027,4 @@ export type TaskEventPartitionedWhereInput = $WhereInput<$Schema, "TaskEventPart
 export type TaskEventPartitionedSelect = $SelectInput<$Schema, "TaskEventPartitioned">;
 export type TaskEventPartitionedInclude = $IncludeInput<$Schema, "TaskEventPartitioned">;
 export type TaskEventPartitionedOmit = $OmitInput<$Schema, "TaskEventPartitioned">;
-export type TaskEventPartitionedGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskEventPartitioned", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "TaskEventPartitioned", Options, Args>;
+export type TaskEventPartitionedGetPayload<Args extends $SelectIncludeOmit<$Schema, "TaskEventPartitioned", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "TaskEventPartitioned", Args, Options>;
diff --git a/tests/e2e/orm/client-api/aggregate.test.ts b/tests/e2e/orm/client-api/aggregate.test.ts
index 848e498ec..520e12187 100644
--- a/tests/e2e/orm/client-api/aggregate.test.ts
+++ b/tests/e2e/orm/client-api/aggregate.test.ts
@@ -8,7 +8,7 @@ describe('Client aggregate tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/count.test.ts b/tests/e2e/orm/client-api/count.test.ts
index 3e57bf9ab..1168f9d61 100644
--- a/tests/e2e/orm/client-api/count.test.ts
+++ b/tests/e2e/orm/client-api/count.test.ts
@@ -7,7 +7,7 @@ describe('Client count tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/create-many-and-return.test.ts b/tests/e2e/orm/client-api/create-many-and-return.test.ts
index f6049d5bc..8a8697b14 100644
--- a/tests/e2e/orm/client-api/create-many-and-return.test.ts
+++ b/tests/e2e/orm/client-api/create-many-and-return.test.ts
@@ -7,7 +7,7 @@ describe('Client createManyAndReturn tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/create-many.test.ts b/tests/e2e/orm/client-api/create-many.test.ts
index 75d93a295..c55f05ac4 100644
--- a/tests/e2e/orm/client-api/create-many.test.ts
+++ b/tests/e2e/orm/client-api/create-many.test.ts
@@ -7,7 +7,7 @@ describe('Client createMany tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/create.test.ts b/tests/e2e/orm/client-api/create.test.ts
index c47a413f3..dcf45edad 100644
--- a/tests/e2e/orm/client-api/create.test.ts
+++ b/tests/e2e/orm/client-api/create.test.ts
@@ -7,7 +7,7 @@ describe('Client create tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/delete-many.test.ts b/tests/e2e/orm/client-api/delete-many.test.ts
index c5fc84e1c..c7ea5530c 100644
--- a/tests/e2e/orm/client-api/delete-many.test.ts
+++ b/tests/e2e/orm/client-api/delete-many.test.ts
@@ -7,7 +7,7 @@ describe('Client deleteMany tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/delete.test.ts b/tests/e2e/orm/client-api/delete.test.ts
index 5050faadd..e38395328 100644
--- a/tests/e2e/orm/client-api/delete.test.ts
+++ b/tests/e2e/orm/client-api/delete.test.ts
@@ -7,7 +7,7 @@ describe('Client delete tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/find.test.ts b/tests/e2e/orm/client-api/find.test.ts
index 7f9df68f1..765492cca 100644
--- a/tests/e2e/orm/client-api/find.test.ts
+++ b/tests/e2e/orm/client-api/find.test.ts
@@ -8,7 +8,7 @@ describe('Client find tests ', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/group-by.test.ts b/tests/e2e/orm/client-api/group-by.test.ts
index 250bd9057..fd31131ce 100644
--- a/tests/e2e/orm/client-api/group-by.test.ts
+++ b/tests/e2e/orm/client-api/group-by.test.ts
@@ -8,7 +8,7 @@ describe('Client groupBy tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/raw-query.test.ts b/tests/e2e/orm/client-api/raw-query.test.ts
index b8de60473..7fe0ecbcd 100644
--- a/tests/e2e/orm/client-api/raw-query.test.ts
+++ b/tests/e2e/orm/client-api/raw-query.test.ts
@@ -7,7 +7,7 @@ describe('Client raw query tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/transaction.test.ts b/tests/e2e/orm/client-api/transaction.test.ts
index e8ae7f94b..e4f2192e8 100644
--- a/tests/e2e/orm/client-api/transaction.test.ts
+++ b/tests/e2e/orm/client-api/transaction.test.ts
@@ -7,7 +7,7 @@ describe('Client raw query tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/undefined-values.test.ts b/tests/e2e/orm/client-api/undefined-values.test.ts
index b1ac39626..d2ed52f00 100644
--- a/tests/e2e/orm/client-api/undefined-values.test.ts
+++ b/tests/e2e/orm/client-api/undefined-values.test.ts
@@ -8,7 +8,7 @@ describe('Client undefined values tests ', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/update-many.test.ts b/tests/e2e/orm/client-api/update-many.test.ts
index a5bc2b48e..61776e3ec 100644
--- a/tests/e2e/orm/client-api/update-many.test.ts
+++ b/tests/e2e/orm/client-api/update-many.test.ts
@@ -7,7 +7,7 @@ describe('Client updateMany tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/client-api/update.test.ts b/tests/e2e/orm/client-api/update.test.ts
index 46c712889..c79396d7f 100644
--- a/tests/e2e/orm/client-api/update.test.ts
+++ b/tests/e2e/orm/client-api/update.test.ts
@@ -8,7 +8,7 @@ describe('Client update tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts b/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts
index a4a45b32b..686026133 100644
--- a/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts
+++ b/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts
@@ -8,7 +8,7 @@ describe('On kysely query tests', () => {
     let _client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        _client = (await createTestClient(schema)) as any;
+        _client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts b/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts
index 88126c98d..0b74e76fc 100644
--- a/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts
+++ b/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts
@@ -7,7 +7,7 @@ describe('On query hooks tests', () => {
     let _client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        _client = (await createTestClient(schema)) as any;
+        _client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/policy/basic-schema-read.test.ts b/tests/e2e/orm/policy/basic-schema-read.test.ts
index 3b2122213..7464a38ce 100644
--- a/tests/e2e/orm/policy/basic-schema-read.test.ts
+++ b/tests/e2e/orm/policy/basic-schema-read.test.ts
@@ -8,7 +8,7 @@ describe('Read policy tests', () => {
     let client: ClientContract<typeof schema>;
 
     beforeEach(async () => {
-        client = (await createTestClient(schema)) as any;
+        client = await createTestClient(schema);
     });
 
     afterEach(async () => {
diff --git a/tests/e2e/orm/policy/policy-functions.test.ts b/tests/e2e/orm/policy/policy-functions.test.ts
index b48d3da3f..b30ea5ce8 100644
--- a/tests/e2e/orm/policy/policy-functions.test.ts
+++ b/tests/e2e/orm/policy/policy-functions.test.ts
@@ -32,7 +32,6 @@ describe('policy functions tests', () => {
                 @@allow('all', contains(string, 'a%'))
             }
             `,
-            { debug: true },
         );
 
         await expect(db.foo.create({ data: { string: 'ab' } })).toBeRejectedByPolicy();
diff --git a/tests/e2e/orm/schemas/auth-type/input.ts b/tests/e2e/orm/schemas/auth-type/input.ts
index 9564b7f27..3c7c14554 100644
--- a/tests/e2e/orm/schemas/auth-type/input.ts
+++ b/tests/e2e/orm/schemas/auth-type/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">;
 export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">;
 export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">;
@@ -27,4 +27,4 @@ export type FooWhereInput = $WhereInput<$Schema, "Foo">;
 export type FooSelect = $SelectInput<$Schema, "Foo">;
 export type FooInclude = $IncludeInput<$Schema, "Foo">;
 export type FooOmit = $OmitInput<$Schema, "Foo">;
-export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Foo", Options, Args>;
+export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Foo", Args, Options>;
diff --git a/tests/e2e/orm/schemas/basic/input.ts b/tests/e2e/orm/schemas/basic/input.ts
index 96a679c14..59e922527 100644
--- a/tests/e2e/orm/schemas/basic/input.ts
+++ b/tests/e2e/orm/schemas/basic/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,7 +47,7 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
 export type CommentFindManyArgs = $FindManyArgs<$Schema, "Comment">;
 export type CommentFindUniqueArgs = $FindUniqueArgs<$Schema, "Comment">;
 export type CommentFindFirstArgs = $FindFirstArgs<$Schema, "Comment">;
@@ -67,7 +67,7 @@ export type CommentWhereInput = $WhereInput<$Schema, "Comment">;
 export type CommentSelect = $SelectInput<$Schema, "Comment">;
 export type CommentInclude = $IncludeInput<$Schema, "Comment">;
 export type CommentOmit = $OmitInput<$Schema, "Comment">;
-export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Comment", Options, Args>;
+export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Comment", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -87,4 +87,4 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
diff --git a/tests/e2e/orm/schemas/default-auth/input.ts b/tests/e2e/orm/schemas/default-auth/input.ts
index f7fa54244..2fdb7acca 100644
--- a/tests/e2e/orm/schemas/default-auth/input.ts
+++ b/tests/e2e/orm/schemas/default-auth/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -47,7 +47,7 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
 export type AddressFindManyArgs = $FindManyArgs<$Schema, "Address">;
 export type AddressFindUniqueArgs = $FindUniqueArgs<$Schema, "Address">;
 export type AddressFindFirstArgs = $FindFirstArgs<$Schema, "Address">;
@@ -67,4 +67,4 @@ export type AddressWhereInput = $WhereInput<$Schema, "Address">;
 export type AddressSelect = $SelectInput<$Schema, "Address">;
 export type AddressInclude = $IncludeInput<$Schema, "Address">;
 export type AddressOmit = $OmitInput<$Schema, "Address">;
-export type AddressGetPayload<Args extends $SelectIncludeOmit<$Schema, "Address", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Address", Options, Args>;
+export type AddressGetPayload<Args extends $SelectIncludeOmit<$Schema, "Address", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Address", Args, Options>;
diff --git a/tests/e2e/orm/schemas/delegate/input.ts b/tests/e2e/orm/schemas/delegate/input.ts
index f4d2a6949..331448486 100644
--- a/tests/e2e/orm/schemas/delegate/input.ts
+++ b/tests/e2e/orm/schemas/delegate/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type CommentFindManyArgs = $FindManyArgs<$Schema, "Comment">;
 export type CommentFindUniqueArgs = $FindUniqueArgs<$Schema, "Comment">;
 export type CommentFindFirstArgs = $FindFirstArgs<$Schema, "Comment">;
@@ -47,7 +47,7 @@ export type CommentWhereInput = $WhereInput<$Schema, "Comment">;
 export type CommentSelect = $SelectInput<$Schema, "Comment">;
 export type CommentInclude = $IncludeInput<$Schema, "Comment">;
 export type CommentOmit = $OmitInput<$Schema, "Comment">;
-export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Comment", Options, Args>;
+export type CommentGetPayload<Args extends $SelectIncludeOmit<$Schema, "Comment", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Comment", Args, Options>;
 export type AssetFindManyArgs = $FindManyArgs<$Schema, "Asset">;
 export type AssetFindUniqueArgs = $FindUniqueArgs<$Schema, "Asset">;
 export type AssetFindFirstArgs = $FindFirstArgs<$Schema, "Asset">;
@@ -67,7 +67,7 @@ export type AssetWhereInput = $WhereInput<$Schema, "Asset">;
 export type AssetSelect = $SelectInput<$Schema, "Asset">;
 export type AssetInclude = $IncludeInput<$Schema, "Asset">;
 export type AssetOmit = $OmitInput<$Schema, "Asset">;
-export type AssetGetPayload<Args extends $SelectIncludeOmit<$Schema, "Asset", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Asset", Options, Args>;
+export type AssetGetPayload<Args extends $SelectIncludeOmit<$Schema, "Asset", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Asset", Args, Options>;
 export type VideoFindManyArgs = $FindManyArgs<$Schema, "Video">;
 export type VideoFindUniqueArgs = $FindUniqueArgs<$Schema, "Video">;
 export type VideoFindFirstArgs = $FindFirstArgs<$Schema, "Video">;
@@ -87,7 +87,7 @@ export type VideoWhereInput = $WhereInput<$Schema, "Video">;
 export type VideoSelect = $SelectInput<$Schema, "Video">;
 export type VideoInclude = $IncludeInput<$Schema, "Video">;
 export type VideoOmit = $OmitInput<$Schema, "Video">;
-export type VideoGetPayload<Args extends $SelectIncludeOmit<$Schema, "Video", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Video", Options, Args>;
+export type VideoGetPayload<Args extends $SelectIncludeOmit<$Schema, "Video", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Video", Args, Options>;
 export type RatedVideoFindManyArgs = $FindManyArgs<$Schema, "RatedVideo">;
 export type RatedVideoFindUniqueArgs = $FindUniqueArgs<$Schema, "RatedVideo">;
 export type RatedVideoFindFirstArgs = $FindFirstArgs<$Schema, "RatedVideo">;
@@ -107,7 +107,7 @@ export type RatedVideoWhereInput = $WhereInput<$Schema, "RatedVideo">;
 export type RatedVideoSelect = $SelectInput<$Schema, "RatedVideo">;
 export type RatedVideoInclude = $IncludeInput<$Schema, "RatedVideo">;
 export type RatedVideoOmit = $OmitInput<$Schema, "RatedVideo">;
-export type RatedVideoGetPayload<Args extends $SelectIncludeOmit<$Schema, "RatedVideo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "RatedVideo", Options, Args>;
+export type RatedVideoGetPayload<Args extends $SelectIncludeOmit<$Schema, "RatedVideo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "RatedVideo", Args, Options>;
 export type ImageFindManyArgs = $FindManyArgs<$Schema, "Image">;
 export type ImageFindUniqueArgs = $FindUniqueArgs<$Schema, "Image">;
 export type ImageFindFirstArgs = $FindFirstArgs<$Schema, "Image">;
@@ -127,7 +127,7 @@ export type ImageWhereInput = $WhereInput<$Schema, "Image">;
 export type ImageSelect = $SelectInput<$Schema, "Image">;
 export type ImageInclude = $IncludeInput<$Schema, "Image">;
 export type ImageOmit = $OmitInput<$Schema, "Image">;
-export type ImageGetPayload<Args extends $SelectIncludeOmit<$Schema, "Image", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Image", Options, Args>;
+export type ImageGetPayload<Args extends $SelectIncludeOmit<$Schema, "Image", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Image", Args, Options>;
 export type GalleryFindManyArgs = $FindManyArgs<$Schema, "Gallery">;
 export type GalleryFindUniqueArgs = $FindUniqueArgs<$Schema, "Gallery">;
 export type GalleryFindFirstArgs = $FindFirstArgs<$Schema, "Gallery">;
@@ -147,4 +147,4 @@ export type GalleryWhereInput = $WhereInput<$Schema, "Gallery">;
 export type GallerySelect = $SelectInput<$Schema, "Gallery">;
 export type GalleryInclude = $IncludeInput<$Schema, "Gallery">;
 export type GalleryOmit = $OmitInput<$Schema, "Gallery">;
-export type GalleryGetPayload<Args extends $SelectIncludeOmit<$Schema, "Gallery", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Gallery", Options, Args>;
+export type GalleryGetPayload<Args extends $SelectIncludeOmit<$Schema, "Gallery", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Gallery", Args, Options>;
diff --git a/tests/e2e/orm/schemas/json/input.ts b/tests/e2e/orm/schemas/json/input.ts
index 9564b7f27..3c7c14554 100644
--- a/tests/e2e/orm/schemas/json/input.ts
+++ b/tests/e2e/orm/schemas/json/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">;
 export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">;
 export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">;
@@ -27,4 +27,4 @@ export type FooWhereInput = $WhereInput<$Schema, "Foo">;
 export type FooSelect = $SelectInput<$Schema, "Foo">;
 export type FooInclude = $IncludeInput<$Schema, "Foo">;
 export type FooOmit = $OmitInput<$Schema, "Foo">;
-export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Foo", Options, Args>;
+export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Foo", Args, Options>;
diff --git a/tests/e2e/orm/schemas/name-mapping/input.ts b/tests/e2e/orm/schemas/name-mapping/input.ts
index fb7763147..3799802f9 100644
--- a/tests/e2e/orm/schemas/name-mapping/input.ts
+++ b/tests/e2e/orm/schemas/name-mapping/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,4 +47,4 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
diff --git a/tests/e2e/orm/schemas/omit/input.ts b/tests/e2e/orm/schemas/omit/input.ts
index 35f840d15..bd73757d3 100644
--- a/tests/e2e/orm/schemas/omit/input.ts
+++ b/tests/e2e/orm/schemas/omit/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,7 +47,7 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
 export type BaseFindManyArgs = $FindManyArgs<$Schema, "Base">;
 export type BaseFindUniqueArgs = $FindUniqueArgs<$Schema, "Base">;
 export type BaseFindFirstArgs = $FindFirstArgs<$Schema, "Base">;
@@ -67,7 +67,7 @@ export type BaseWhereInput = $WhereInput<$Schema, "Base">;
 export type BaseSelect = $SelectInput<$Schema, "Base">;
 export type BaseInclude = $IncludeInput<$Schema, "Base">;
 export type BaseOmit = $OmitInput<$Schema, "Base">;
-export type BaseGetPayload<Args extends $SelectIncludeOmit<$Schema, "Base", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Base", Options, Args>;
+export type BaseGetPayload<Args extends $SelectIncludeOmit<$Schema, "Base", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Base", Args, Options>;
 export type SubFindManyArgs = $FindManyArgs<$Schema, "Sub">;
 export type SubFindUniqueArgs = $FindUniqueArgs<$Schema, "Sub">;
 export type SubFindFirstArgs = $FindFirstArgs<$Schema, "Sub">;
@@ -87,4 +87,4 @@ export type SubWhereInput = $WhereInput<$Schema, "Sub">;
 export type SubSelect = $SelectInput<$Schema, "Sub">;
 export type SubInclude = $IncludeInput<$Schema, "Sub">;
 export type SubOmit = $OmitInput<$Schema, "Sub">;
-export type SubGetPayload<Args extends $SelectIncludeOmit<$Schema, "Sub", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Sub", Options, Args>;
+export type SubGetPayload<Args extends $SelectIncludeOmit<$Schema, "Sub", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Sub", Args, Options>;
diff --git a/tests/e2e/orm/schemas/petstore/input.ts b/tests/e2e/orm/schemas/petstore/input.ts
index 5ea5d6223..7beee9d5d 100644
--- a/tests/e2e/orm/schemas/petstore/input.ts
+++ b/tests/e2e/orm/schemas/petstore/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PetFindManyArgs = $FindManyArgs<$Schema, "Pet">;
 export type PetFindUniqueArgs = $FindUniqueArgs<$Schema, "Pet">;
 export type PetFindFirstArgs = $FindFirstArgs<$Schema, "Pet">;
@@ -47,7 +47,7 @@ export type PetWhereInput = $WhereInput<$Schema, "Pet">;
 export type PetSelect = $SelectInput<$Schema, "Pet">;
 export type PetInclude = $IncludeInput<$Schema, "Pet">;
 export type PetOmit = $OmitInput<$Schema, "Pet">;
-export type PetGetPayload<Args extends $SelectIncludeOmit<$Schema, "Pet", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Pet", Options, Args>;
+export type PetGetPayload<Args extends $SelectIncludeOmit<$Schema, "Pet", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Pet", Args, Options>;
 export type OrderFindManyArgs = $FindManyArgs<$Schema, "Order">;
 export type OrderFindUniqueArgs = $FindUniqueArgs<$Schema, "Order">;
 export type OrderFindFirstArgs = $FindFirstArgs<$Schema, "Order">;
@@ -67,4 +67,4 @@ export type OrderWhereInput = $WhereInput<$Schema, "Order">;
 export type OrderSelect = $SelectInput<$Schema, "Order">;
 export type OrderInclude = $IncludeInput<$Schema, "Order">;
 export type OrderOmit = $OmitInput<$Schema, "Order">;
-export type OrderGetPayload<Args extends $SelectIncludeOmit<$Schema, "Order", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Order", Options, Args>;
+export type OrderGetPayload<Args extends $SelectIncludeOmit<$Schema, "Order", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Order", Args, Options>;
diff --git a/tests/e2e/orm/schemas/todo/input.ts b/tests/e2e/orm/schemas/todo/input.ts
index c198bf586..66b1696a9 100644
--- a/tests/e2e/orm/schemas/todo/input.ts
+++ b/tests/e2e/orm/schemas/todo/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type SpaceFindManyArgs = $FindManyArgs<$Schema, "Space">;
 export type SpaceFindUniqueArgs = $FindUniqueArgs<$Schema, "Space">;
 export type SpaceFindFirstArgs = $FindFirstArgs<$Schema, "Space">;
@@ -27,7 +27,7 @@ export type SpaceWhereInput = $WhereInput<$Schema, "Space">;
 export type SpaceSelect = $SelectInput<$Schema, "Space">;
 export type SpaceInclude = $IncludeInput<$Schema, "Space">;
 export type SpaceOmit = $OmitInput<$Schema, "Space">;
-export type SpaceGetPayload<Args extends $SelectIncludeOmit<$Schema, "Space", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Space", Options, Args>;
+export type SpaceGetPayload<Args extends $SelectIncludeOmit<$Schema, "Space", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Space", Args, Options>;
 export type SpaceUserFindManyArgs = $FindManyArgs<$Schema, "SpaceUser">;
 export type SpaceUserFindUniqueArgs = $FindUniqueArgs<$Schema, "SpaceUser">;
 export type SpaceUserFindFirstArgs = $FindFirstArgs<$Schema, "SpaceUser">;
@@ -47,7 +47,7 @@ export type SpaceUserWhereInput = $WhereInput<$Schema, "SpaceUser">;
 export type SpaceUserSelect = $SelectInput<$Schema, "SpaceUser">;
 export type SpaceUserInclude = $IncludeInput<$Schema, "SpaceUser">;
 export type SpaceUserOmit = $OmitInput<$Schema, "SpaceUser">;
-export type SpaceUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceUser", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "SpaceUser", Options, Args>;
+export type SpaceUserGetPayload<Args extends $SelectIncludeOmit<$Schema, "SpaceUser", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "SpaceUser", Args, Options>;
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -67,7 +67,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type ListFindManyArgs = $FindManyArgs<$Schema, "List">;
 export type ListFindUniqueArgs = $FindUniqueArgs<$Schema, "List">;
 export type ListFindFirstArgs = $FindFirstArgs<$Schema, "List">;
@@ -87,7 +87,7 @@ export type ListWhereInput = $WhereInput<$Schema, "List">;
 export type ListSelect = $SelectInput<$Schema, "List">;
 export type ListInclude = $IncludeInput<$Schema, "List">;
 export type ListOmit = $OmitInput<$Schema, "List">;
-export type ListGetPayload<Args extends $SelectIncludeOmit<$Schema, "List", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "List", Options, Args>;
+export type ListGetPayload<Args extends $SelectIncludeOmit<$Schema, "List", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "List", Args, Options>;
 export type TodoFindManyArgs = $FindManyArgs<$Schema, "Todo">;
 export type TodoFindUniqueArgs = $FindUniqueArgs<$Schema, "Todo">;
 export type TodoFindFirstArgs = $FindFirstArgs<$Schema, "Todo">;
@@ -107,4 +107,4 @@ export type TodoWhereInput = $WhereInput<$Schema, "Todo">;
 export type TodoSelect = $SelectInput<$Schema, "Todo">;
 export type TodoInclude = $IncludeInput<$Schema, "Todo">;
 export type TodoOmit = $OmitInput<$Schema, "Todo">;
-export type TodoGetPayload<Args extends $SelectIncludeOmit<$Schema, "Todo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Todo", Options, Args>;
+export type TodoGetPayload<Args extends $SelectIncludeOmit<$Schema, "Todo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Todo", Args, Options>;
diff --git a/tests/e2e/orm/schemas/todo/schema.ts b/tests/e2e/orm/schemas/todo/schema.ts
index 458cf5c26..fff7ad070 100644
--- a/tests/e2e/orm/schemas/todo/schema.ts
+++ b/tests/e2e/orm/schemas/todo/schema.ts
@@ -6,11 +6,11 @@
 /* eslint-disable */
 
 import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema";
-const _schema = {
-    provider: {
+export class SchemaType implements SchemaDef {
+    provider = {
         type: "sqlite"
-    },
-    models: {
+    } as const;
+    models = {
         Space: {
             name: "Space",
             fields: {
@@ -389,12 +389,8 @@ const _schema = {
                 id: { type: "String" }
             }
         }
-    },
-    authType: "User",
-    plugins: {}
-} as const satisfies SchemaDef;
-type Schema = typeof _schema & {
-    __brand?: "schema";
-};
-export const schema: Schema = _schema;
-export type SchemaType = Schema;
+    } as const;
+    authType = "User" as const;
+    plugins = {};
+}
+export const schema = new SchemaType();
diff --git a/tests/e2e/orm/schemas/todo/todo.zmodel b/tests/e2e/orm/schemas/todo/schema.zmodel
similarity index 100%
rename from tests/e2e/orm/schemas/todo/todo.zmodel
rename to tests/e2e/orm/schemas/todo/schema.zmodel
diff --git a/tests/e2e/orm/schemas/typed-json/input.ts b/tests/e2e/orm/schemas/typed-json/input.ts
index 028c2d157..88a751d1c 100644
--- a/tests/e2e/orm/schemas/typed-json/input.ts
+++ b/tests/e2e/orm/schemas/typed-json/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,4 +27,4 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
diff --git a/tests/e2e/orm/schemas/typing/input.ts b/tests/e2e/orm/schemas/typing/input.ts
index 58e1ad6d6..5f893115f 100644
--- a/tests/e2e/orm/schemas/typing/input.ts
+++ b/tests/e2e/orm/schemas/typing/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,7 +47,7 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -67,7 +67,7 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
 export type TagFindManyArgs = $FindManyArgs<$Schema, "Tag">;
 export type TagFindUniqueArgs = $FindUniqueArgs<$Schema, "Tag">;
 export type TagFindFirstArgs = $FindFirstArgs<$Schema, "Tag">;
@@ -87,7 +87,7 @@ export type TagWhereInput = $WhereInput<$Schema, "Tag">;
 export type TagSelect = $SelectInput<$Schema, "Tag">;
 export type TagInclude = $IncludeInput<$Schema, "Tag">;
 export type TagOmit = $OmitInput<$Schema, "Tag">;
-export type TagGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tag", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Tag", Options, Args>;
+export type TagGetPayload<Args extends $SelectIncludeOmit<$Schema, "Tag", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Tag", Args, Options>;
 export type RegionFindManyArgs = $FindManyArgs<$Schema, "Region">;
 export type RegionFindUniqueArgs = $FindUniqueArgs<$Schema, "Region">;
 export type RegionFindFirstArgs = $FindFirstArgs<$Schema, "Region">;
@@ -107,7 +107,7 @@ export type RegionWhereInput = $WhereInput<$Schema, "Region">;
 export type RegionSelect = $SelectInput<$Schema, "Region">;
 export type RegionInclude = $IncludeInput<$Schema, "Region">;
 export type RegionOmit = $OmitInput<$Schema, "Region">;
-export type RegionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Region", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Region", Options, Args>;
+export type RegionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Region", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Region", Args, Options>;
 export type MetaFindManyArgs = $FindManyArgs<$Schema, "Meta">;
 export type MetaFindUniqueArgs = $FindUniqueArgs<$Schema, "Meta">;
 export type MetaFindFirstArgs = $FindFirstArgs<$Schema, "Meta">;
@@ -127,4 +127,4 @@ export type MetaWhereInput = $WhereInput<$Schema, "Meta">;
 export type MetaSelect = $SelectInput<$Schema, "Meta">;
 export type MetaInclude = $IncludeInput<$Schema, "Meta">;
 export type MetaOmit = $OmitInput<$Schema, "Meta">;
-export type MetaGetPayload<Args extends $SelectIncludeOmit<$Schema, "Meta", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Meta", Options, Args>;
+export type MetaGetPayload<Args extends $SelectIncludeOmit<$Schema, "Meta", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Meta", Args, Options>;
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
index f72d9e565..3cc450543 100644
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@ -1,11 +1,11 @@
 {
     "name": "e2e",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "type": "module",
     "scripts": {
         "build": "pnpm test:generate && pnpm test:typecheck",
-        "test:generate": "tsx ../../scripts/test-generate.ts",
+        "test:generate": "tsx ../../scripts/test-generate.ts .",
         "test:typecheck": "tsc --noEmit",
         "test": "vitest run",
         "test:sqlite": "TEST_DB_PROVIDER=sqlite vitest run",
diff --git a/tests/regression/package.json b/tests/regression/package.json
index 2cb125016..6565b4731 100644
--- a/tests/regression/package.json
+++ b/tests/regression/package.json
@@ -1,9 +1,10 @@
 {
     "name": "regression",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "type": "module",
     "scripts": {
+        "build": "pnpm run generate",
         "generate": "tsx ../../scripts/test-generate.ts ./test",
         "test": "pnpm generate && tsc && vitest run"
     },
diff --git a/tests/regression/test/issue-204/input.ts b/tests/regression/test/issue-204/input.ts
index 9564b7f27..3c7c14554 100644
--- a/tests/regression/test/issue-204/input.ts
+++ b/tests/regression/test/issue-204/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">;
 export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">;
 export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">;
@@ -27,4 +27,4 @@ export type FooWhereInput = $WhereInput<$Schema, "Foo">;
 export type FooSelect = $SelectInput<$Schema, "Foo">;
 export type FooInclude = $IncludeInput<$Schema, "Foo">;
 export type FooOmit = $OmitInput<$Schema, "Foo">;
-export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Foo", Options, Args>;
+export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Foo", Args, Options>;
diff --git a/tests/regression/test/issue-204/schema.ts b/tests/regression/test/issue-204/schema.ts
index a2de389c0..5b24b3ae7 100644
--- a/tests/regression/test/issue-204/schema.ts
+++ b/tests/regression/test/issue-204/schema.ts
@@ -6,11 +6,11 @@
 /* eslint-disable */
 
 import { type SchemaDef } from "@zenstackhq/orm/schema";
-const _schema = {
-    provider: {
+export class SchemaType implements SchemaDef {
+    provider = {
         type: "sqlite"
-    },
-    models: {
+    } as const;
+    models = {
         Foo: {
             name: "Foo",
             fields: {
@@ -31,8 +31,8 @@ const _schema = {
                 id: { type: "Int" }
             }
         }
-    },
-    typeDefs: {
+    } as const;
+    typeDefs = {
         Configuration: {
             name: "Configuration",
             fields: {
@@ -44,8 +44,8 @@ const _schema = {
                 }
             }
         }
-    },
-    enums: {
+    } as const;
+    enums = {
         ShirtColor: {
             values: {
                 Black: "Black",
@@ -55,11 +55,7 @@ const _schema = {
                 Blue: "Blue"
             }
         }
-    },
-    plugins: {}
-} as const satisfies SchemaDef;
-type Schema = typeof _schema & {
-    __brand?: "schema";
-};
-export const schema: Schema = _schema;
-export type SchemaType = Schema;
+    } as const;
+    plugins = {};
+}
+export const schema = new SchemaType();
diff --git a/tests/regression/test/issue-204/regression.zmodel b/tests/regression/test/issue-204/schema.zmodel
similarity index 100%
rename from tests/regression/test/issue-204/regression.zmodel
rename to tests/regression/test/issue-204/schema.zmodel
diff --git a/tests/regression/test/issue-422/input.ts b/tests/regression/test/issue-422/input.ts
index a931f0681..b2d63acdb 100644
--- a/tests/regression/test/issue-422/input.ts
+++ b/tests/regression/test/issue-422/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type SessionFindManyArgs = $FindManyArgs<$Schema, "Session">;
 export type SessionFindUniqueArgs = $FindUniqueArgs<$Schema, "Session">;
 export type SessionFindFirstArgs = $FindFirstArgs<$Schema, "Session">;
@@ -27,7 +27,7 @@ export type SessionWhereInput = $WhereInput<$Schema, "Session">;
 export type SessionSelect = $SelectInput<$Schema, "Session">;
 export type SessionInclude = $IncludeInput<$Schema, "Session">;
 export type SessionOmit = $OmitInput<$Schema, "Session">;
-export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Session", Options, Args>;
+export type SessionGetPayload<Args extends $SelectIncludeOmit<$Schema, "Session", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Session", Args, Options>;
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -47,7 +47,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type ProfileFindManyArgs = $FindManyArgs<$Schema, "Profile">;
 export type ProfileFindUniqueArgs = $FindUniqueArgs<$Schema, "Profile">;
 export type ProfileFindFirstArgs = $FindFirstArgs<$Schema, "Profile">;
@@ -67,4 +67,4 @@ export type ProfileWhereInput = $WhereInput<$Schema, "Profile">;
 export type ProfileSelect = $SelectInput<$Schema, "Profile">;
 export type ProfileInclude = $IncludeInput<$Schema, "Profile">;
 export type ProfileOmit = $OmitInput<$Schema, "Profile">;
-export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Profile", Options, Args>;
+export type ProfileGetPayload<Args extends $SelectIncludeOmit<$Schema, "Profile", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Profile", Args, Options>;
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
index 987712fe5..b41bdeb5d 100644
--- a/tests/runtimes/bun/package.json
+++ b/tests/runtimes/bun/package.json
@@ -1,6 +1,6 @@
 {
     "name": "bun-e2e",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/runtimes/bun/schemas/input.ts b/tests/runtimes/bun/schemas/input.ts
index fb7763147..3799802f9 100644
--- a/tests/runtimes/bun/schemas/input.ts
+++ b/tests/runtimes/bun/schemas/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,4 +47,4 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json
index fab9cd887..0e449278e 100644
--- a/tests/runtimes/edge-runtime/package.json
+++ b/tests/runtimes/edge-runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "edge-runtime-e2e",
-    "version": "3.0.0-beta.28",
+    "version": "3.0.0-beta.29",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/runtimes/edge-runtime/schemas/input.ts b/tests/runtimes/edge-runtime/schemas/input.ts
index fb7763147..3799802f9 100644
--- a/tests/runtimes/edge-runtime/schemas/input.ts
+++ b/tests/runtimes/edge-runtime/schemas/input.ts
@@ -6,8 +6,8 @@
 /* eslint-disable */
 
 import { type SchemaType as $Schema } from "./schema";
-import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, ClientOptions as $ClientOptions } from "@zenstackhq/orm";
-import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
+import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput, QueryOptions as $QueryOptions } from "@zenstackhq/orm";
+import type { SimplifiedPlainResult as $Result, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm";
 export type UserFindManyArgs = $FindManyArgs<$Schema, "User">;
 export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">;
 export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">;
@@ -27,7 +27,7 @@ export type UserWhereInput = $WhereInput<$Schema, "User">;
 export type UserSelect = $SelectInput<$Schema, "User">;
 export type UserInclude = $IncludeInput<$Schema, "User">;
 export type UserOmit = $OmitInput<$Schema, "User">;
-export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "User", Options, Args>;
+export type UserGetPayload<Args extends $SelectIncludeOmit<$Schema, "User", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "User", Args, Options>;
 export type PostFindManyArgs = $FindManyArgs<$Schema, "Post">;
 export type PostFindUniqueArgs = $FindUniqueArgs<$Schema, "Post">;
 export type PostFindFirstArgs = $FindFirstArgs<$Schema, "Post">;
@@ -47,4 +47,4 @@ export type PostWhereInput = $WhereInput<$Schema, "Post">;
 export type PostSelect = $SelectInput<$Schema, "Post">;
 export type PostInclude = $IncludeInput<$Schema, "Post">;
 export type PostOmit = $OmitInput<$Schema, "Post">;
-export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $ClientOptions<$Schema> = $ClientOptions<$Schema>> = $SimplifiedModelResult<$Schema, "Post", Options, Args>;
+export type PostGetPayload<Args extends $SelectIncludeOmit<$Schema, "Post", true>, Options extends $QueryOptions<$Schema> = $QueryOptions<$Schema>> = $Result<$Schema, "Post", Args, Options>;