diff --git a/README.md b/README.md
index 8aa3e43..3d2720e 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,23 @@
 $ npm install -D @7nohe/openapi-react-query-codegen
 ```
 
+ Register the command to the `scripts` property in your package.json file.
+
+```json
+{
+  "scripts": {
+    "codegen": "openapi-rq -i ./petstore.yaml -c axios"
+  }
+}
+```
+
+You can also run the command without installing it in your project using the npx command.
+
+```bash
+$ npx --package @7nohe/openapi-react-query-codegen openapi-rq -i ./petstore.yaml -c axios
+```
+
+
 ## Usage
 
 ```
diff --git a/examples/react-app/package.json b/examples/react-app/package.json
index ae7e861..89f9b6a 100644
--- a/examples/react-app/package.json
+++ b/examples/react-app/package.json
@@ -13,19 +13,19 @@
     "test:generated": "tsc ./openapi/queries/index.ts --noEmit --target esnext --moduleResolution node"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.0.0",
-    "axios": "^1.4.0",
+    "@tanstack/react-query": "^5.4.3",
+    "axios": "^1.6.0",
     "form-data": "~4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@stoplight/prism-cli": "^5.0.0",
+    "@stoplight/prism-cli": "^5.5.1",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
-    "@vitejs/plugin-react": "^4.0.0",
+    "@vitejs/plugin-react": "^4.1.0",
     "npm-run-all": "^4.1.5",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.8"
+    "typescript": "^5.2.2",
+    "vite": "^4.5.0"
   }
 }
\ No newline at end of file
diff --git a/examples/react-app/src/App.tsx b/examples/react-app/src/App.tsx
index 207c618..220db20 100644
--- a/examples/react-app/src/App.tsx
+++ b/examples/react-app/src/App.tsx
@@ -4,34 +4,33 @@ import {
   useDefaultClientFindPets,
   useDefaultClientFindPetsKey,
 } from "../openapi/queries";
