diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7456104..d2804bf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,18 +33,30 @@ jobs:
       - name: Build
         run: pnpm -w build
 
-      - name: Run codegen
+      - name: Run codegen for react-app
         run: pnpm --filter @7nohe/react-app generate:api
 
-      - name: Archive generated query file
+      - name: Run codegen for nextjs-app
+        run: pnpm --filter nextjs-app generate:api
+
+      - name: Run codegen for tanstack-router-app
+        run: pnpm --filter tanstack-router-app generate:api
+
+      - name: Archive generated query files
         uses: actions/upload-artifact@v4
         with:
           name: generated-query-file-${{ matrix.os }}
-          path: examples/react-app/openapi/queries/index.ts
+          path: examples/react-app/openapi/queries
 
-      - name: Run tsc
+      - name: Run tsc in react-app
         run: pnpm --filter @7nohe/react-app test:generated
 
+      - name: Run tsc in nextjs-app
+        run: pnpm --filter nextjs-app test:generated
+
+      - name: Run tsc in tanstack-router-app
+        run: pnpm --filter tanstack-router-app test:generated
+
       - name: Run biome
         run: pnpm biome check .
         if: ${{ matrix.os == 'ubuntu-latest' }}
diff --git a/README.md b/README.md
index 218f2a1..3f849de 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,10 @@ Options:
   -i, --input <value>         OpenAPI specification, can be a path, url or string content (required)
   -o, --output <value>        Output directory (default: "openapi")
   -c, --client <value>        HTTP client to generate (choices: "@hey-api/client-fetch", "@hey-api/client-axios", default: "@hey-api/client-fetch")
-  --request <value>           Path to custom request file
   --format <value>            Process output folder with formatter? (choices: "biome", "prettier")
   --lint <value>              Process output folder with linter? (choices: "biome", "eslint")
   --operationId               Use operation ID to generate operation names?
   --serviceResponse <value>   Define shape of returned value from service calls (choices: "body", "response", default: "body")
-  --base <value>              Manually set base in OpenAPI config instead of inferring from server value
   --enums <value>             Generate JavaScript objects from enum definitions? (choices: "javascript", "typescript")
   --useDateType               Use Date type instead of string for date types for models, this will not convert the data to a Date object
   --debug                     Run in debug mode?
@@ -94,9 +92,9 @@ $ openapi-rq -i ./petstore.yaml
 
 ```tsx
 // App.tsx
-import { usePetServiceFindPetsByStatus } from "../openapi/queries";
+import { useFindPets } from "../openapi/queries";
 function App() {
-  const { data } = usePetServiceFindPetsByStatus({ status: ["available"] });
+  const { data } = useFindPets();
 
   return (
     <div className="App">
@@ -113,16 +111,16 @@ export default App;
 
 ```tsx
 import { useQuery } from "@tanstack/react-query";
