diff --git a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
index b80ff55c..d202f8a5 100644
--- a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
+++ b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
@@ -1,11 +1,20 @@
+import ts from "typescript";
 import type { TsGenerator } from "../../../api";
 
-export const create = (factory: TsGenerator.Factory.Type) => {
-  return factory.TypeAliasDeclaration.create({
-    export: true,
-    name: "Client",
-    type: factory.TypeReferenceNode.create({
-      name: `ReturnType<typeof createClient>`,
+export const create = (factory: TsGenerator.Factory.Type): ts.TypeAliasDeclaration[] => {
+  return [
+    factory.TypeAliasDeclaration.create({
+      name: "ClientFunction<RequestOption>",
+      type: factory.TypeReferenceNode.create({
+        name: `typeof createClient<RequestOption>`,
+      })
+    }),
+    factory.TypeAliasDeclaration.create({
+      export: true,
+      name: "Client<RequestOption>",
+      type: factory.TypeReferenceNode.create({
+        name: `ReturnType<ClientFunction<RequestOption>>`,
+      })
     })
-  })
+  ]
 };
diff --git a/src/code-templates/functional-api-client/index.ts b/src/code-templates/functional-api-client/index.ts
index a45ad3bf..0164141e 100644
--- a/src/code-templates/functional-api-client/index.ts
+++ b/src/code-templates/functional-api-client/index.ts
@@ -37,6 +37,9 @@ export const generator: CodeGenerator.GenerateFunction<Option> = (
 
   const apiClientStatement = FunctionalApiClient.create(factory, codeGeneratorParamsList, option || {});
   statements.push(apiClientStatement);
-  statements.push(ClientTypeDefinition.create(factory));
+  ClientTypeDefinition.create(factory).forEach(statement => {
+    statements.push(statement);
+  })
+  
   return statements;
 };
diff --git a/src/meta.ts b/src/meta.ts
index 04e02a68..97feba1f 100644
--- a/src/meta.ts
+++ b/src/meta.ts
@@ -1,2 +1,2 @@
 export const Name = "@himenon/openapi-typescript-code-generator";
-export const Version = "0.22.0";
\ No newline at end of file
+export const Version = "0.22.1";
\ No newline at end of file
diff --git a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
index 670458d8..f9326879 100644
--- a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
@@ -3923,6 +3923,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/format.domain.ts.snap b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
index 39a52a0f..e20d7112 100644
--- a/test/__tests__/functional/__snapshots__/format.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
@@ -49,6 +49,7 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
index fa431c31..5d46629f 100644
--- a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
@@ -56556,6 +56556,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
index 07b5bd58..58af2397 100644
--- a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
@@ -71,7 +71,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
index d1a9f350..9898a7f2 100644
--- a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
@@ -230,7 +230,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
index 84c9d1a3..f0b00a10 100644
--- a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
@@ -135,7 +135,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -274,7 +275,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -308,6 +310,7 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
index 603a90a9..51152381 100644
--- a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
@@ -484,7 +484,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -548,7 +549,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1036,7 +1038,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1093,7 +1096,8 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1231,7 +1235,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1377,6 +1382,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
index f182363c..dd04c58f 100644
--- a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
@@ -55,6 +55,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;