-import { useState } from 'react';
-import { queryClient } from './queryClient';
+import { useState } from "react";
+import { queryClient } from "./queryClient";
 
 function App() {
-
   const [tags, _setTags] = useState<string[]>([]);
   const [limit, _setLimit] = useState<number>(10);
 
-  const { data, error, refetch } = useDefaultClientFindPets(
-    { tags, limit },
-  );
+  const { data, error, refetch } = useDefaultClientFindPets({ tags, limit });
 
   const { mutate: addPet } = useDefaultClientAddPet();
 
-  if (error) return (
-  <div>
-    <p>Failed to fetch pets</p>
-    <button onClick={() => refetch()}>Retry</button>
-  </div>
-  );
+  if (error)
+    return (
+      <div>
+        <p>Failed to fetch pets</p>
+        <button onClick={() => refetch()}>Retry</button>
+      </div>
+    );
 
   return (
     <div className="App">
       <h1>Pet List</h1>
       <ul>
-        {data instanceof Array && data?.map((pet, index) => (
-          <li key={pet.id + "-" + index}>{pet.name}</li>
-        ))}
+        {data instanceof Array &&
+          data?.map((pet, index) => (
+            <li key={pet.id + "-" + index}>{pet.name}</li>
+          ))}
       </ul>
       <button
         onClick={() => {
@@ -44,8 +43,7 @@ function App() {
                 queryClient.invalidateQueries({
                   queryKey: [useDefaultClientFindPetsKey],
                 });
-                console.log("success")
-
+                console.log("success");
               },
               onError: (error) => console.error(error),
             }
diff --git a/package.json b/package.json
index e6ade94..66dba96 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "commander": "^11.1.0",
     "glob": "^10.2.5",
     "openapi-typescript-codegen": "^0.25.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "commander": ">= 11 < 12",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 382c95c..eaac424 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ importers:
         specifier: ^0.25.0
         version: 0.25.0
       typescript:
-        specifier: ^5.0.4
+        specifier: ^5.2.2
         version: 5.2.2
 
   dist:
@@ -39,17 +39,17 @@ importers:
         specifier: ^0.25.0
         version: 0.25.0
       typescript:
-        specifier: ^5.0.4
+        specifier: ^5.2.2
         version: 5.2.2
 
   examples/react-app:
     dependencies:
       '@tanstack/react-query':
-        specifier: ^5.0.0
-        version: 5.0.0(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^5.4.3
+        version: 5.4.3(react-dom@18.2.0)(react@18.2.0)
       axios:
-        specifier: ^1.4.0
-        version: 1.5.1
+        specifier: ^1.6.0
+        version: 1.6.0
       form-data:
         specifier: ~4.0.0
         version: 4.0.0
@@ -61,8 +61,8 @@ importers:
         version: 18.2.0(react@18.2.0)
     devDependencies:
       '@stoplight/prism-cli':
-        specifier: ^5.0.0
-        version: 5.4.0
+        specifier: ^5.5.1
+        version: 5.5.1
       '@types/react':
         specifier: ^18.2.6
         version: 18.2.29
@@ -70,16 +70,16 @@ importers:
         specifier: ^18.2.4
         version: 18.2.13
       '@vitejs/plugin-react':
-        specifier: ^4.0.0
+        specifier: ^4.1.0
         version: 4.1.0(vite@4.5.0)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
       typescript:
-        specifier: ^5.0.4
+        specifier: ^5.2.2
         version: 5.2.2
       vite:
-        specifier: ^4.3.8
+        specifier: ^4.5.0
         version: 4.5.0(@types/node@18.18.6)
 
 packages:
@@ -577,13 +577,13 @@ packages:
     dev: true
     optional: true
 
-  /@stoplight/http-spec@5.13.0:
-    resolution: {integrity: sha512-zVUEviT2U0dBMzLOb1aPp41ef6eOUZ+CncVvPME3UX0lcYUhHw/Om3IceKa/KGGFVXWppb7dGKe1dr8Aw1LWEg==}
+  /@stoplight/http-spec@6.0.2:
+    resolution: {integrity: sha512-6uQxW0ycJF3cUSthsv7u3EClGn6AgqkLW9Q0dlrxOYJ1iH5Rx6SJEGYtmnkbTc/iXX/LygyoQ40lk8ebpqSegQ==}
     engines: {node: '>=14.13'}
     dependencies:
       '@stoplight/json': 3.21.0
       '@stoplight/json-schema-generator': 1.0.2
-      '@stoplight/types': 13.20.0
+      '@stoplight/types': 14.0.0
       '@types/json-schema': 7.0.11
       '@types/swagger-schema-official': 2.0.24
       '@types/type-is': 1.6.5
@@ -663,18 +663,18 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /@stoplight/prism-cli@5.4.0:
-    resolution: {integrity: sha512-Y7l6MqNQKzzM1xbGX1veP2Wjg9FEzp0LP28SRiPiirzRixUpBxkYx/u+TF3IOfEJAwo4eWjfHS0E6Uu2G3PldQ==}
+  /@stoplight/prism-cli@5.5.1:
+    resolution: {integrity: sha512-Gk9PtZs0PKNTUSpV58l1EjR2FE0vTbd452UJphobzAVcIGZOZ2upel2x2xSr+6HWkV8ovgOlZrwDg6at4TjKrg==}
     engines: {node: '>=16'}
     hasBin: true
     dependencies:
-      '@stoplight/http-spec': 5.13.0
+      '@stoplight/http-spec': 6.0.2
       '@stoplight/json': 3.21.0
       '@stoplight/json-schema-ref-parser': 9.2.7
-      '@stoplight/prism-core': 5.4.0
-      '@stoplight/prism-http': 5.4.0
-      '@stoplight/prism-http-server': 5.4.0
-      '@stoplight/types': 13.20.0
+      '@stoplight/prism-core': 5.5.1
+      '@stoplight/prism-http': 5.5.1
+      '@stoplight/prism-http-server': 5.5.1
+      '@stoplight/types': 14.0.0
       chalk: 4.1.2
       chokidar: 3.5.3
       fp-ts: 2.16.1
@@ -693,8 +693,8 @@ packages:
       - supports-color
     dev: true
 
-  /@stoplight/prism-core@5.4.0:
-    resolution: {integrity: sha512-xZ/lyaUxw++v1whXaQyXNX/9a2+FREr5FLJHESTKPRk3RUrBL7RYheey72OuJbgpaAfhiEn4kBeg+x4UzVbLdA==}
+  /@stoplight/prism-core@5.5.1:
+    resolution: {integrity: sha512-5itsaRyj1RmOwqz2hm1GRmak1OOVG1Eb3hAux1sHpTbIc3BE1upAq8wk4y66fr5sqpFnsAO/jaiuyVs8iH+ARw==}
     engines: {node: '>=16'}
     dependencies:
       fp-ts: 2.16.1
@@ -703,13 +703,13 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /@stoplight/prism-http-server@5.4.0:
-    resolution: {integrity: sha512-ZD4U1Zxpv1Sn3I/ap73sfHWdtpgvRmVnTyV6iIdf32uHIZxwRToYKD9wSAfmDeW0t2rqFOhbm/YAFD4hLRagWQ==}
+  /@stoplight/prism-http-server@5.5.1:
+    resolution: {integrity: sha512-v8djvSQo+sutTOqBhbgmeiscwUYJFsa/81ST6dT4/tnj1idXbm9XXsoXxOQRGmGfzxMWbRnH94QjPo7PFNCHEw==}
     engines: {node: '>=16'}
     dependencies:
-      '@stoplight/prism-core': 5.4.0
-      '@stoplight/prism-http': 5.4.0
-      '@stoplight/types': 13.20.0
+      '@stoplight/prism-core': 5.5.1
+      '@stoplight/prism-http': 5.5.1
+      '@stoplight/types': 14.0.0
       fast-xml-parser: 4.3.2
       fp-ts: 2.16.1
       io-ts: 2.2.20(fp-ts@2.16.1)
@@ -724,16 +724,16 @@ packages:
       - supports-color
     dev: true
 
-  /@stoplight/prism-http@5.4.0:
-    resolution: {integrity: sha512-1oVA2VafbuvAILtji74MePwm8Kd1/BVFm6SpTL+op49NgY3ktjvGW7BQPL43Slr7+cymq0YQlpvk/7cVR2Iy9w==}
+  /@stoplight/prism-http@5.5.1:
+    resolution: {integrity: sha512-mNqHDBaVqAL5ek4EgcmaCSUXhUOgJ3lXGNXW4caOke8Ary3sWxx9ziaw4iR+TxYzXZyOQJCNNWggZh7obcbb0w==}
     engines: {node: '>=16'}
     dependencies:
       '@faker-js/faker': 6.3.1
       '@stoplight/json': 3.21.0
       '@stoplight/json-schema-merge-allof': 0.7.8
       '@stoplight/json-schema-sampler': 0.3.0
-      '@stoplight/prism-core': 5.4.0
-      '@stoplight/types': 13.20.0
+      '@stoplight/prism-core': 5.5.1
+      '@stoplight/types': 14.0.0
       '@stoplight/yaml': 4.2.3
       abstract-logging: 2.0.1
       accepts: 1.3.8
@@ -767,6 +767,14 @@ packages:
       utility-types: 3.10.0
     dev: true
 
+  /@stoplight/types@14.0.0:
+    resolution: {integrity: sha512-w7Ejau6TaB7RqR0vWzGJSdmgLEYD2frjgbHPZoxgGQwAq/R8Qh/D9p9Bl9JFdii+YTL5xoDjyX0c1WDRlbMV8g==}
+    engines: {node: ^12.20 || >=14.13}
+    dependencies:
+      '@types/json-schema': 7.0.14
+      utility-types: 3.10.0
+    dev: true
+
   /@stoplight/yaml-ast-parser@0.0.48:
     resolution: {integrity: sha512-sV+51I7WYnLJnKPn2EMWgS4EUfoP4iWEbrWwbXsj0MZCB/xOK8j6+C9fntIdOM50kpx45ZLC3s6kwKivWuqvyg==}
     dev: true
@@ -781,12 +789,12 @@ packages:
       tslib: 2.6.2
     dev: true
 
-  /@tanstack/query-core@5.0.0:
-    resolution: {integrity: sha512-Y1BpiA6BblJd/UlVqxEVeAG7IACn568YJuTTItAiecBI7En+33g780kg+/8lhgl+BzcUPN7o+NjBrSRGJoemyQ==}
+  /@tanstack/query-core@5.4.3:
+    resolution: {integrity: sha512-fnI9ORjcuLGm1sNrKatKIosRQUpuqcD4SV7RqRSVmj8JSicX2aoMyKryHEBpVQvf6N4PaBVgBxQomjsbsGPssQ==}
     dev: false
 
-  /@tanstack/react-query@5.0.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-diQoC8FNBcO5Uf5yuaJlXthTtbO1xM8kzOX+pSBUMT9n/cqQ/u1wJGCtukvhDWA+6j07WmIj4bfqNbd2KOB6jQ==}
+  /@tanstack/react-query@5.4.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-4aSOrRNa6yEmf7mws5QPTVMn8Lp7L38tFoTZ0c1ZmhIvbr8GIA0WT7X5N3yz/nuK8hUtjw9cAzBr4BPDZZ+tzA==}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
@@ -797,7 +805,7 @@ packages:
       react-native:
         optional: true
     dependencies:
-      '@tanstack/query-core': 5.0.0
+      '@tanstack/query-core': 5.4.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     dev: false
@@ -1018,8 +1026,8 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /axios@1.5.1:
-    resolution: {integrity: sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==}
+  /axios@1.6.0:
+    resolution: {integrity: sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==}
     dependencies:
       follow-redirects: 1.15.3
       form-data: 4.0.0
@@ -2105,7 +2113,7 @@ packages:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
     dependencies:
-      minimist: 1.2.6
+      minimist: 1.2.8
     dev: true
 
   /ms@2.1.2:
diff --git a/src/createExports.ts b/src/createExports.ts
index 183ea37..e57e904 100644
--- a/src/createExports.ts
+++ b/src/createExports.ts
@@ -1,12 +1,14 @@
 import ts from "typescript";
-import { sync }  from "glob";
+import { sync } from "glob";
 import { join } from "path";
 import fs from "fs";
 import { createUseQuery } from "./createUseQuery";
 import { createUseMutation } from "./createUseMutation";
 
 export const createExports = (generatedClientsPath: string) => {
-  const services = sync(join(generatedClientsPath, 'services', '*.ts').replace(/\\/g, '/'));
+  const services = sync(
+    join(generatedClientsPath, "services", "*.ts").replace(/\\/g, "/")
+  );
   const nodes = services.map((servicePath) =>
     ts.createSourceFile(
       servicePath, // fileName
@@ -29,7 +31,6 @@ export const createExports = (generatedClientsPath: string) => {
         ) as ts.MethodDeclaration[];
         return methods
           .map((method) => {
-            const methodName = method.name?.getText(node)!;
             const methodBlock = method
               .getChildren(node)
               .find((child) => child.kind === ts.SyntaxKind.Block) as ts.Block;
diff --git a/src/createImports.ts b/src/createImports.ts
index 01a873c..ebc7f1f 100644
--- a/src/createImports.ts
+++ b/src/createImports.ts
@@ -5,8 +5,12 @@ import { extname, basename, posix } from "path";
 const { join } = posix;
 
 export const createImports = (generatedClientsPath: string) => {
-  const models = sync(join(generatedClientsPath, 'models', '*.ts').replace(/\\/g, '/'));
-  const services = sync(join(generatedClientsPath, 'services', '*.ts').replace(/\\/g, '/'));
+  const models = sync(
+    join(generatedClientsPath, "models", "*.ts").replace(/\\/g, "/")
+  );
+  const services = sync(
+    join(generatedClientsPath, "services", "*.ts").replace(/\\/g, "/")
+  );
   return [
     ts.factory.createImportDeclaration(
       undefined,
@@ -24,6 +28,11 @@ export const createImports = (generatedClientsPath: string) => {
             undefined,
             ts.factory.createIdentifier("useMutation")
           ),
+          ts.factory.createImportSpecifier(
+            false,
+            undefined,
+            ts.factory.createIdentifier("UseQueryResult")
+          ),
           ts.factory.createImportSpecifier(
             false,
             undefined,
@@ -34,6 +43,11 @@ export const createImports = (generatedClientsPath: string) => {
             undefined,
             ts.factory.createIdentifier("UseMutationOptions")
           ),
+          ts.factory.createImportSpecifier(
+            false,
+            undefined,
+            ts.factory.createIdentifier("UseMutationResult")
+          ),
         ])
       ),
       ts.factory.createStringLiteral("@tanstack/react-query"),
diff --git a/src/createSource.ts b/src/createSource.ts
index 7c60414..ce3aa95 100644
--- a/src/createSource.ts
+++ b/src/createSource.ts
@@ -1,6 +1,7 @@
 import ts from "typescript";
 import { createImports } from "./createImports";
 import { createExports } from "./createExports";
+import { version } from "../package.json";
 
 const createSourceFile = (outputPath: string) => {
   return ts.factory.createSourceFile(
@@ -18,13 +19,16 @@ export const createSource = (outputPath: string) => {
     false,
     ts.ScriptKind.TS
   );
-  const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+  const printer = ts.createPrinter({
+    newLine: ts.NewLineKind.LineFeed,
+    removeComments: false,
+  });
 
-  const result = printer.printNode(
-    ts.EmitHint.Unspecified,
-    createSourceFile(outputPath),
-    resultFile
-  );
+  const node = createSourceFile(outputPath);
+
+  const result =
+    `// generated with @7nohe/openapi-react-query-codegen@${version} \n` +
+    printer.printNode(ts.EmitHint.Unspecified, node, resultFile);
 
   return result;
 };
diff --git a/src/createUseMutation.ts b/src/createUseMutation.ts
index 7909ee0..71832c2 100644
--- a/src/createUseMutation.ts
+++ b/src/createUseMutation.ts
@@ -7,6 +7,48 @@ export const createUseMutation = (
   method: ts.MethodDeclaration
 ) => {
   const methodName = method.name?.getText(node)!;
+  // Awaited<ReturnType<typeof myClass.myMethod>>
+  const awaitedResponseDataType = ts.factory.createTypeReferenceNode(
+    ts.factory.createIdentifier("Awaited"),
+    [
+      ts.factory.createTypeReferenceNode(
+        ts.factory.createIdentifier("ReturnType"),
+        [
+          ts.factory.createTypeQueryNode(
+            ts.factory.createQualifiedName(
+              ts.factory.createIdentifier(className),
+              ts.factory.createIdentifier(methodName)
+            ),
+            undefined
+          ),
+        ]
+      ),
+    ]
+  );
+
+  const responseDataType = ts.factory.createTypeParameterDeclaration(
+    undefined,
+    "TData",
+    undefined,
+    awaitedResponseDataType
+  );
+
+  const methodParameters =
+    method.parameters.length !== 0
+      ? ts.factory.createTypeLiteralNode(
+          method.parameters.map((param) => {
+            return ts.factory.createPropertySignature(
+              undefined,
+              ts.factory.createIdentifier(param.name.getText(node)),
+              param.questionToken ?? param.initializer
+                ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+                : param.questionToken,
+              param.type
+            );
+          })
+        )
+      : ts.factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+
   return ts.factory.createVariableStatement(
     [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
     ts.factory.createVariableDeclarationList(
@@ -19,7 +61,21 @@ export const createUseMutation = (
           undefined,
           ts.factory.createArrowFunction(
             undefined,
-            undefined,
+            ts.factory.createNodeArray([
+              responseDataType,
+              ts.factory.createTypeParameterDeclaration(
+                undefined,
+                "TError",
+                undefined,
+                ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+              ),
+              ts.factory.createTypeParameterDeclaration(
+                undefined,
+                "TContext",
+                undefined,
+                ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+              ),
+            ]),
             [
               ts.factory.createParameterDeclaration(
                 undefined,
@@ -32,40 +88,11 @@ export const createUseMutation = (
                     ts.factory.createTypeReferenceNode(
                       ts.factory.createIdentifier("UseMutationOptions"),
                       [
-                        ts.factory.createTypeReferenceNode(
-                          ts.factory.createIdentifier("Awaited"),
-                          [
-                            ts.factory.createTypeReferenceNode(
-                              ts.factory.createIdentifier("ReturnType"),
-                              [
-                                ts.factory.createTypeQueryNode(
-                                  ts.factory.createQualifiedName(
-                                    ts.factory.createIdentifier(className),
-                                    ts.factory.createIdentifier(methodName)
-                                  ),
-                                  undefined
-                                ),
-                              ]
-                            ),
-                          ]
-                        ),
+                        awaitedResponseDataType,
                         ts.factory.createKeywordTypeNode(
                           ts.SyntaxKind.UnknownKeyword
                         ),
-                        method.parameters.length !== 0 ? ts.factory.createTypeLiteralNode(
-                          method.parameters.map((param) => {
-                            return ts.factory.createPropertySignature(
-                              undefined,
-                              ts.factory.createIdentifier(
-                                param.name.getText(node)
-                              ),
-                              param.questionToken ?? param.initializer ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : param.questionToken,
-                              param.type
-                            );
-                          })
-                        ) : ts.factory.createKeywordTypeNode(
-                          ts.SyntaxKind.VoidKeyword
-                        ),
+                        methodParameters,
                         ts.factory.createKeywordTypeNode(
                           ts.SyntaxKind.UnknownKeyword
                         ),
@@ -81,56 +108,101 @@ export const createUseMutation = (
             ],
             undefined,
             ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
-            ts.factory.createCallExpression(
-              ts.factory.createIdentifier("useMutation"),
-              undefined,
-              [
-                ts.factory.createObjectLiteralExpression([
-                  ts.factory.createPropertyAssignment(
-                    ts.factory.createIdentifier("mutationFn"),
-                    ts.factory.createArrowFunction(
-                      undefined,
-                      undefined,
-                      method.parameters.length !== 0 ? [
-                        ts.factory.createParameterDeclaration(
-                          undefined,
-                          undefined,
-                          ts.factory.createObjectBindingPattern(
-                            method.parameters.map((param) => {
-                              return ts.factory.createBindingElement(
+            ts.factory.createAsExpression(
+              ts.factory.createCallExpression(
+                ts.factory.createIdentifier("useMutation"),
+                undefined,
+                [
+                  ts.factory.createObjectLiteralExpression([
+                    ts.factory.createPropertyAssignment(
+                      ts.factory.createIdentifier("mutationFn"),
+                      ts.factory.createArrowFunction(
+                        undefined,
+                        undefined,
+                        method.parameters.length !== 0
+                          ? [
+                              ts.factory.createParameterDeclaration(
                                 undefined,
                                 undefined,
-                                ts.factory.createIdentifier(
-                                  param.name.getText(node)
+                                ts.factory.createObjectBindingPattern(
+                                  method.parameters.map((param) => {
+                                    return ts.factory.createBindingElement(
+                                      undefined,
+                                      undefined,
+                                      ts.factory.createIdentifier(
+                                        param.name.getText(node)
+                                      ),
+                                      undefined
+                                    );
+                                  })
                                 ),
+                                undefined,
+                                undefined,
                                 undefined
-                              );
-                            })
+                              ),
+                            ]
+                          : [],
+                        undefined,
+                        ts.factory.createToken(
+                          ts.SyntaxKind.EqualsGreaterThanToken
+                        ),
+                        ts.factory.createCallExpression(
+                          ts.factory.createPropertyAccessExpression(
+                            ts.factory.createIdentifier(className),
+                            ts.factory.createIdentifier(methodName)
                           ),
                           undefined,
-                          undefined,
+                          method.parameters.map((params) =>
+                            ts.factory.createIdentifier(
+                              params.name.getText(node)
+                            )
+                          )
+                        )
+                      )
+                    ),
+                    ts.factory.createSpreadAssignment(
+                      ts.factory.createIdentifier("options")
+                    ),
+                  ]),
+                ]
+              ),
+              // Omit<UseMutationResult<Awaited<ReturnType<typeof myClass.myMethod>>, TError, params, TContext>, 'data'> & { data: TData };
+              ts.factory.createIntersectionTypeNode([
+                ts.factory.createTypeReferenceNode(
+                  ts.factory.createIdentifier("Omit"),
+                  [
+                    ts.factory.createTypeReferenceNode(
+                      ts.factory.createIdentifier("UseMutationResult"),
+                      [
+                        awaitedResponseDataType,
+                        ts.factory.createTypeReferenceNode(
+                          ts.factory.createIdentifier("TError"),
                           undefined
                         ),
-                      ] : [],
-                      undefined,
-                      ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
-                      ts.factory.createCallExpression(
-                        ts.factory.createPropertyAccessExpression(
-                          ts.factory.createIdentifier(className),
-                          ts.factory.createIdentifier(methodName)
+                        methodParameters,
+                        ts.factory.createTypeReferenceNode(
+                          ts.factory.createIdentifier("TContext"),
+                          undefined
                         ),
-                        undefined,
-                        method.parameters.map((params) =>
-                          ts.factory.createIdentifier(params.name.getText(node))
-                        )
-                      )
+                      ]
+                    ),
+                    ts.factory.createLiteralTypeNode(
+                      ts.factory.createStringLiteral("data")
+                    ),
+                  ]
+                ),
+                ts.factory.createTypeLiteralNode([
+                  ts.factory.createPropertySignature(
+                    undefined,
+                    ts.factory.createIdentifier("data"),
+                    undefined,
+                    ts.factory.createTypeReferenceNode(
+                      ts.factory.createIdentifier("TData"),
+                      undefined
                     )
                   ),
-                  ts.factory.createSpreadAssignment(
-                    ts.factory.createIdentifier("options")
-                  ),
                 ]),
-              ]
+              ])
             )
           )
         ),
diff --git a/src/createUseQuery.ts b/src/createUseQuery.ts
index edd3bf2..90dde10 100644
--- a/src/createUseQuery.ts
+++ b/src/createUseQuery.ts
@@ -29,22 +29,56 @@ export const createUseQuery = (
             ts.factory.createPropertySignature(
               undefined,
               ts.factory.createIdentifier(param.name.getText(node)),
-              param.questionToken ?? param.initializer ? ts.factory.createToken(ts.SyntaxKind.QuestionToken) : param.questionToken,
+              param.questionToken ?? param.initializer
+                ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+                : param.questionToken,
               param.type
             )
           )
-        ),
-      ),
+        )
+      )
     );
   }
 
   const customHookName = `use${className}${capitalizeFirstLetter(methodName)}`;
   const queryKey = `${customHookName}Key`;
 
-  const queryKeyGenericType = ts.factory.createTypeReferenceNode('TQueryKey', undefined);
-  const queryKeyConstraint = ts.factory.createTypeReferenceNode('Array', [ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)]);
+  const queryKeyGenericType = ts.factory.createTypeReferenceNode(
+    "TQueryKey",
+    undefined
+  );
+  const queryKeyConstraint = ts.factory.createTypeReferenceNode("Array", [
+    ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+  ]);
+
+  // Awaited<ReturnType<typeof myClass.myMethod>>
+  const awaitedResponseDataType = ts.factory.createTypeReferenceNode(
+    ts.factory.createIdentifier("Awaited"),
+    [
+      ts.factory.createTypeReferenceNode(
+        ts.factory.createIdentifier("ReturnType"),
+        [
+          ts.factory.createTypeQueryNode(
+            ts.factory.createQualifiedName(
+              ts.factory.createIdentifier(className),
+              ts.factory.createIdentifier(methodName)
+            ),
+            undefined
+          ),
+        ]
+      ),
+    ]
+  );
+
+  const responseDataType = ts.factory.createTypeParameterDeclaration(
+    undefined,
+    "TData",
+    undefined,
+    awaitedResponseDataType
+  );
 
   return [
+    // QueryKey
     ts.factory.createVariableStatement(
       [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
       ts.factory.createVariableDeclarationList(
@@ -61,6 +95,7 @@ export const createUseQuery = (
         ts.NodeFlags.Const
       )
     ),
+    // Custom hook
     ts.factory.createVariableStatement(
       [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
       ts.factory.createVariableDeclarationList(
@@ -82,6 +117,13 @@ export const createUseQuery = (
                     )
                   )
                 ),
+                responseDataType,
+                ts.factory.createTypeParameterDeclaration(
+                  undefined,
+                  "TError",
+                  undefined,
+                  ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+                ),
               ]),
               [
                 ...requestParam,
@@ -103,43 +145,11 @@ export const createUseQuery = (
                       ts.factory.createTypeReferenceNode(
                         ts.factory.createIdentifier("UseQueryOptions"),
                         [
-                          ts.factory.createTypeReferenceNode(
-                            ts.factory.createIdentifier("Awaited"),
-                            [
-                              ts.factory.createTypeReferenceNode(
-                                ts.factory.createIdentifier("ReturnType"),
-                                [
-                                  ts.factory.createTypeQueryNode(
-                                    ts.factory.createQualifiedName(
-                                      ts.factory.createIdentifier(className),
-                                      ts.factory.createIdentifier(methodName)
-                                    ),
-                                    undefined
-                                  ),
-                                ]
-                              ),
-                            ]
-                          ),
+                          awaitedResponseDataType,
                           ts.factory.createKeywordTypeNode(
                             ts.SyntaxKind.UnknownKeyword
                           ),
-                          ts.factory.createTypeReferenceNode(
-                            ts.factory.createIdentifier("Awaited"),
-                            [
-                              ts.factory.createTypeReferenceNode(
-                                ts.factory.createIdentifier("ReturnType"),
-                                [
-                                  ts.factory.createTypeQueryNode(
-                                    ts.factory.createQualifiedName(
-                                      ts.factory.createIdentifier(className),
-                                      ts.factory.createIdentifier(methodName)
-                                    ),
-                                    undefined
-                                  ),
-                                ]
-                              ),
-                            ]
-                          ),
+                          awaitedResponseDataType,
                           ts.factory.createArrayTypeNode(
                             ts.factory.createKeywordTypeNode(
                               ts.SyntaxKind.UnknownKeyword
@@ -164,72 +174,108 @@ export const createUseQuery = (
               ],
               undefined,
               ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
-              ts.factory.createCallExpression(
-                ts.factory.createIdentifier("useQuery"),
-                undefined,
-                [
-                  ts.factory.createObjectLiteralExpression([
-                    ts.factory.createPropertyAssignment(
-                      ts.factory.createIdentifier("queryKey"),
-                      ts.factory.createArrayLiteralExpression(
-                        [
-                          ts.factory.createIdentifier(queryKey),
-                          ts.factory.createSpreadElement(
-                            ts.factory.createParenthesizedExpression(
-                              ts.factory.createBinaryExpression(
-                                ts.factory.createIdentifier("queryKey"),
-                                ts.factory.createToken(
-                                  ts.SyntaxKind.QuestionQuestionToken
-                                ),
-                                method.parameters.length
-                                  ? ts.factory.createArrayLiteralExpression([
-                                      ts.factory.createObjectLiteralExpression(
-                                        method.parameters.map((param) =>
-                                          ts.factory.createShorthandPropertyAssignment(
-                                            ts.factory.createIdentifier(
-                                              param.name.getText(node)
+              ts.factory.createAsExpression(
+                ts.factory.createCallExpression(
+                  ts.factory.createIdentifier("useQuery"),
+                  undefined,
+                  [
+                    ts.factory.createObjectLiteralExpression([
+                      ts.factory.createPropertyAssignment(
+                        ts.factory.createIdentifier("queryKey"),
+                        ts.factory.createArrayLiteralExpression(
+                          [
+                            ts.factory.createIdentifier(queryKey),
+                            ts.factory.createSpreadElement(
+                              ts.factory.createParenthesizedExpression(
+                                ts.factory.createBinaryExpression(
+                                  ts.factory.createIdentifier("queryKey"),
+                                  ts.factory.createToken(
+                                    ts.SyntaxKind.QuestionQuestionToken
+                                  ),
+                                  method.parameters.length
+                                    ? ts.factory.createArrayLiteralExpression([
+                                        ts.factory.createObjectLiteralExpression(
+                                          method.parameters.map((param) =>
+                                            ts.factory.createShorthandPropertyAssignment(
+                                              ts.factory.createIdentifier(
+                                                param.name.getText(node)
+                                              )
                                             )
                                           )
-                                        )
-                                      ),
-                                    ])
-                                  : ts.factory.createArrayLiteralExpression([])
+                                        ),
+                                      ])
+                                    : ts.factory.createArrayLiteralExpression(
+                                        []
+                                      )
+                                )
                               )
-                            )
-                          ),
-                        ],
-                        false
-                      )
-                    ),
-                    ts.factory.createPropertyAssignment(
-                      ts.factory.createIdentifier("queryFn"),
-                      ts.factory.createArrowFunction(
-                        undefined,
-                        undefined,
-                        [],
-                        undefined,
-                        ts.factory.createToken(
-                          ts.SyntaxKind.EqualsGreaterThanToken
-                        ),
-                        ts.factory.createCallExpression(
-                          ts.factory.createPropertyAccessExpression(
-                            ts.factory.createIdentifier(className),
-                            ts.factory.createIdentifier(methodName)
-                          ),
+                            ),
+                          ],
+                          false
+                        )
+                      ),
+                      ts.factory.createPropertyAssignment(
+                        ts.factory.createIdentifier("queryFn"),
+                        ts.factory.createArrowFunction(
+                          undefined,
+                          undefined,
+                          [],
                           undefined,
-                          method.parameters.map((param) =>
-                            ts.factory.createIdentifier(
-                              param.name.getText(node)
+                          ts.factory.createToken(
+                            ts.SyntaxKind.EqualsGreaterThanToken
+                          ),
+                          ts.factory.createCallExpression(
+                            ts.factory.createPropertyAccessExpression(
+                              ts.factory.createIdentifier(className),
+                              ts.factory.createIdentifier(methodName)
+                            ),
+                            undefined,
+                            method.parameters.map((param) =>
+                              ts.factory.createIdentifier(
+                                param.name.getText(node)
+                              )
                             )
                           )
                         )
+                      ),
+                      ts.factory.createSpreadAssignment(
+                        ts.factory.createIdentifier("options")
+                      ),
+                    ]),
+                  ]
+                ),
+                // Omit<UseQueryResult<Awaited<ReturnType<typeof myClass.myMethod>>, TError>, 'data'> & { data: TData };
+                ts.factory.createIntersectionTypeNode([
+                  ts.factory.createTypeReferenceNode(
+                    ts.factory.createIdentifier("Omit"),
+                    [
+                      ts.factory.createTypeReferenceNode(
+                        ts.factory.createIdentifier("UseQueryResult"),
+                        [
+                          awaitedResponseDataType,
+                          ts.factory.createTypeReferenceNode(
+                            ts.factory.createIdentifier("TError"),
+                            undefined
+                          ),
+                        ]
+                      ),
+                      ts.factory.createLiteralTypeNode(
+                        ts.factory.createStringLiteral("data")
+                      ),
+                    ]
+                  ),
+                  ts.factory.createTypeLiteralNode([
+                    ts.factory.createPropertySignature(
+                      undefined,
+                      ts.factory.createIdentifier("data"),
+                      undefined,
+                      ts.factory.createTypeReferenceNode(
+                        ts.factory.createIdentifier("TData"),
+                        undefined
                       )
                     ),
-                    ts.factory.createSpreadAssignment(
-                      ts.factory.createIdentifier("options")
-                    ),
                   ]),
-                ]
+                ])
               )
             )
           ),