-import { PetService } from "../openapi/requests/services";
-import { usePetServiceFindPetsByStatusKey } from "../openapi/queries";
+import { findPets } from "../openapi/requests/services.gen";
+import { useFindPetsKey } from "../openapi/queries";
 
 function App() {
   // You can still use the auto-generated query key
   const { data } = useQuery({
-    queryKey: [usePetServiceFindPetsByStatusKey],
+    queryKey: [useFindPetsKey],
     queryFn: () => {
       // Do something here
-      return PetService.findPetsByStatus(["available"]);
+      return findPets();
     },
   });
 
@@ -136,9 +134,11 @@ export default App;
 
 ```tsx
 // App.tsx
-import { useDefaultClientFindPetsSuspense } from "../openapi/queries/suspense";
+import { useFindPetsSuspense } from "../openapi/queries/suspense";
 function ChildComponent() {
-  const { data } = useDefaultClientFindPetsSuspense({ tags: [], limit: 10 });
+  const { data } = useFindPetsSuspense({
+    query: { tags: [], limit: 10 },
+  });
 
   return <ul>{data?.map((pet, index) => <li key={pet.id}>{pet.name}</li>)}</ul>;
 }
@@ -169,13 +169,13 @@ export default App;
 
 ```tsx
 // App.tsx
-import { usePetServiceAddPet } from "../openapi/queries";
+import { useAddPet } from "../openapi/queries";
 
 function App() {
-  const { mutate } = usePetServiceAddPet();
+  const { mutate } = useAddPet();
 
   const handleAddPet = () => {
-    mutate({ name: "Fluffy", status: "available" });
+    mutate({ body: { name: "Fluffy" } });
   };
 
   return (
@@ -199,22 +199,22 @@ To ensure the query key is created the same way as the query hook, you can use t
 
 ```tsx
 import {
-  usePetServiceFindPetsByStatus,
-  usePetServiceAddPet,
-  UsePetServiceFindPetsByStatusKeyFn,
+  useFindPetsByStatus,
+  useAddPet,
+  UseFindPetsByStatusKeyFn,
 } from "../openapi/queries";
 
 // App.tsx
 function App() {
   const [status, setStatus] = React.useState(["available"]);
-  const { data } = usePetServiceFindPetsByStatus({ status });
-  const { mutate } = usePetServiceAddPet({
+  const { data } = useFindPetsByStatus({ status });
+  const { mutate } = useAddPet({
     onSuccess: () => {
       queryClient.invalidateQueries({
         // Call the query key function to get the query key
         // This is important to ensure the query key is created the same way as the query hook
         // This insures the cache is invalidated correctly and is typed correctly
-        queryKey: [UsePetServiceFindPetsByStatusKeyFn({
+        queryKey: [UseFindPetsByStatusKeyFn({
           status
         })],
       });
@@ -299,42 +299,13 @@ paths:
 Usage of Generated Hooks:
 
 ```ts
-import { useDefaultServiceFindPaginatedPetsInfinite } from "@/openapi/queries/infiniteQueries";
+import { useFindPaginatedPetsInfinite } from "@/openapi/queries/infiniteQueries";
 
-const { data, fetchNextPage } = useDefaultServiceFindPaginatedPetsInfinite({
-  limit: 10,
-  tags: [],
+const { data, fetchNextPage } = useFindPaginatedPetsInfinite({
+  query: { tags: [], limit: 10 }
 });
 ```
 
-##### Runtime Configuration
-
-You can modify the default values used by the generated service calls by modifying the OpenAPI configuration singleton object.
-
-It's default location is `openapi/requests/core/OpenAPI.ts` and it is also exported from `openapi/index.ts`
-
-Import the constant into your runtime and modify it before setting up the react app.
-
-```typescript
-/** main.tsx */
-import { OpenAPI as OpenAPIConfig } from './openapi/requests/core/OpenAPI';
-...
-OpenAPIConfig.BASE = 'www.domain.com/api';
-OpenAPIConfig.HEADERS = {
-  'x-header-1': 'value-1',
-  'x-header-2': 'value-2',
-};
-...
-ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
-  <React.StrictMode>
-    <QueryClientProvider client={queryClient}>
-      <App />
-    </QueryClientProvider>
-  </React.StrictMode>
-);
-
-```
-
 ## Development
 
 ### Install dependencies
@@ -364,6 +335,7 @@ pnpm snapshot
 ```
 
 ### Build example and validate generated code
+
 ```bash
 npm run build && pnpm --filter @7nohe/react-app generate:api && pnpm --filter @7nohe/react-app test:generated 
 ```
diff --git a/examples/nextjs-app/package.json b/examples/nextjs-app/package.json
index 08e8db6..366d0d5 100644
--- a/examples/nextjs-app/package.json
+++ b/examples/nextjs-app/package.json
@@ -9,12 +9,12 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "generate:api": "rimraf ./openapi && node ../../dist/cli.mjs -i ../petstore.yaml --format=biome --lint=biome"
+    "generate:api": "rimraf ./openapi && node ../../dist/cli.mjs -i ../petstore.yaml --format=biome --lint=biome",
+    "test:generated": "tsc -p ./tsconfig.json --noEmit"
   },
   "dependencies": {
     "@tanstack/react-query": "^5.32.1",
     "@tanstack/react-query-devtools": "^5.32.1",
-    "axios": "^1.6.7",
     "next": "^14.2.3",
     "react": "^18",
     "react-dom": "^18"
diff --git a/examples/react-app/package.json b/examples/react-app/package.json
index c68ec7c..d06642b 100644
--- a/examples/react-app/package.json
+++ b/examples/react-app/package.json
@@ -10,12 +10,12 @@
     "build": "tsc && vite build",
     "preview": "vite preview",
     "generate:api": "rimraf ./openapi && node ../../dist/cli.mjs -i ../petstore.yaml --format=biome --lint=biome -c @hey-api/client-axios",
-    "test:generated": "tsc -p ./tsconfig.openapi.json --noEmit"
+    "test:generated": "tsc -p ./tsconfig.json --noEmit"
   },
   "dependencies": {
     "@hey-api/client-axios": "^0.2.7",
     "@tanstack/react-query": "^5.32.1",
-    "axios": "^1.6.7",
+    "axios": "^1.7.7",
     "form-data": "~4.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
diff --git a/examples/react-app/src/App.tsx b/examples/react-app/src/App.tsx
index d1f45d2..68f4bf3 100644
--- a/examples/react-app/src/App.tsx
+++ b/examples/react-app/src/App.tsx
@@ -29,7 +29,10 @@ function App() {
   const { data: notDefined } = useGetNotDefined<undefined>();
   const { mutate: mutateNotDefined } = usePostNotDefined<undefined>();
 
-  const { mutate: addPet } = useAddPet();
+  const { mutate: addPet, isError } = useAddPet();
+
+  const [text, setText] = useState<string>("");
+  const [errorText, setErrorText] = useState<string>();
 
   if (error)
     return (
@@ -44,18 +47,18 @@ function App() {
   return (
     <div className="App">
       <h1>Pet List</h1>
-      <ul>
-        {Array.isArray(data) &&
-          data?.map((pet, index) => (
-            <li key={`${pet.id}-${index}`}>{pet.name}</li>
-          ))}
-      </ul>
+      <input
+        type="text"
+        value={text}
+        placeholder="Type pet name"
+        onChange={(e) => setText(e.target.value)}
+      />
       <button
         type="button"
         onClick={() => {
           addPet(
             {
-              body: { name: "Duggy" },
+              body: { name: text },
             },
             {
               onSuccess: () => {
@@ -64,13 +67,31 @@ function App() {
                 });
                 console.log("success");
               },
-              onError: (error) => console.error(error),
+              onError: (error) => {
+                console.log(error.response);
+                setErrorText(`Error: ${error.response?.data.message}`);
+              },
             },
           );
         }}
       >
         Create a pet
       </button>
+      {isError && (
+        <p
+          style={{
+            color: "red",
+          }}
+        >
+          {errorText}
+        </p>
+      )}
+      <ul>
+        {Array.isArray(data) &&
+          data?.map((pet, index) => (
+            <li key={`${pet.id}-${index}`}>{pet.name}</li>
+          ))}
+      </ul>
       <div>
         <h1>Suspense Components</h1>
         <SuspenseParent />
diff --git a/examples/react-app/src/axios.ts b/examples/react-app/src/axios.ts
index e767177..22aaac4 100644
--- a/examples/react-app/src/axios.ts
+++ b/examples/react-app/src/axios.ts
@@ -2,4 +2,5 @@ import { client } from "../openapi/requests/services.gen";
 
 client.setConfig({
   baseURL: "http://localhost:4010",
+  throwOnError: true,
 });
diff --git a/examples/react-app/src/index.css b/examples/react-app/src/index.css
index 917888c..c5239e6 100644
--- a/examples/react-app/src/index.css
+++ b/examples/react-app/src/index.css
@@ -68,3 +68,20 @@ button:focus-visible {
     background-color: #f9f9f9;
   }
 }
+
+input {
+  border-radius: 8px;
+  border: 1px solid #ccc;
+  padding: 0.5em;
+  font-size: 1em;
+  font-family: inherit;
+  background-color: #fff;
+  color: #000;
+  transition: border-color 0.25s;
+  margin: 1em;
+}
+
+input:focus {
+  border-color: #646cff;
+  outline: none;
+}
\ No newline at end of file
diff --git a/examples/react-app/tsconfig.json b/examples/react-app/tsconfig.json
index 374b672..4e730f0 100644
--- a/examples/react-app/tsconfig.json
+++ b/examples/react-app/tsconfig.json
@@ -18,7 +18,8 @@
   },
   "include": ["src"],
   "references": [
-    { "path": "./tsconfig.node.json" },
-    { "path": "./tsconfig.openapi.json" }
+    {
+      "path": "./tsconfig.node.json"
+    }
   ]
 }
diff --git a/examples/react-app/tsconfig.openapi.json b/examples/react-app/tsconfig.openapi.json
deleted file mode 100644
index 89de92d..0000000
--- a/examples/react-app/tsconfig.openapi.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node10",
-    "resolveJsonModule": true,
-    "isolatedModules": true
-  },
-  "include": ["openapi"]
-}
diff --git a/examples/tanstack-router-app/package.json b/examples/tanstack-router-app/package.json
index 1904496..2d6f2a8 100644
--- a/examples/tanstack-router-app/package.json
+++ b/examples/tanstack-router-app/package.json
@@ -11,7 +11,8 @@
     "build": "vite build",
     "serve": "vite preview",
     "start": "vite",
-    "generate:api": "rimraf ./openapi && node ../../dist/cli.mjs -i ../petstore.yaml --format=biome --lint=biome"
+    "generate:api": "rimraf ./openapi && node ../../dist/cli.mjs -i ../petstore.yaml --format=biome --lint=biome",
+    "test:generated": "tsc -p ./tsconfig.json --noEmit"
   },
   "devDependencies": {
     "@stoplight/prism-cli": "^5.5.2",
diff --git a/package.json b/package.json
index 6f4b8a1..7e58b45 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
     "build": "rimraf dist && tsc -p tsconfig.json",
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
-    "preview": "npm run build && npm -C examples/react-app run generate:api",
+    "preview:react": "npm run build && npm -C examples/react-app run generate:api",
+    "preview:nextjs": "npm run build && npm -C examples/nextjs-app run generate:api",
+    "preview:tanstack-router": "npm run build && npm -C examples/tanstack-router-app run generate:api",
     "prepublishOnly": "npm run build",
     "release": "npx git-ensure -a && npx bumpp --commit --tag --push",
     "test": "vitest --coverage.enabled true",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3aa9ef4..fe8d542 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,9 +63,6 @@ importers:
       '@tanstack/react-query-devtools':
         specifier: ^5.32.1
         version: 5.45.0(@tanstack/react-query@5.45.0(react@18.3.1))(react@18.3.1)
-      axios:
-        specifier: ^1.6.7
-        version: 1.7.2
       next:
         specifier: ^14.2.3
         version: 14.2.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -105,13 +102,13 @@ importers:
     dependencies:
       '@hey-api/client-axios':
         specifier: ^0.2.7
-        version: 0.2.7(axios@1.7.2)
+        version: 0.2.7(axios@1.7.7)
       '@tanstack/react-query':
         specifier: ^5.32.1
         version: 5.45.0(react@18.3.1)
       axios:
-        specifier: ^1.6.7
-        version: 1.7.2
+        specifier: ^1.7.7
+        version: 1.7.7
       form-data:
         specifier: ~4.0.0
         version: 4.0.0
@@ -1857,8 +1854,8 @@ packages:
     resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
     engines: {node: '>= 0.4'}
 
-  axios@1.7.2:
-    resolution: {integrity: sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==}
+  axios@1.7.7:
+    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
 
   b4a@1.6.7:
     resolution: {integrity: sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==}
@@ -5079,9 +5076,9 @@ snapshots:
 
   '@fastify/busboy@2.1.1': {}
 
-  '@hey-api/client-axios@0.2.7(axios@1.7.2)':
+  '@hey-api/client-axios@0.2.7(axios@1.7.7)':
     dependencies:
-      axios: 1.7.2
+      axios: 1.7.7
 
   '@hey-api/client-fetch@0.4.0': {}
 
@@ -6190,7 +6187,7 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.0.0
 
-  axios@1.7.2:
+  axios@1.7.7:
     dependencies:
       follow-redirects: 1.15.6
       form-data: 4.0.0
diff --git a/src/cli.mts b/src/cli.mts
index 4ca7b06..fc587e5 100644
--- a/src/cli.mts
+++ b/src/cli.mts
@@ -11,20 +11,11 @@ const program = new Command();
 export type LimitedUserConfig = {
   input: string;
   output: string;
-  client?:
-    | "legacy/angular"
-    | "legacy/axios"
-    | "legacy/fetch"
-    | "legacy/node"
-    | "legacy/xhr"
-    | "@hey-api/client-fetch"
-    | "@hey-api/client-axios";
-  request?: string;
+  client?: "@hey-api/client-fetch" | "@hey-api/client-axios";
   format?: "biome" | "prettier";
   lint?: "biome" | "eslint";
   operationId?: boolean;
   serviceResponse?: "body" | "response";
-  base?: string;
   enums?: "javascript" | "typescript" | false;
   useDateType?: boolean;
   debug?: boolean;
@@ -56,7 +47,6 @@ async function setupProgram() {
         .choices(["@hey-api/client-fetch", "@hey-api/client-axios"])
         .default("@hey-api/client-fetch"),
     )
-    .option("--request <value>", "Path to custom request file")
     .addOption(
       new Option(
         "--format <value>",
@@ -78,10 +68,6 @@ async function setupProgram() {
         .choices(["body", "response"])
         .default("body"),
     )
-    .option(
-      "--base <value>",
-      "Manually set base in OpenAPI config instead of inferring from server value",
-    )
     .addOption(
       new Option(
         "--enums <value>",
diff --git a/src/createExports.mts b/src/createExports.mts
index 334c612..90dc93b 100644
--- a/src/createExports.mts
+++ b/src/createExports.mts
@@ -1,3 +1,4 @@
+import type { UserConfig } from "@hey-api/openapi-ts";
 import type { Project } from "ts-morph";
 import ts from "typescript";
 import { capitalizeFirstLetter } from "./common.mjs";
@@ -7,13 +8,21 @@ import { createUseMutation } from "./createUseMutation.mjs";
 import { createUseQuery } from "./createUseQuery.mjs";
 import type { Service } from "./service.mjs";
 
-export const createExports = (
-  service: Service,
-  project: Project,
-  pageParam: string,
-  nextPageParam: string,
-  initialPageParam: string,
-) => {
+export const createExports = ({
+  service,
+  client,
+  project,
+  pageParam,
+  nextPageParam,
+  initialPageParam,
+}: {
+  service: Service;
+  client: UserConfig["client"];
+  project: Project;
+  pageParam: string;
+  nextPageParam: string;
+  initialPageParam: string;
+}) => {
   const { methods } = service;
   const methodDataNames = methods.reduce(
     (acc, data) => {
@@ -72,14 +81,15 @@ export const createExports = (
   );
 
   const allGetQueries = allGet.map((m) =>
-    createUseQuery(
-      m,
+    createUseQuery({
+      functionDescription: m,
+      client,
       pageParam,
       nextPageParam,
       initialPageParam,
       paginatableMethods,
       modelNames,
-    ),
+    }),
   );
   const allPrefetchQueries = allGet.map((m) =>
     createPrefetchOrEnsure({ ...m, functionType: "prefetch", modelNames }),
@@ -89,16 +99,16 @@ export const createExports = (
   );
 
   const allPostMutations = allPost.map((m) =>
-    createUseMutation({ ...m, modelNames }),
+    createUseMutation({ ...m, modelNames, client }),
   );
   const allPutMutations = allPut.map((m) =>
-    createUseMutation({ ...m, modelNames }),
+    createUseMutation({ ...m, modelNames, client }),
   );
   const allPatchMutations = allPatch.map((m) =>
-    createUseMutation({ ...m, modelNames }),
+    createUseMutation({ ...m, modelNames, client }),
   );
   const allDeleteMutations = allDelete.map((m) =>
-    createUseMutation({ ...m, modelNames }),
+    createUseMutation({ ...m, modelNames, client }),
   );
 
   const allQueries = [...allGetQueries];
diff --git a/src/createImports.mts b/src/createImports.mts
index 2e367b5..aa1b433 100644
--- a/src/createImports.mts
+++ b/src/createImports.mts
@@ -1,4 +1,5 @@
 import { posix } from "node:path";
+import type { UserConfig } from "@hey-api/openapi-ts";
 import type { Project } from "ts-morph";
 import ts from "typescript";
 import { modelsFileName, serviceFileName } from "./constants.mjs";
@@ -7,8 +8,10 @@ const { join } = posix;
 
 export const createImports = ({
   project,
+  client,
 }: {
   project: Project;
+  client: UserConfig["client"];
 }) => {
   const modelsFile = project
     .getSourceFiles()
@@ -127,5 +130,25 @@ export const createImports = ({
       ),
     );
   }
+
+  if (client === "@hey-api/client-axios") {
+    imports.push(
+      ts.factory.createImportDeclaration(
+        undefined,
+        ts.factory.createImportClause(
+          false,
+          undefined,
+          ts.factory.createNamedImports([
+            ts.factory.createImportSpecifier(
+              false,
+              undefined,
+              ts.factory.createIdentifier("AxiosError"),
+            ),
+          ]),
+        ),
+        ts.factory.createStringLiteral("axios"),
+      ),
+    );
+  }
   return imports;
 };
diff --git a/src/createSource.mts b/src/createSource.mts
index e29929d..71e2fc4 100644
--- a/src/createSource.mts
+++ b/src/createSource.mts
@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import type { UserConfig } from "@hey-api/openapi-ts";
 import { Project } from "ts-morph";
 import ts from "typescript";
 import { OpenApiRqFiles } from "./constants.mjs";
@@ -6,12 +7,19 @@ import { createExports } from "./createExports.mjs";
 import { createImports } from "./createImports.mjs";
 import { getServices } from "./service.mjs";
 
-const createSourceFile = async (
-  outputPath: string,
-  pageParam: string,
-  nextPageParam: string,
-  initialPageParam: string,
-) => {
+const createSourceFile = async ({
+  outputPath,
+  client,
+  pageParam,
+  nextPageParam,
+  initialPageParam,
+}: {
+  outputPath: string;
+  client: UserConfig["client"];
+  pageParam: string;
+  nextPageParam: string;
+  initialPageParam: string;
+}) => {
   const project = new Project({
     // Optionally specify compiler options, tsconfig.json, in-memory file system, and more here.
     // If you initialize with a tsconfig.json, then it will automatically populate the project
@@ -27,15 +35,17 @@ const createSourceFile = async (
 
   const imports = createImports({
     project,
+    client,
   });
 
-  const exports = createExports(
+  const exports = createExports({
     service,
+    client,
     project,
     pageParam,
     nextPageParam,
     initialPageParam,
-  );
+  });
 
   const commonSource = ts.factory.createSourceFile(
     [...imports, ...exports.allCommon],
@@ -119,12 +129,14 @@ const createSourceFile = async (
 
 export const createSource = async ({
   outputPath,
+  client,
   version,
   pageParam,
   nextPageParam,
   initialPageParam,
 }: {
   outputPath: string;
+  client: UserConfig["client"];
   version: string;
   pageParam: string;
   nextPageParam: string;
@@ -196,12 +208,13 @@ export const createSource = async ({
     indexSource,
     prefetchSource,
     ensureSource,
-  } = await createSourceFile(
+  } = await createSourceFile({
     outputPath,
+    client,
     pageParam,
     nextPageParam,
     initialPageParam,
-  );
+  });
 
   const comment = `// generated with @7nohe/openapi-react-query-codegen@${version} \n\n`;
 
diff --git a/src/createUseMutation.mts b/src/createUseMutation.mts
index b20d27e..d57ab93 100644
--- a/src/createUseMutation.mts
+++ b/src/createUseMutation.mts
@@ -1,3 +1,4 @@
+import type { UserConfig } from "@hey-api/openapi-ts";
 import ts from "typescript";
 import {
   BuildCommonTypeName,
@@ -15,11 +16,7 @@ import { addJSDocToNode } from "./util.mjs";
 /**
  *  Awaited<ReturnType<typeof myClass.myMethod>>
  */
-function generateAwaitedReturnType({
-  methodName,
-}: {
-  methodName: string;
-}) {
+function generateAwaitedReturnType({ methodName }: { methodName: string }) {
   return ts.factory.createTypeReferenceNode(
     ts.factory.createIdentifier("Awaited"),
     [
@@ -41,7 +38,11 @@ export const createUseMutation = ({
   method,
   jsDoc,
   modelNames,
-}: FunctionDescription & { modelNames: string[] }) => {
+  client,
+}: FunctionDescription & {
+  modelNames: string[];
+  client: UserConfig["client"];
+}) => {
   const methodName = getNameFromVariable(method);
   const awaitedResponseDataType = generateAwaitedReturnType({
     methodName,
@@ -98,7 +99,20 @@ export const createUseMutation = ({
                 undefined,
                 TError,
                 undefined,
-                ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+                client === "@hey-api/client-axios"
+                  ? ts.factory.createTypeReferenceNode(
+                      ts.factory.createIdentifier("AxiosError"),
+                      [
+                        ts.factory.createTypeReferenceNode(
+                          ts.factory.createIdentifier(
+                            `${capitalizeFirstLetter(methodName)}Error`,
+                          ),
+                        ),
+                      ],
+                    )
+                  : ts.factory.createTypeReferenceNode(
+                      `${capitalizeFirstLetter(methodName)}Error`,
+                    ),
               ),
               ts.factory.createTypeParameterDeclaration(
                 undefined,
diff --git a/src/createUseQuery.mts b/src/createUseQuery.mts
index e2a9bb2..a662183 100644
--- a/src/createUseQuery.mts
+++ b/src/createUseQuery.mts
@@ -1,3 +1,4 @@
+import type { UserConfig } from "@hey-api/openapi-ts";
 import type { VariableDeclaration } from "ts-morph";
 import ts from "typescript";
 import {
@@ -19,8 +20,10 @@ import { addJSDocToNode } from "./util.mjs";
 
 export const createApiResponseType = ({
   methodName,
+  client,
 }: {
   methodName: string;
+  client: UserConfig["client"];
 }) => {
   /** Awaited<ReturnType<typeof myClass.myMethod>> */
   const awaitedResponseDataType = ts.factory.createIndexedAccessTypeNode(
@@ -56,6 +59,26 @@ export const createApiResponseType = ({
     ts.factory.createTypeReferenceNode(BuildCommonTypeName(apiResponse.name)),
   );
 
+  const responseErrorType = ts.factory.createTypeParameterDeclaration(
+    undefined,
+    TError.text,
+    undefined,
+    client === "@hey-api/client-axios"
+      ? ts.factory.createTypeReferenceNode(
+          ts.factory.createIdentifier("AxiosError"),
+          [
+            ts.factory.createTypeReferenceNode(
+              ts.factory.createIdentifier(
+                `${capitalizeFirstLetter(methodName)}Error`,
+              ),
+            ),
+          ],
+        )
+      : ts.factory.createTypeReferenceNode(
+          `${capitalizeFirstLetter(methodName)}Error`,
+        ),
+  );
+
   return {
     /**
      * DefaultResponseDataType
@@ -69,6 +92,12 @@ export const createApiResponseType = ({
      * MyClassMethodDefaultResponse
      */
     responseDataType,
+    /**
+     * ErrorDataType
+     *
+     * MyClassMethodError
+     */
+    responseErrorType,
   };
 };
 
@@ -216,6 +245,7 @@ export function createQueryHook({
   queryString,
   suffix,
   responseDataType,
+  responseErrorType,
   requestParams,
   method,
   pageParam,
@@ -225,6 +255,7 @@ export function createQueryHook({
   queryString: "useSuspenseQuery" | "useQuery" | "useInfiniteQuery";
   suffix: string;
   responseDataType: ts.TypeParameterDeclaration;
+  responseErrorType: ts.TypeParameterDeclaration;
   requestParams: ts.ParameterDeclaration[];
   method: VariableDeclaration;
   pageParam?: string;
@@ -276,12 +307,7 @@ export function createQueryHook({
                     ),
                   )
                 : responseDataType,
-              ts.factory.createTypeParameterDeclaration(
-                undefined,
-                TError,
-                undefined,
-                ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
-              ),
+              responseErrorType,
               ts.factory.createTypeParameterDeclaration(
                 undefined,
                 "TQueryKey",
@@ -495,20 +521,33 @@ export function createQueryHook({
   return hookExport;
 }
 
-export const createUseQuery = (
-  { method, jsDoc }: FunctionDescription,
-  pageParam: string,
-  nextPageParam: string,
-  initialPageParam: string,
-  paginatableMethods: string[],
-  modelNames: string[],
-) => {
+export const createUseQuery = ({
+  functionDescription: { method, jsDoc },
+  client,
+  pageParam,
+  nextPageParam,
+  initialPageParam,
+  paginatableMethods,
+  modelNames,
+}: {
+  functionDescription: FunctionDescription;
+  client: UserConfig["client"];
+  pageParam: string;
+  nextPageParam: string;
+  initialPageParam: string;
+  paginatableMethods: string[];
+  modelNames: string[];
+}) => {
   const methodName = getNameFromVariable(method);
   const queryKey = createQueryKeyFromMethod({ method });
-  const { apiResponse: defaultApiResponse, responseDataType } =
-    createApiResponseType({
-      methodName,
-    });
+  const {
+    apiResponse: defaultApiResponse,
+    responseDataType,
+    responseErrorType,
+  } = createApiResponseType({
+    methodName,
+    client,
+  });
 
   const requestParam = getRequestParamFromMethod(method, undefined, modelNames);
   const infiniteRequestParam = getRequestParamFromMethod(
@@ -523,6 +562,7 @@ export const createUseQuery = (
     queryString: "useQuery",
     suffix: "",
     responseDataType,
+    responseErrorType,
     requestParams,
     method,
   });
@@ -531,6 +571,7 @@ export const createUseQuery = (
     queryString: "useSuspenseQuery",
     suffix: "Suspense",
     responseDataType,
+    responseErrorType,
     requestParams,
     method,
   });
@@ -541,6 +582,7 @@ export const createUseQuery = (
         queryString: "useInfiniteQuery",
         suffix: "Infinite",
         responseDataType,
+        responseErrorType,
         requestParams: infiniteRequestParam ? [infiniteRequestParam] : [],
         method,
         pageParam,
diff --git a/src/generate.mts b/src/generate.mts
index 545ffd2..34a1fbb 100644
--- a/src/generate.mts
+++ b/src/generate.mts
@@ -14,7 +14,6 @@ export async function generate(options: LimitedUserConfig, version: string) {
   const formattedOptions = formatOptions(options);
 
   const config: UserConfig = {
-    base: formattedOptions.base,
     client: formattedOptions.client,
     debug: formattedOptions.debug,
     dryRun: false,
@@ -25,7 +24,6 @@ export async function generate(options: LimitedUserConfig, version: string) {
       path: openApiOutputPath,
     },
     input: formattedOptions.input,
-    request: formattedOptions.request,
     schemas: {
       export: !formattedOptions.noSchemas,
       type: formattedOptions.schemaType,
@@ -34,6 +32,10 @@ export async function generate(options: LimitedUserConfig, version: string) {
       export: true,
       response: formattedOptions.serviceResponse,
       asClass: false,
+      operationId:
+        formattedOptions.operationId !== undefined
+          ? formattedOptions.operationId
+          : true,
     },
     types: {
       dates: formattedOptions.useDateType,
@@ -45,6 +47,7 @@ export async function generate(options: LimitedUserConfig, version: string) {
   await createClient(config);
   const source = await createSource({
     outputPath: openApiOutputPath,
+    client: formattedOptions.client,
     version,
     pageParam: formattedOptions.pageParam,
     nextPageParam: formattedOptions.nextPageParam,
diff --git a/tests/__snapshots__/createSource.test.ts.snap b/tests/__snapshots__/createSource.test.ts.snap
index cbd8243..777074a 100644
--- a/tests/__snapshots__/createSource.test.ts.snap
+++ b/tests/__snapshots__/createSource.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`createSource > createSource 1`] = `
+exports[`createSource > createSource - @hey-api/client-axios 1`] = `
 "// generated with @7nohe/openapi-react-query-codegen@1.0.0 
 
 export * from "./common";
@@ -8,12 +8,13 @@ export * from "./queries";
 "
 `;
 
-exports[`createSource > createSource 2`] = `
+exports[`createSource > createSource - @hey-api/client-axios 2`] = `
 "// generated with @7nohe/openapi-react-query-codegen@1.0.0 
 
 import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
 import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
 import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
+import { AxiosError } from "axios";
 export type FindPetsDefaultResponse = Awaited<ReturnType<typeof findPets>>["data"];
 export type FindPetsQueryResult<TData = FindPetsDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
 export const useFindPetsKey = "FindPets";
@@ -36,38 +37,122 @@ export type DeletePetMutationResult = Awaited<ReturnType<typeof deletePet>>;
 "
 `;
 
-exports[`createSource > createSource 3`] = `
+exports[`createSource > createSource - @hey-api/client-axios 3`] = `
 "// generated with @7nohe/openapi-react-query-codegen@1.0.0 
 
 import * as Common from "./common";
 import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
 import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
 import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
-export const useFindPets = <TData = Common.FindPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPetById = <TData = Common.FindPetByIdDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPaginatedPets = <TData = Common.FindPaginatedPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useAddPet = <TData = Common.AddPetMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<AddPetData, true>, TContext>({ mutationFn: clientOptions => addPet(clientOptions) as unknown as Promise<TData>, ...options });
-export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<unknown, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<unknown, true>, TContext>({ mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
-export const useDeletePet = <TData = Common.DeletePetMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<DeletePetData, true>, TContext>({ mutationFn: clientOptions => deletePet(clientOptions) as unknown as Promise<TData>, ...options });
+import { AxiosError } from "axios";
+export const useFindPets = <TData = Common.FindPetsDefaultResponse, TError = AxiosError<FindPetsError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = AxiosError<GetNotDefinedError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPetById = <TData = Common.FindPetByIdDefaultResponse, TError = AxiosError<FindPetByIdError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPaginatedPets = <TData = Common.FindPaginatedPetsDefaultResponse, TError = AxiosError<FindPaginatedPetsError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useAddPet = <TData = Common.AddPetMutationResult, TError = AxiosError<AddPetError>, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<AddPetData, true>, TContext>({ mutationFn: clientOptions => addPet(clientOptions) as unknown as Promise<TData>, ...options });
+export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = AxiosError<PostNotDefinedError>, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<unknown, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<unknown, true>, TContext>({ mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
+export const useDeletePet = <TData = Common.DeletePetMutationResult, TError = AxiosError<DeletePetError>, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<DeletePetData, true>, TContext>({ mutationFn: clientOptions => deletePet(clientOptions) as unknown as Promise<TData>, ...options });
 "
 `;
 
-exports[`createSource > createSource 4`] = `
+exports[`createSource > createSource - @hey-api/client-axios 4`] = `
 "// generated with @7nohe/openapi-react-query-codegen@1.0.0 
 
 import * as Common from "./common";
 import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
 import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
 import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
-export const useFindPetsSuspense = <TData = Common.FindPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useGetNotDefinedSuspense = <TData = Common.GetNotDefinedDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPetByIdSuspense = <TData = Common.FindPetByIdDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPaginatedPetsSuspense = <TData = Common.FindPaginatedPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+import { AxiosError } from "axios";
+export const useFindPetsSuspense = <TData = Common.FindPetsDefaultResponse, TError = AxiosError<FindPetsError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useGetNotDefinedSuspense = <TData = Common.GetNotDefinedDefaultResponse, TError = AxiosError<GetNotDefinedError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPetByIdSuspense = <TData = Common.FindPetByIdDefaultResponse, TError = AxiosError<FindPetByIdError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPaginatedPetsSuspense = <TData = Common.FindPaginatedPetsDefaultResponse, TError = AxiosError<FindPaginatedPetsError>, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
 "
 `;
 
-exports[`createSource > createSource 5`] = `
+exports[`createSource > createSource - @hey-api/client-axios 5`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import * as Common from "./common";
+import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
+import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
+import { AxiosError } from "axios";
+export const prefetchUseFindPets = (queryClient: QueryClient, clientOptions: Options<FindPetsData, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseFindPetsKeyFn(clientOptions), queryFn: () => findPets({ ...clientOptions }).then(response => response.data) });
+export const prefetchUseGetNotDefined = (queryClient: QueryClient, clientOptions: Options<unknown, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data) });
+export const prefetchUseFindPetById = (queryClient: QueryClient, clientOptions: Options<FindPetByIdData, true>) => queryClient.prefetchQuery({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data) });
+export const prefetchUseFindPaginatedPets = (queryClient: QueryClient, clientOptions: Options<FindPaginatedPetsData, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data) });
+"
+`;
+
+exports[`createSource > createSource - @hey-api/client-fetch 1`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+export * from "./common";
+export * from "./queries";
+"
+`;
+
+exports[`createSource > createSource - @hey-api/client-fetch 2`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
+import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
+export type FindPetsDefaultResponse = Awaited<ReturnType<typeof findPets>>["data"];
+export type FindPetsQueryResult<TData = FindPetsDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const useFindPetsKey = "FindPets";
+export const UseFindPetsKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useFindPetsKey, ...(queryKey ?? [clientOptions])];
+export type GetNotDefinedDefaultResponse = Awaited<ReturnType<typeof getNotDefined>>["data"];
+export type GetNotDefinedQueryResult<TData = GetNotDefinedDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const useGetNotDefinedKey = "GetNotDefined";
+export const UseGetNotDefinedKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useGetNotDefinedKey, ...(queryKey ?? [clientOptions])];
+export type FindPetByIdDefaultResponse = Awaited<ReturnType<typeof findPetById>>["data"];
+export type FindPetByIdQueryResult<TData = FindPetByIdDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const useFindPetByIdKey = "FindPetById";
+export const UseFindPetByIdKeyFn = (clientOptions: Options<unknown, true>, queryKey?: Array<unknown>) => [useFindPetByIdKey, ...(queryKey ?? [clientOptions])];
+export type FindPaginatedPetsDefaultResponse = Awaited<ReturnType<typeof findPaginatedPets>>["data"];
+export type FindPaginatedPetsQueryResult<TData = FindPaginatedPetsDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const useFindPaginatedPetsKey = "FindPaginatedPets";
+export const UseFindPaginatedPetsKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useFindPaginatedPetsKey, ...(queryKey ?? [clientOptions])];
+export type AddPetMutationResult = Awaited<ReturnType<typeof addPet>>;
+export type PostNotDefinedMutationResult = Awaited<ReturnType<typeof postNotDefined>>;
+export type DeletePetMutationResult = Awaited<ReturnType<typeof deletePet>>;
+"
+`;
+
+exports[`createSource > createSource - @hey-api/client-fetch 3`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import * as Common from "./common";
+import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
+import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
+export const useFindPets = <TData = Common.FindPetsDefaultResponse, TError = FindPetsError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = GetNotDefinedError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPetById = <TData = Common.FindPetByIdDefaultResponse, TError = FindPetByIdError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPaginatedPets = <TData = Common.FindPaginatedPetsDefaultResponse, TError = FindPaginatedPetsError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useAddPet = <TData = Common.AddPetMutationResult, TError = AddPetError, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<AddPetData, true>, TContext>({ mutationFn: clientOptions => addPet(clientOptions) as unknown as Promise<TData>, ...options });
+export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = PostNotDefinedError, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<unknown, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<unknown, true>, TContext>({ mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
+export const useDeletePet = <TData = Common.DeletePetMutationResult, TError = DeletePetError, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<DeletePetData, true>, TContext>({ mutationFn: clientOptions => deletePet(clientOptions) as unknown as Promise<TData>, ...options });
+"
+`;
+
+exports[`createSource > createSource - @hey-api/client-fetch 4`] = `
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+
+import * as Common from "./common";
+import { type QueryClient, useQuery, useSuspenseQuery, useMutation, UseQueryResult, UseQueryOptions, UseMutationOptions, UseMutationResult } from "@tanstack/react-query";
+import { client, findPets, addPet, getNotDefined, postNotDefined, findPetById, deletePet, findPaginatedPets } from "../requests/services.gen";
+import { Pet, NewPet, Error, FindPetsData, FindPetsResponse, FindPetsError, AddPetData, AddPetResponse, AddPetError, GetNotDefinedResponse, GetNotDefinedError, PostNotDefinedResponse, PostNotDefinedError, FindPetByIdData, FindPetByIdResponse, FindPetByIdError, DeletePetData, DeletePetResponse, DeletePetError, FindPaginatedPetsData, FindPaginatedPetsResponse, FindPaginatedPetsError } from "../requests/types.gen";
+export const useFindPetsSuspense = <TData = Common.FindPetsDefaultResponse, TError = FindPetsError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useGetNotDefinedSuspense = <TData = Common.GetNotDefinedDefaultResponse, TError = GetNotDefinedError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPetByIdSuspense = <TData = Common.FindPetByIdDefaultResponse, TError = FindPetByIdError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPaginatedPetsSuspense = <TData = Common.FindPaginatedPetsDefaultResponse, TError = FindPaginatedPetsError, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+"
+`;
+
+exports[`createSource > createSource - @hey-api/client-fetch 5`] = `
 "// generated with @7nohe/openapi-react-query-codegen@1.0.0 
 
 import * as Common from "./common";
diff --git a/tests/__snapshots__/generate.test.ts.snap b/tests/__snapshots__/generate.test.ts.snap
index 923d6fe..7ba9dde 100644
--- a/tests/__snapshots__/generate.test.ts.snap
+++ b/tests/__snapshots__/generate.test.ts.snap
@@ -1,50 +1,133 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`generate > common.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
-import { UseQueryResult } from "@tanstack/react-query";
-import { addPet, deletePet, findPaginatedPets, findPetById, findPets, getNotDefined, postNotDefined } from "../requests/services.gen";
-export type FindPetsDefaultResponse = Awaited<ReturnType<typeof findPets>>["data"];
-export type FindPetsQueryResult<TData = FindPetsDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+import type { Options } from "@hey-api/client-fetch";
+import type { UseQueryResult } from "@tanstack/react-query";
+import type {
+  addPet,
+  deletePet,
+  findPaginatedPets,
+  findPetById,
+  findPets,
+  getNotDefined,
+  postNotDefined,
+} from "../requests/services.gen";
+export type FindPetsDefaultResponse = Awaited<
+  ReturnType<typeof findPets>
+>["data"];
+export type FindPetsQueryResult<
+  TData = FindPetsDefaultResponse,
+  TError = unknown,
+> = UseQueryResult<TData, TError>;
 export const useFindPetsKey = "FindPets";
-export const UseFindPetsKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useFindPetsKey, ...(queryKey ?? [clientOptions])];
-export type GetNotDefinedDefaultResponse = Awaited<ReturnType<typeof getNotDefined>>["data"];
-export type GetNotDefinedQueryResult<TData = GetNotDefinedDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const UseFindPetsKeyFn = (
+  clientOptions: Options<unknown, true> = {},
+  queryKey?: Array<unknown>,
+) => [useFindPetsKey, ...(queryKey ?? [clientOptions])];
+export type GetNotDefinedDefaultResponse = Awaited<
+  ReturnType<typeof getNotDefined>
+>["data"];
+export type GetNotDefinedQueryResult<
+  TData = GetNotDefinedDefaultResponse,
+  TError = unknown,
+> = UseQueryResult<TData, TError>;
 export const useGetNotDefinedKey = "GetNotDefined";
-export const UseGetNotDefinedKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useGetNotDefinedKey, ...(queryKey ?? [clientOptions])];
-export type FindPetByIdDefaultResponse = Awaited<ReturnType<typeof findPetById>>["data"];
-export type FindPetByIdQueryResult<TData = FindPetByIdDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const UseGetNotDefinedKeyFn = (
+  clientOptions: Options<unknown, true> = {},
+  queryKey?: Array<unknown>,
+) => [useGetNotDefinedKey, ...(queryKey ?? [clientOptions])];
+export type FindPetByIdDefaultResponse = Awaited<
+  ReturnType<typeof findPetById>
+>["data"];
+export type FindPetByIdQueryResult<
+  TData = FindPetByIdDefaultResponse,
+  TError = unknown,
+> = UseQueryResult<TData, TError>;
 export const useFindPetByIdKey = "FindPetById";
-export const UseFindPetByIdKeyFn = (clientOptions: Options<unknown, true>, queryKey?: Array<unknown>) => [useFindPetByIdKey, ...(queryKey ?? [clientOptions])];
-export type FindPaginatedPetsDefaultResponse = Awaited<ReturnType<typeof findPaginatedPets>>["data"];
-export type FindPaginatedPetsQueryResult<TData = FindPaginatedPetsDefaultResponse, TError = unknown> = UseQueryResult<TData, TError>;
+export const UseFindPetByIdKeyFn = (
+  clientOptions: Options<unknown, true>,
+  queryKey?: Array<unknown>,
+) => [useFindPetByIdKey, ...(queryKey ?? [clientOptions])];
+export type FindPaginatedPetsDefaultResponse = Awaited<
+  ReturnType<typeof findPaginatedPets>
+>["data"];
+export type FindPaginatedPetsQueryResult<
+  TData = FindPaginatedPetsDefaultResponse,
+  TError = unknown,
+> = UseQueryResult<TData, TError>;
 export const useFindPaginatedPetsKey = "FindPaginatedPets";
-export const UseFindPaginatedPetsKeyFn = (clientOptions: Options<unknown, true> = {}, queryKey?: Array<unknown>) => [useFindPaginatedPetsKey, ...(queryKey ?? [clientOptions])];
+export const UseFindPaginatedPetsKeyFn = (
+  clientOptions: Options<unknown, true> = {},
+  queryKey?: Array<unknown>,
+) => [useFindPaginatedPetsKey, ...(queryKey ?? [clientOptions])];
 export type AddPetMutationResult = Awaited<ReturnType<typeof addPet>>;
-export type PostNotDefinedMutationResult = Awaited<ReturnType<typeof postNotDefined>>;
+export type PostNotDefinedMutationResult = Awaited<
+  ReturnType<typeof postNotDefined>
+>;
 export type DeletePetMutationResult = Awaited<ReturnType<typeof deletePet>>;
 "
 `;
 
 exports[`generate > ensureQueryData.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
-import { type QueryClient } from "@tanstack/react-query";
-import { findPaginatedPets, findPetById, findPets, getNotDefined } from "../requests/services.gen";
-import { FindPaginatedPetsData, FindPetByIdData, FindPetsData } from "../requests/types.gen";
+import type { Options } from "@hey-api/client-fetch";
+import type { QueryClient } from "@tanstack/react-query";
+import {
+  findPaginatedPets,
+  findPetById,
+  findPets,
+  getNotDefined,
+} from "../requests/services.gen";
+import type {
+  FindPaginatedPetsData,
+  FindPetByIdData,
+  FindPetsData,
+} from "../requests/types.gen";
 import * as Common from "./common";
-export const ensureUseFindPetsData = (queryClient: QueryClient, clientOptions: Options<FindPetsData, true> = {}) => queryClient.ensureQueryData({ queryKey: Common.UseFindPetsKeyFn(clientOptions), queryFn: () => findPets({ ...clientOptions }).then(response => response.data) });
-export const ensureUseGetNotDefinedData = (queryClient: QueryClient, clientOptions: Options<unknown, true> = {}) => queryClient.ensureQueryData({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data) });
-export const ensureUseFindPetByIdData = (queryClient: QueryClient, clientOptions: Options<FindPetByIdData, true>) => queryClient.ensureQueryData({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data) });
-export const ensureUseFindPaginatedPetsData = (queryClient: QueryClient, clientOptions: Options<FindPaginatedPetsData, true> = {}) => queryClient.ensureQueryData({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data) });
+export const ensureUseFindPetsData = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPetsData, true> = {},
+) =>
+  queryClient.ensureQueryData({
+    queryKey: Common.UseFindPetsKeyFn(clientOptions),
+    queryFn: () =>
+      findPets({ ...clientOptions }).then((response) => response.data),
+  });
+export const ensureUseGetNotDefinedData = (
+  queryClient: QueryClient,
+  clientOptions: Options<unknown, true> = {},
+) =>
+  queryClient.ensureQueryData({
+    queryKey: Common.UseGetNotDefinedKeyFn(clientOptions),
+    queryFn: () =>
+      getNotDefined({ ...clientOptions }).then((response) => response.data),
+  });
+export const ensureUseFindPetByIdData = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPetByIdData, true>,
+) =>
+  queryClient.ensureQueryData({
+    queryKey: Common.UseFindPetByIdKeyFn(clientOptions),
+    queryFn: () =>
+      findPetById({ ...clientOptions }).then((response) => response.data),
+  });
+export const ensureUseFindPaginatedPetsData = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPaginatedPetsData, true> = {},
+) =>
+  queryClient.ensureQueryData({
+    queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions),
+    queryFn: () =>
+      findPaginatedPets({ ...clientOptions }).then((response) => response.data),
+  });
 "
 `;
 
 exports[`generate > index.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
 export * from "./common";
 export * from "./queries";
@@ -52,66 +135,342 @@ export * from "./queries";
 `;
 
 exports[`generate > infiniteQueries.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
+import type { Options } from "@hey-api/client-fetch";
 import { findPaginatedPets } from "../requests/services.gen";
-import { FindPaginatedPetsData } from "../requests/types.gen";
+import type {
+  FindPaginatedPetsData,
+  FindPaginatedPetsError,
+} from "../requests/types.gen";
 import * as Common from "./common";
-export const useFindPaginatedPetsInfinite = <TData = InfiniteData<Common.FindPaginatedPetsDefaultResponse>, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseInfiniteQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useInfiniteQuery({
-  queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: ({ pageParam }) => findPaginatedPets({ ...clientOptions, query: { ...clientOptions.query, page: pageParam as number } }).then(response => response.data as TData) as TData, initialPageParam: "initial", getNextPageParam: response => (response as {
-    meta: {
-      next: number;
-    };
-  }).meta.next, ...options
-});
+export const useFindPaginatedPetsInfinite = <
+  TData = InfiniteData<Common.FindPaginatedPetsDefaultResponse>,
+  TError = FindPaginatedPetsError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPaginatedPetsData, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<
+    UseInfiniteQueryOptions<TData, TError>,
+    "queryKey" | "queryFn"
+  >,
+) =>
+  useInfiniteQuery({
+    queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey),
+    queryFn: ({ pageParam }) =>
+      findPaginatedPets({
+        ...clientOptions,
+        query: { ...clientOptions.query, page: pageParam as number },
+      }).then((response) => response.data as TData) as TData,
+    initialPageParam: "initial",
+    getNextPageParam: (response) =>
+      (
+        response as {
+          meta: {
+            next: number;
+          };
+        }
+      ).meta.next,
+    ...options,
+  });
 "
 `;
 
 exports[`generate > prefetch.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
-import { type QueryClient } from "@tanstack/react-query";
-import { findPaginatedPets, findPetById, findPets, getNotDefined } from "../requests/services.gen";
-import { FindPaginatedPetsData, FindPetByIdData, FindPetsData } from "../requests/types.gen";
+import type { Options } from "@hey-api/client-fetch";
+import type { QueryClient } from "@tanstack/react-query";
+import {
+  findPaginatedPets,
+  findPetById,
+  findPets,
+  getNotDefined,
+} from "../requests/services.gen";
+import type {
+  FindPaginatedPetsData,
+  FindPetByIdData,
+  FindPetsData,
+} from "../requests/types.gen";
 import * as Common from "./common";
-export const prefetchUseFindPets = (queryClient: QueryClient, clientOptions: Options<FindPetsData, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseFindPetsKeyFn(clientOptions), queryFn: () => findPets({ ...clientOptions }).then(response => response.data) });
-export const prefetchUseGetNotDefined = (queryClient: QueryClient, clientOptions: Options<unknown, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data) });
-export const prefetchUseFindPetById = (queryClient: QueryClient, clientOptions: Options<FindPetByIdData, true>) => queryClient.prefetchQuery({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data) });
-export const prefetchUseFindPaginatedPets = (queryClient: QueryClient, clientOptions: Options<FindPaginatedPetsData, true> = {}) => queryClient.prefetchQuery({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data) });
+export const prefetchUseFindPets = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPetsData, true> = {},
+) =>
+  queryClient.prefetchQuery({
+    queryKey: Common.UseFindPetsKeyFn(clientOptions),
+    queryFn: () =>
+      findPets({ ...clientOptions }).then((response) => response.data),
+  });
+export const prefetchUseGetNotDefined = (
+  queryClient: QueryClient,
+  clientOptions: Options<unknown, true> = {},
+) =>
+  queryClient.prefetchQuery({
+    queryKey: Common.UseGetNotDefinedKeyFn(clientOptions),
+    queryFn: () =>
+      getNotDefined({ ...clientOptions }).then((response) => response.data),
+  });
+export const prefetchUseFindPetById = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPetByIdData, true>,
+) =>
+  queryClient.prefetchQuery({
+    queryKey: Common.UseFindPetByIdKeyFn(clientOptions),
+    queryFn: () =>
+      findPetById({ ...clientOptions }).then((response) => response.data),
+  });
+export const prefetchUseFindPaginatedPets = (
+  queryClient: QueryClient,
+  clientOptions: Options<FindPaginatedPetsData, true> = {},
+) =>
+  queryClient.prefetchQuery({
+    queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions),
+    queryFn: () =>
+      findPaginatedPets({ ...clientOptions }).then((response) => response.data),
+  });
 "
 `;
 
 exports[`generate > queries.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
-import { useMutation, UseMutationOptions, useQuery, UseQueryOptions } from "@tanstack/react-query";
-import { addPet, deletePet, findPaginatedPets, findPetById, findPets, getNotDefined, postNotDefined } from "../requests/services.gen";
-import { AddPetData, DeletePetData, FindPaginatedPetsData, FindPetByIdData, FindPetsData } from "../requests/types.gen";
+import type { Options } from "@hey-api/client-fetch";
+import {
+  useMutation,
+  type UseMutationOptions,
+  useQuery,
+  type UseQueryOptions,
+} from "@tanstack/react-query";
+import {
+  addPet,
+  deletePet,
+  findPaginatedPets,
+  findPetById,
+  findPets,
+  getNotDefined,
+  postNotDefined,
+} from "../requests/services.gen";
+import type {
+  AddPetData,
+  AddPetError,
+  DeletePetData,
+  DeletePetError,
+  FindPaginatedPetsData,
+  FindPaginatedPetsError,
+  FindPetByIdData,
+  FindPetByIdError,
+  FindPetsData,
+  FindPetsError,
+  GetNotDefinedError,
+  PostNotDefinedError,
+} from "../requests/types.gen";
 import * as Common from "./common";
-export const useFindPets = <TData = Common.FindPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useGetNotDefined = <TData = Common.GetNotDefinedDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPetById = <TData = Common.FindPetByIdDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPaginatedPets = <TData = Common.FindPaginatedPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useAddPet = <TData = Common.AddPetMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<AddPetData, true>, TContext>({ mutationFn: clientOptions => addPet(clientOptions) as unknown as Promise<TData>, ...options });
-export const usePostNotDefined = <TData = Common.PostNotDefinedMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<unknown, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<unknown, true>, TContext>({ mutationFn: clientOptions => postNotDefined(clientOptions) as unknown as Promise<TData>, ...options });
-export const useDeletePet = <TData = Common.DeletePetMutationResult, TError = unknown, TContext = unknown>(options?: Omit<UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>, "mutationFn">) => useMutation<TData, TError, Options<DeletePetData, true>, TContext>({ mutationFn: clientOptions => deletePet(clientOptions) as unknown as Promise<TData>, ...options });
+export const useFindPets = <
+  TData = Common.FindPetsDefaultResponse,
+  TError = FindPetsError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPetsData, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useQuery<TData, TError>({
+    queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPets({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useGetNotDefined = <
+  TData = Common.GetNotDefinedDefaultResponse,
+  TError = GetNotDefinedError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<unknown, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useQuery<TData, TError>({
+    queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      getNotDefined({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useFindPetById = <
+  TData = Common.FindPetByIdDefaultResponse,
+  TError = FindPetByIdError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPetByIdData, true>,
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useQuery<TData, TError>({
+    queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPetById({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useFindPaginatedPets = <
+  TData = Common.FindPaginatedPetsDefaultResponse,
+  TError = FindPaginatedPetsError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPaginatedPetsData, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useQuery<TData, TError>({
+    queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPaginatedPets({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useAddPet = <
+  TData = Common.AddPetMutationResult,
+  TError = AddPetError,
+  TContext = unknown,
+>(
+  options?: Omit<
+    UseMutationOptions<TData, TError, Options<AddPetData, true>, TContext>,
+    "mutationFn"
+  >,
+) =>
+  useMutation<TData, TError, Options<AddPetData, true>, TContext>({
+    mutationFn: (clientOptions) =>
+      addPet(clientOptions) as unknown as Promise<TData>,
+    ...options,
+  });
+export const usePostNotDefined = <
+  TData = Common.PostNotDefinedMutationResult,
+  TError = PostNotDefinedError,
+  TContext = unknown,
+>(
+  options?: Omit<
+    UseMutationOptions<TData, TError, Options<unknown, true>, TContext>,
+    "mutationFn"
+  >,
+) =>
+  useMutation<TData, TError, Options<unknown, true>, TContext>({
+    mutationFn: (clientOptions) =>
+      postNotDefined(clientOptions) as unknown as Promise<TData>,
+    ...options,
+  });
+export const useDeletePet = <
+  TData = Common.DeletePetMutationResult,
+  TError = DeletePetError,
+  TContext = unknown,
+>(
+  options?: Omit<
+    UseMutationOptions<TData, TError, Options<DeletePetData, true>, TContext>,
+    "mutationFn"
+  >,
+) =>
+  useMutation<TData, TError, Options<DeletePetData, true>, TContext>({
+    mutationFn: (clientOptions) =>
+      deletePet(clientOptions) as unknown as Promise<TData>,
+    ...options,
+  });
 "
 `;
 
 exports[`generate > suspense.ts 1`] = `
-"// generated with @7nohe/openapi-react-query-codegen@1.0.0 
+"// generated with @7nohe/openapi-react-query-codegen@1.0.0
 
-import { Options } from "@hey-api/client-fetch";
-import { UseQueryOptions, useSuspenseQuery } from "@tanstack/react-query";
-import { findPaginatedPets, findPetById, findPets, getNotDefined } from "../requests/services.gen";
-import { FindPaginatedPetsData, FindPetByIdData, FindPetsData } from "../requests/types.gen";
+import type { Options } from "@hey-api/client-fetch";
+import { type UseQueryOptions, useSuspenseQuery } from "@tanstack/react-query";
+import {
+  findPaginatedPets,
+  findPetById,
+  findPets,
+  getNotDefined,
+} from "../requests/services.gen";
+import type {
+  FindPaginatedPetsData,
+  FindPaginatedPetsError,
+  FindPetByIdData,
+  FindPetByIdError,
+  FindPetsData,
+  FindPetsError,
+  GetNotDefinedError,
+} from "../requests/types.gen";
 import * as Common from "./common";
-export const useFindPetsSuspense = <TData = Common.FindPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey), queryFn: () => findPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useGetNotDefinedSuspense = <TData = Common.GetNotDefinedDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<unknown, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey), queryFn: () => getNotDefined({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPetByIdSuspense = <TData = Common.FindPetByIdDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPetByIdData, true>, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey), queryFn: () => findPetById({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
-export const useFindPaginatedPetsSuspense = <TData = Common.FindPaginatedPetsDefaultResponse, TError = unknown, TQueryKey extends Array<unknown> = unknown[]>(clientOptions: Options<FindPaginatedPetsData, true> = {}, queryKey?: TQueryKey, options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">) => useSuspenseQuery<TData, TError>({ queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey), queryFn: () => findPaginatedPets({ ...clientOptions }).then(response => response.data as TData) as TData, ...options });
+export const useFindPetsSuspense = <
+  TData = Common.FindPetsDefaultResponse,
+  TError = FindPetsError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPetsData, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useSuspenseQuery<TData, TError>({
+    queryKey: Common.UseFindPetsKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPets({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useGetNotDefinedSuspense = <
+  TData = Common.GetNotDefinedDefaultResponse,
+  TError = GetNotDefinedError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<unknown, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useSuspenseQuery<TData, TError>({
+    queryKey: Common.UseGetNotDefinedKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      getNotDefined({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useFindPetByIdSuspense = <
+  TData = Common.FindPetByIdDefaultResponse,
+  TError = FindPetByIdError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPetByIdData, true>,
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useSuspenseQuery<TData, TError>({
+    queryKey: Common.UseFindPetByIdKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPetById({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
+export const useFindPaginatedPetsSuspense = <
+  TData = Common.FindPaginatedPetsDefaultResponse,
+  TError = FindPaginatedPetsError,
+  TQueryKey extends Array<unknown> = unknown[],
+>(
+  clientOptions: Options<FindPaginatedPetsData, true> = {},
+  queryKey?: TQueryKey,
+  options?: Omit<UseQueryOptions<TData, TError>, "queryKey" | "queryFn">,
+) =>
+  useSuspenseQuery<TData, TError>({
+    queryKey: Common.UseFindPaginatedPetsKeyFn(clientOptions, queryKey),
+    queryFn: () =>
+      findPaginatedPets({ ...clientOptions }).then(
+        (response) => response.data as TData,
+      ) as TData,
+    ...options,
+  });
 "
 `;
diff --git a/tests/createExports.test.ts b/tests/createExports.test.ts
index a000bf5..f0cfcd0 100644
--- a/tests/createExports.test.ts
+++ b/tests/createExports.test.ts
@@ -17,7 +17,14 @@ describe(fileName, () => {
     });
     project.addSourceFilesAtPaths(path.join(outputPath(fileName), "**", "*"));
     const service = await getServices(project);
-    const exports = createExports(service, "page", "nextPage", "initial");
+    const exports = createExports({
+      service,
+      project,
+      pageParam: "page",
+      nextPageParam: "nextPage",
+      initialPageParam: "initial",
+      client: "@hey-api/client-fetch",
+    });
 
     const commonTypes = exports.allCommon
       .filter((c) => c.kind === SyntaxKind.TypeAliasDeclaration)
diff --git a/tests/createSource.test.ts b/tests/createSource.test.ts
index 55eec67..ef37401 100644
--- a/tests/createSource.test.ts
+++ b/tests/createSource.test.ts
@@ -6,13 +6,40 @@ describe(fileName, () => {
   beforeAll(async () => await generateTSClients(fileName));
   afterAll(async () => await cleanOutputs(fileName));
 
-  test("createSource", async () => {
+  test("createSource - @hey-api/client-fetch", async () => {
     const source = await createSource({
       outputPath: outputPath(fileName),
       version: "1.0.0",
       pageParam: "page",
       nextPageParam: "nextPage",
       initialPageParam: "1",
+      client: "@hey-api/client-fetch",
+    });
+
+    const indexTs = source.find((s) => s.name === "index.ts");
+    expect(indexTs?.content).toMatchSnapshot();
+
+    const commonTs = source.find((s) => s.name === "common.ts");
+    expect(commonTs?.content).toMatchSnapshot();
+
+    const queriesTs = source.find((s) => s.name === "queries.ts");
+    expect(queriesTs?.content).toMatchSnapshot();
+
+    const suspenseTs = source.find((s) => s.name === "suspense.ts");
+    expect(suspenseTs?.content).toMatchSnapshot();
+
+    const prefetchTs = source.find((s) => s.name === "prefetch.ts");
+    expect(prefetchTs?.content).toMatchSnapshot();
+  });
+
+  test("createSource - @hey-api/client-axios", async () => {
+    const source = await createSource({
+      outputPath: outputPath(fileName),
+      version: "1.0.0",
+      pageParam: "page",
+      nextPageParam: "nextPage",
+      initialPageParam: "1",
+      client: "@hey-api/client-axios",
     });
 
     const indexTs = source.find((s) => s.name === "index.ts");
diff --git a/tests/generate.test.ts b/tests/generate.test.ts
index 7e028e8..d4ece8c 100644
--- a/tests/generate.test.ts
+++ b/tests/generate.test.ts
@@ -18,10 +18,12 @@ describe("generate", () => {
       input: path.join(__dirname, "inputs", "petstore.yaml"),
       output: path.join("tests", "outputs"),
       client: "@hey-api/client-fetch",
-      lint: "eslint",
+      lint: "biome",
+      format: "biome",
       pageParam: "page",
       nextPageParam: "meta.next",
       initialPageParam: "initial",
+      operationId: true,
     };
     await generate(options, "1.0.0");
   });
diff --git a/vitest.config.ts b/vitest.config.ts
index b06deae..77a1e7e 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -8,9 +8,9 @@ export default defineConfig({
       reportOnFailure: true,
       thresholds: {
         lines: 95,
-        functions: 90,
+        functions: 95,
         statements: 95,
-        branches: 85,
+        branches: 90,
       },
     },
   },