diff --git a/.changepacks/changepack_log_D8fobT6BfrHUsnwTK0qDM.json b/.changepacks/changepack_log_D8fobT6BfrHUsnwTK0qDM.json
new file mode 100644
index 0000000..fff6cd0
--- /dev/null
+++ b/.changepacks/changepack_log_D8fobT6BfrHUsnwTK0qDM.json
@@ -0,0 +1 @@
+{"changes":{"packages/react-query/package.json":"Patch","packages/generator/package.json":"Patch","packages/core/package.json":"Patch","packages/fetch/package.json":"Patch"},"note":"Optimize typing","date":"2025-12-04T13:37:03.219785200Z"}
\ No newline at end of file
diff --git a/packages/core/src/additional.ts b/packages/core/src/additional.ts
index ba134e0..d835e75 100644
--- a/packages/core/src/additional.ts
+++ b/packages/core/src/additional.ts
@@ -29,3 +29,15 @@ export type DevupApiRequestInit = Omit<RequestInit, 'body'> & {
 export type ExtractValue<T, V extends string, F = any> = V extends keyof T
   ? T[V]
   : F
+
+export type BoildApiOption<O> = Omit<DevupApiRequestInit, 'params'> &
+  Omit<O, 'response' | 'error'>
+export type ConditionalApiOption<O> = IsCold extends true
+  ? DevupApiRequestInit
+  : BoildApiOption<O>
+
+export type ApiOption<O extends object, R extends unknown[] = []> = [
+  RequiredOptions<O>,
+] extends [never]
+  ? [options?: ConditionalApiOption<O>, ...R]
+  : [options: BoildApiOption<O>, ...R]
diff --git a/packages/fetch/src/api.ts b/packages/fetch/src/api.ts
index 99fdc18..0867c0c 100644
--- a/packages/fetch/src/api.ts
+++ b/packages/fetch/src/api.ts
@@ -1,5 +1,7 @@
 import type {
   Additional,
+  ApiOption,
+  BoildApiOption,
   ConditionalKeys,
   DevupApiRequestInit,
   DevupApiServers,
@@ -16,9 +18,7 @@ import type {
   DevupPutApiStructKey,
   DevupPutApiStructScope,
   ExtractValue,
-  IsCold,
   Middleware,
-  RequiredOptions,
 } from '@devup-api/core'
 import { convertResponse } from './response-converter'
 import { getApiEndpointInfo } from './url-map'
@@ -59,24 +59,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupGetApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'GET',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   GET<
@@ -84,24 +74,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupGetApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'GET',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   post<
@@ -109,24 +89,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPostApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'POST',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   POST<
@@ -134,24 +104,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPostApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'POST',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   put<
@@ -159,24 +119,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPutApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'PUT',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   PUT<
@@ -184,24 +134,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPutApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'PUT',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   delete<
@@ -209,24 +149,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupDeleteApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'DELETE',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   DELETE<
@@ -234,24 +164,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupDeleteApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'DELETE',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   patch<
@@ -259,24 +179,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPatchApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'PATCH',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   PATCH<
@@ -284,24 +194,14 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupPatchApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
     return this.request(path, {
       method: 'PATCH',
       ...options[0],
-    } as DevupApiRequestInit & Omit<O, 'response' | 'error'>)
+    } as BoildApiOption<O>)
   }
 
   async request<
@@ -309,17 +209,7 @@ export class DevupApi<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, DevupApiStructScope<S>>,
   >(
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-        ]
+    ...options: ApiOption<O>
   ): Promise<
     DevupApiResponse<ExtractValue<O, 'response'>, ExtractValue<O, 'error'>>
   > {
diff --git a/packages/react-query/src/query-client.ts b/packages/react-query/src/query-client.ts
index a947e06..67441d8 100644
--- a/packages/react-query/src/query-client.ts
+++ b/packages/react-query/src/query-client.ts
@@ -1,5 +1,7 @@
 import type {
   Additional,
+  ApiOption,
+  ConditionalApiOption,
   ConditionalKeys,
   DevupApi,
   DevupApiRequestInit,
@@ -11,9 +13,6 @@ import type {
   DevupPostApiStructScope,
   DevupPutApiStructScope,
   ExtractValue,
-  IsCold,
-  RequiredOptions,
-  // RequiredOptions,
 } from '@devup-api/fetch'
 import {
   useInfiniteQuery,
@@ -70,27 +69,16 @@ export class DevupQueryClient<S extends ConditionalKeys<DevupApiServers>> {
   >(
     method: M,
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-          queryOptions?: Omit<
-            Parameters<typeof useQuery<D, E>>[0],
-            'queryFn' | 'queryKey'
-          >,
-          queryClient?: Parameters<typeof useQuery<D, E>>[1],
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-          queryOptions?: Omit<
-            Parameters<typeof useQuery<D, E>>[0],
-            'queryFn' | 'queryKey'
-          >,
-          queryClient?: Parameters<typeof useQuery<D, E>>[1],
-        ]
+    ...options: ApiOption<
+      O,
+      [
+        queryOptions?: Omit<
+          Parameters<typeof useQuery<D, E>>[0],
+          'queryFn' | 'queryKey'
+        >,
+        queryClient?: Parameters<typeof useQuery<D, E>>[1],
+      ]
+    >
   ): ReturnType<typeof useQuery<D, E>> {
     return useQuery<D, E>(
       {
@@ -143,14 +131,7 @@ export class DevupQueryClient<S extends ConditionalKeys<DevupApiServers>> {
     O extends Additional<T, ST>,
     D extends ExtractValue<O, 'response'>,
     E extends ExtractValue<O, 'error'>,
-    V extends [RequiredOptions<O>] extends [never]
-      ?
-          | (IsCold extends true
-              ? DevupApiRequestInit
-              : Omit<DevupApiRequestInit, 'params'> &
-                  Omit<O, 'response' | 'error'>)
-          | undefined
-      : Omit<DevupApiRequestInit, 'params'> & Omit<O, 'response' | 'error'>,
+    V extends ApiOption<O>[0],
   >(
     method: M,
     path: T,
@@ -208,27 +189,16 @@ export class DevupQueryClient<S extends ConditionalKeys<DevupApiServers>> {
   >(
     method: M,
     path: T,
-    ...options: [RequiredOptions<O>] extends [never]
-      ? [
-          options?: IsCold extends true
-            ? DevupApiRequestInit
-            : Omit<DevupApiRequestInit, 'params'> &
-                Omit<O, 'response' | 'error'>,
-          queryOptions?: Omit<
-            Parameters<typeof useSuspenseQuery<D, E>>[0],
-            'queryFn' | 'queryKey'
-          >,
-          queryClient?: Parameters<typeof useSuspenseQuery<D, E>>[1],
-        ]
-      : [
-          options: Omit<DevupApiRequestInit, 'params'> &
-            Omit<O, 'response' | 'error'>,
-          queryOptions?: Omit<
-            Parameters<typeof useSuspenseQuery<D, E>>[0],
-            'queryFn' | 'queryKey'
-          >,
-          queryClient?: Parameters<typeof useSuspenseQuery<D, E>>[1],
-        ]
+    ...options: ApiOption<
+      O,
+      [
+        queryOptions?: Omit<
+          Parameters<typeof useSuspenseQuery<D, E>>[0],
+          'queryFn' | 'queryKey'
+        >,
+        queryClient?: Parameters<typeof useSuspenseQuery<D, E>>[1],
+      ]
+    >
   ): ReturnType<typeof useSuspenseQuery<D, E>> {
     return useSuspenseQuery<D, E, D>(
       {
@@ -285,9 +255,7 @@ export class DevupQueryClient<S extends ConditionalKeys<DevupApiServers>> {
     method: M,
     path: T,
     ...options: [
-      options: (IsCold extends true
-        ? DevupApiRequestInit
-        : Omit<DevupApiRequestInit, 'params'> & Omit<O, 'response' | 'error'>) &
+      options: ConditionalApiOption<O> &
         Pick<
           Parameters<typeof useInfiniteQuery<D, E>>[0],
           'getNextPageParam' | 'initialPageParam'