diff --git a/package.json b/package.json
index 225378fc..672ac095 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.1.6",
+    "version": "0.1.7",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",
diff --git a/src/templates/core/Definition.ts b/src/templates/core/Definition.ts
deleted file mode 100644
index 6f6614a3..00000000
--- a/src/templates/core/Definition.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-import { Dictionary } from '../models/Dictionary';
-
-export type FieldDefinition = {
-    readonly type?: string;
-    readonly isReadOnly?: boolean;
-    readonly isRequired?: boolean;
-    readonly isNullable?: boolean;
-    readonly format?: string;
-    readonly maximum?: number;
-    readonly exclusiveMaximum?: boolean;
-    readonly minimum?: number;
-    readonly exclusiveMinimum?: boolean;
-    readonly multipleOf?: number;
-    readonly maxLength?: number;
-    readonly minLength?: number;
-    readonly pattern?: string;
-    readonly maxItems?: number;
-    readonly minItems?: number;
-    readonly uniqueItems?: boolean;
-    readonly maxProperties?: number;
-    readonly minProperties?: number;
-}
-
-type ArrayDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type DictionaryDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type ObjectDefinition<T> = FieldDefinition & {
-        readonly [K in keyof T]: Definition<T[K]>;
-    }
-
-export type Definition<T> =
-    T extends string ? FieldDefinition :
-    T extends number ? FieldDefinition :
-    T extends boolean ? FieldDefinition :
-    T extends File ? FieldDefinition :
-    T extends Blob ? FieldDefinition :
-    T extends Array<infer U> ? ArrayDefinition<U> :
-    T extends Dictionary<infer U> ? DictionaryDefinition<U> :
-    T extends Object ? ObjectDefinition<T> :
-    FieldDefinition
diff --git a/src/templates/core/Schema.ts b/src/templates/core/Schema.ts
new file mode 100644
index 00000000..9662b142
--- /dev/null
+++ b/src/templates/core/Schema.ts
@@ -0,0 +1,40 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+export type FieldSchema = {
+    readonly type?: string;
+    readonly isReadOnly?: boolean;
+    readonly isRequired?: boolean;
+    readonly isNullable?: boolean;
+    readonly format?: string;
+    readonly maximum?: number;
+    readonly exclusiveMaximum?: boolean;
+    readonly minimum?: number;
+    readonly exclusiveMinimum?: boolean;
+    readonly multipleOf?: number;
+    readonly maxLength?: number;
+    readonly minLength?: number;
+    readonly pattern?: string;
+    readonly maxItems?: number;
+    readonly minItems?: number;
+    readonly uniqueItems?: boolean;
+    readonly maxProperties?: number;
+    readonly minProperties?: number;
+}
+
+export type ObjectSchema<T> = FieldSchema & {
+    properties?: {
+        readonly [K in keyof T]: Schema<T[K]>;
+    }
+}
+
+export type Schema<T> =
+    T extends string ? FieldSchema :
+    T extends number ? FieldSchema :
+    T extends boolean ? FieldSchema :
+    T extends File ? FieldSchema :
+    T extends Blob ? FieldSchema :
+    T extends Object ? ObjectSchema<T> :
+    FieldSchema
diff --git a/src/templates/core/getSchema.ts b/src/templates/core/getSchema.ts
index 12bc66ad..eeac2c4e 100644
--- a/src/templates/core/getSchema.ts
+++ b/src/templates/core/getSchema.ts
@@ -9,7 +9,7 @@ import * as schemas from '../schemas';
  * Get a schema object for a given model name.
  * @param model The model name to return the schema from.
  */
-export function getSchema<K extends keyof typeof schemas>(model: K) {
+export function getSchema<K extends keyof typeof schemas, T>(model: K) {
     if (schemas.hasOwnProperty(model)) {
         return schemas[model];
     }
diff --git a/src/templates/index.ts b/src/templates/index.ts
index 8c7053c5..14a6951b 100644
--- a/src/templates/index.ts
+++ b/src/templates/index.ts
@@ -7,5 +7,6 @@ export { ApiError } from './core/ApiError';
 export { getSchema } from './core/getSchema';
 export { isSuccess } from './core/isSuccess';
 export { OpenAPI } from './core/OpenAPI';
+export { FieldSchema, Schema, ObjectSchema } from './core/Schema';
 export * from './models/';
 export * from './services/';
diff --git a/src/templates/schemas/schema.hbs b/src/templates/schemas/schema.hbs
index 544f0070..43571a9a 100644
--- a/src/templates/schemas/schema.hbs
+++ b/src/templates/schemas/schema.hbs
@@ -8,5 +8,7 @@
 import { ${{{this}}} } from './${{{this}}}';
 {{/each}}
 {{/if}}
+import { Schema as __Schema } from '../core/Schema';
+import { {{{name}}} } from '../models/{{{name}}}';
 
-export const ${{{name}}} = {{>schema}};
+export const ${{{name}}}: __Schema<{{{name}}}> = {{>schema}};
diff --git a/src/templates/services/service.hbs b/src/templates/services/service.hbs
index 827d5f49..b95f0b73 100644
--- a/src/templates/services/service.hbs
+++ b/src/templates/services/service.hbs
@@ -9,7 +9,7 @@ import { {{{this}}} } from '../models/{{{this}}}';
 {{/each}}
 {{/if}}
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class {{{name}}} {
@@ -41,7 +41,7 @@ export class {{{name}}} {
         {{/each}}
     {{/if}}): Promise<{{>result}}> {
 
-        const result = await $request({
+        const result = await __request({
             method: '{{{method}}}',
             path: `{{{path}}}`,
             {{#if parametersCookie~}}
diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
index a8e5711a..c34f0e2d 100644
--- a/test/__snapshots__/index.spec.js.snap
+++ b/test/__snapshots__/index.spec.js.snap
@@ -61,60 +61,6 @@ export function catchGenericError(result: Result): void {
 "
 `;
 
-exports[`generation v2 file(./test/result/v2/core/Definition.ts): ./test/result/v2/core/Definition.ts 1`] = `
-"/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-import { Dictionary } from '../models/Dictionary';
-
-export type FieldDefinition = {
-    readonly type?: string;
-    readonly isReadOnly?: boolean;
-    readonly isRequired?: boolean;
-    readonly isNullable?: boolean;
-    readonly format?: string;
-    readonly maximum?: number;
-    readonly exclusiveMaximum?: boolean;
-    readonly minimum?: number;
-    readonly exclusiveMinimum?: boolean;
-    readonly multipleOf?: number;
-    readonly maxLength?: number;
-    readonly minLength?: number;
-    readonly pattern?: string;
-    readonly maxItems?: number;
-    readonly minItems?: number;
-    readonly uniqueItems?: boolean;
-    readonly maxProperties?: number;
-    readonly minProperties?: number;
-}
-
-type ArrayDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type DictionaryDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type ObjectDefinition<T> = FieldDefinition & {
-        readonly [K in keyof T]: Definition<T[K]>;
-    }
-
-export type Definition<T> =
-    T extends string ? FieldDefinition :
-    T extends number ? FieldDefinition :
-    T extends boolean ? FieldDefinition :
-    T extends File ? FieldDefinition :
-    T extends Blob ? FieldDefinition :
-    T extends Array<infer U> ? ArrayDefinition<U> :
-    T extends Dictionary<infer U> ? DictionaryDefinition<U> :
-    T extends Object ? ObjectDefinition<T> :
-    FieldDefinition
-"
-`;
-
 exports[`generation v2 file(./test/result/v2/core/OpenAPI.ts): ./test/result/v2/core/OpenAPI.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
@@ -163,6 +109,50 @@ export interface Result {
 "
 `;
 
+exports[`generation v2 file(./test/result/v2/core/Schema.ts): ./test/result/v2/core/Schema.ts 1`] = `
+"/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+export type FieldSchema = {
+    readonly type?: string;
+    readonly isReadOnly?: boolean;
+    readonly isRequired?: boolean;
+    readonly isNullable?: boolean;
+    readonly format?: string;
+    readonly maximum?: number;
+    readonly exclusiveMaximum?: boolean;
+    readonly minimum?: number;
+    readonly exclusiveMinimum?: boolean;
+    readonly multipleOf?: number;
+    readonly maxLength?: number;
+    readonly minLength?: number;
+    readonly pattern?: string;
+    readonly maxItems?: number;
+    readonly minItems?: number;
+    readonly uniqueItems?: boolean;
+    readonly maxProperties?: number;
+    readonly minProperties?: number;
+}
+
+export type ObjectSchema<T> = FieldSchema & {
+    properties?: {
+        readonly [K in keyof T]: Schema<T[K]>;
+    }
+}
+
+export type Schema<T> =
+    T extends string ? FieldSchema :
+    T extends number ? FieldSchema :
+    T extends boolean ? FieldSchema :
+    T extends File ? FieldSchema :
+    T extends Blob ? FieldSchema :
+    T extends Object ? ObjectSchema<T> :
+    FieldSchema
+"
+`;
+
 exports[`generation v2 file(./test/result/v2/core/getFormData.ts): ./test/result/v2/core/getFormData.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
@@ -236,7 +226,7 @@ import * as schemas from '../schemas';
  * Get a schema object for a given model name.
  * @param model The model name to return the schema from.
  */
-export function getSchema<K extends keyof typeof schemas>(model: K) {
+export function getSchema<K extends keyof typeof schemas, T>(model: K) {
     if (schemas.hasOwnProperty(model)) {
         return schemas[model];
     }
@@ -486,6 +476,7 @@ export { ApiError } from './core/ApiError';
 export { getSchema } from './core/getSchema';
 export { isSuccess } from './core/isSuccess';
 export { OpenAPI } from './core/OpenAPI';
+export { FieldSchema, Schema, ObjectSchema } from './core/Schema';
 export * from './models/';
 export * from './services/';
 "
@@ -1191,8 +1182,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithArray.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithArray } from '../models/ArrayWithArray';
 
-export const $ArrayWithArray = {
+export const $ArrayWithArray: __Schema<ArrayWithArray> = {
     type: 'Array',
 };"
 `;
@@ -1203,8 +1196,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithBooleans.ts): ./t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithBooleans } from '../models/ArrayWithBooleans';
 
-export const $ArrayWithBooleans = {
+export const $ArrayWithBooleans: __Schema<ArrayWithBooleans> = {
     type: 'Array',
 };"
 `;
@@ -1215,8 +1210,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithNumbers.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithNumbers } from '../models/ArrayWithNumbers';
 
-export const $ArrayWithNumbers = {
+export const $ArrayWithNumbers: __Schema<ArrayWithNumbers> = {
     type: 'Array',
 };"
 `;
@@ -1227,8 +1224,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithProperties.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithProperties } from '../models/ArrayWithProperties';
 
-export const $ArrayWithProperties = {
+export const $ArrayWithProperties: __Schema<ArrayWithProperties> = {
     type: 'Array',
 };"
 `;
@@ -1239,8 +1238,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithReferences.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithReferences } from '../models/ArrayWithReferences';
 
-export const $ArrayWithReferences = {
+export const $ArrayWithReferences: __Schema<ArrayWithReferences> = {
     type: 'Array',
 };"
 `;
@@ -1251,8 +1252,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ArrayWithStrings.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithStrings } from '../models/ArrayWithStrings';
 
-export const $ArrayWithStrings = {
+export const $ArrayWithStrings: __Schema<ArrayWithStrings> = {
     type: 'Array',
 };"
 `;
@@ -1275,8 +1278,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$DictionaryWithArray.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithArray } from '../models/DictionaryWithArray';
 
-export const $DictionaryWithArray = {
+export const $DictionaryWithArray: __Schema<DictionaryWithArray> = {
     type: 'Dictionary',
 };"
 `;
@@ -1287,8 +1292,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$DictionaryWithDictionary.t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithDictionary } from '../models/DictionaryWithDictionary';
 
-export const $DictionaryWithDictionary = {
+export const $DictionaryWithDictionary: __Schema<DictionaryWithDictionary> = {
     type: 'Dictionary',
 };"
 `;
@@ -1299,8 +1306,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$DictionaryWithProperties.t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithProperties } from '../models/DictionaryWithProperties';
 
-export const $DictionaryWithProperties = {
+export const $DictionaryWithProperties: __Schema<DictionaryWithProperties> = {
     type: 'Dictionary',
 };"
 `;
@@ -1311,8 +1320,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$DictionaryWithReference.ts
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithReference } from '../models/DictionaryWithReference';
 
-export const $DictionaryWithReference = {
+export const $DictionaryWithReference: __Schema<DictionaryWithReference> = {
     type: 'Dictionary',
 };"
 `;
@@ -1323,8 +1334,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$DictionaryWithString.ts):
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithString } from '../models/DictionaryWithString';
 
-export const $DictionaryWithString = {
+export const $DictionaryWithString: __Schema<DictionaryWithString> = {
     type: 'Dictionary',
 };"
 `;
@@ -1335,8 +1348,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$EnumFromDescription.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumFromDescription } from '../models/EnumFromDescription';
 
-export const $EnumFromDescription = {
+export const $EnumFromDescription: __Schema<EnumFromDescription> = {
     type: 'Enum',
 };"
 `;
@@ -1347,8 +1362,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$EnumWithNumbers.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumWithNumbers } from '../models/EnumWithNumbers';
 
-export const $EnumWithNumbers = {
+export const $EnumWithNumbers: __Schema<EnumWithNumbers> = {
     type: 'Enum',
 };"
 `;
@@ -1359,8 +1376,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$EnumWithStrings.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumWithStrings } from '../models/EnumWithStrings';
 
-export const $EnumWithStrings = {
+export const $EnumWithStrings: __Schema<EnumWithStrings> = {
     type: 'Enum',
 };"
 `;
@@ -1371,8 +1390,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelLink.ts): ./test/resu
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelLink } from '../models/ModelLink';
 
-export const $ModelLink = {
+export const $ModelLink: __Schema<ModelLink> = {
     properties: {
         id: {
             type: 'string',
@@ -1388,8 +1409,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelThatExtends.ts): ./te
 /* prettier-ignore */
 
 import { $ModelWithString } from './$ModelWithString';
+import { Schema as __Schema } from '../core/Schema';
+import { ModelThatExtends } from '../models/ModelThatExtends';
 
-export const $ModelThatExtends = {
+export const $ModelThatExtends: __Schema<ModelThatExtends> = {
     properties: {
         ...$ModelWithString.properties,
         propExtendsA: {
@@ -1410,8 +1433,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelThatExtendsExtends.ts
 
 import { $ModelWithString } from './$ModelWithString';
 import { $ModelThatExtends } from './$ModelThatExtends';
+import { Schema as __Schema } from '../core/Schema';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 
-export const $ModelThatExtendsExtends = {
+export const $ModelThatExtendsExtends: __Schema<ModelThatExtendsExtends> = {
     properties: {
         ...$ModelWithString.properties,
         ...$ModelThatExtends.properties,
@@ -1431,8 +1456,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithArray.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithArray } from '../models/ModelWithArray';
 
-export const $ModelWithArray = {
+export const $ModelWithArray: __Schema<ModelWithArray> = {
     properties: {
         prop: {
             type: 'Array',
@@ -1453,8 +1480,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithBoolean.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithBoolean } from '../models/ModelWithBoolean';
 
-export const $ModelWithBoolean = {
+export const $ModelWithBoolean: __Schema<ModelWithBoolean> = {
     properties: {
         prop: {
             type: 'boolean',
@@ -1469,8 +1498,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithCircularReference
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithCircularReference } from '../models/ModelWithCircularReference';
 
-export const $ModelWithCircularReference = {
+export const $ModelWithCircularReference: __Schema<ModelWithCircularReference> = {
     properties: {
         prop: {
             type: 'ModelWithCircularReference',
@@ -1485,8 +1516,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithDictionary.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDictionary } from '../models/ModelWithDictionary';
 
-export const $ModelWithDictionary = {
+export const $ModelWithDictionary: __Schema<ModelWithDictionary> = {
     properties: {
         prop: {
             type: 'Dictionary',
@@ -1501,8 +1534,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithDuplicateImports.
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDuplicateImports } from '../models/ModelWithDuplicateImports';
 
-export const $ModelWithDuplicateImports = {
+export const $ModelWithDuplicateImports: __Schema<ModelWithDuplicateImports> = {
     properties: {
         propA: {
             type: 'ModelWithString',
@@ -1523,8 +1558,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithDuplicateProperti
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDuplicateProperties } from '../models/ModelWithDuplicateProperties';
 
-export const $ModelWithDuplicateProperties = {
+export const $ModelWithDuplicateProperties: __Schema<ModelWithDuplicateProperties> = {
     properties: {
         prop: {
             type: 'ModelWithString',
@@ -1539,8 +1576,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithEnum.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithEnum } from '../models/ModelWithEnum';
 
-export const $ModelWithEnum = {
+export const $ModelWithEnum: __Schema<ModelWithEnum> = {
     properties: {
         test: {
             type: 'Enum',
@@ -1555,8 +1594,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithEnumFromDescripti
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithEnumFromDescription } from '../models/ModelWithEnumFromDescription';
 
-export const $ModelWithEnumFromDescription = {
+export const $ModelWithEnumFromDescription: __Schema<ModelWithEnumFromDescription> = {
     properties: {
         test: {
             type: 'Enum',
@@ -1571,8 +1612,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithInteger.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithInteger } from '../models/ModelWithInteger';
 
-export const $ModelWithInteger = {
+export const $ModelWithInteger: __Schema<ModelWithInteger> = {
     properties: {
         prop: {
             type: 'number',
@@ -1587,8 +1630,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithLink.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithLink } from '../models/ModelWithLink';
 
-export const $ModelWithLink = {
+export const $ModelWithLink: __Schema<ModelWithLink> = {
     properties: {
         prop: {
             type: 'ModelLink',
@@ -1603,8 +1648,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithNestedEnums.ts):
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithNestedEnums } from '../models/ModelWithNestedEnums';
 
-export const $ModelWithNestedEnums = {
+export const $ModelWithNestedEnums: __Schema<ModelWithNestedEnums> = {
     properties: {
         arrayWithDescription: {
             type: 'Array',
@@ -1628,8 +1675,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithNestedProperties.
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithNestedProperties } from '../models/ModelWithNestedProperties';
 
-export const $ModelWithNestedProperties = {
+export const $ModelWithNestedProperties: __Schema<ModelWithNestedProperties> = {
     properties: {
         first: {
             properties: {
@@ -1658,8 +1707,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithProperties.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithProperties } from '../models/ModelWithProperties';
 
-export const $ModelWithProperties = {
+export const $ModelWithProperties: __Schema<ModelWithProperties> = {
     properties: {
         boolean: {
             type: 'boolean',
@@ -1692,8 +1743,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithReference.ts): ./
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithReference } from '../models/ModelWithReference';
 
-export const $ModelWithReference = {
+export const $ModelWithReference: __Schema<ModelWithReference> = {
     properties: {
         prop: {
             type: 'ModelWithProperties',
@@ -1708,8 +1761,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$ModelWithString.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithString } from '../models/ModelWithString';
 
-export const $ModelWithString = {
+export const $ModelWithString: __Schema<ModelWithString> = {
     properties: {
         prop: {
             type: 'string',
@@ -1724,8 +1779,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$SimpleBoolean.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleBoolean } from '../models/SimpleBoolean';
 
-export const $SimpleBoolean = {
+export const $SimpleBoolean: __Schema<SimpleBoolean> = {
     type: 'boolean',
 };"
 `;
@@ -1736,8 +1793,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$SimpleFile.ts): ./test/res
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleFile } from '../models/SimpleFile';
 
-export const $SimpleFile = {
+export const $SimpleFile: __Schema<SimpleFile> = {
     type: 'File',
 };"
 `;
@@ -1748,8 +1807,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$SimpleInteger.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleInteger } from '../models/SimpleInteger';
 
-export const $SimpleInteger = {
+export const $SimpleInteger: __Schema<SimpleInteger> = {
     type: 'number',
 };"
 `;
@@ -1760,8 +1821,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$SimpleReference.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleReference } from '../models/SimpleReference';
 
-export const $SimpleReference = {
+export const $SimpleReference: __Schema<SimpleReference> = {
     type: 'ModelWithString',
 };"
 `;
@@ -1772,8 +1835,10 @@ exports[`generation v2 file(./test/result/v2/schemas/$SimpleString.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleString } from '../models/SimpleString';
 
-export const $SimpleString = {
+export const $SimpleString: __Schema<SimpleString> = {
     type: 'string',
 };"
 `;
@@ -1832,7 +1897,7 @@ exports[`generation v2 file(./test/result/v2/services/ComplexService.ts): ./test
 
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ComplexService {
@@ -1854,7 +1919,7 @@ export class ComplexService {
         parameterReference: ModelWithString,
     ): Promise<Array<ModelWithString>> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/complex\`,
             query: {
@@ -1886,7 +1951,7 @@ exports[`generation v2 file(./test/result/v2/services/DefaultsService.ts): ./tes
 
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class DefaultsService {
@@ -1909,7 +1974,7 @@ export class DefaultsService {
         },
     ): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/defaults\`,
             query: {
@@ -1936,7 +2001,7 @@ exports[`generation v2 file(./test/result/v2/services/ParametersService.ts): ./t
 /* prettier-ignore */
 
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ParametersService {
@@ -1955,7 +2020,7 @@ export class ParametersService {
         parameterBody: string,
     ): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/parameters\`,
             headers: {
@@ -1988,7 +2053,7 @@ import { ModelThatExtends } from '../models/ModelThatExtends';
 import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ResponseService {
@@ -1999,7 +2064,7 @@ export class ResponseService {
      */
     public static async callWithDuplicateResponses(): Promise<ModelWithString> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'post',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -2023,7 +2088,7 @@ export class ResponseService {
      */
     public static async callWithResponse(): Promise<ModelWithString> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -2041,7 +2106,7 @@ export class ResponseService {
      */
     public static async callWithResponses(): Promise<ModelWithString | ModelThatExtends | ModelThatExtendsExtends> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'put',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -2069,7 +2134,7 @@ exports[`generation v2 file(./test/result/v2/services/SimpleService.ts): ./test/
 /* prettier-ignore */
 
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class SimpleService {
@@ -2079,7 +2144,7 @@ export class SimpleService {
      */
     public static async deleteCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'delete',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2094,7 +2159,7 @@ export class SimpleService {
      */
     public static async getCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2109,7 +2174,7 @@ export class SimpleService {
      */
     public static async headCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'head',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2124,7 +2189,7 @@ export class SimpleService {
      */
     public static async optionsCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'options',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2139,7 +2204,7 @@ export class SimpleService {
      */
     public static async patchCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'patch',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2154,7 +2219,7 @@ export class SimpleService {
      */
     public static async postCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'post',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2169,7 +2234,7 @@ export class SimpleService {
      */
     public static async putCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'put',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -2190,7 +2255,7 @@ exports[`generation v2 file(./test/result/v2/services/TypesService.ts): ./test/r
 
 import { Dictionary } from '../models/Dictionary';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class TypesService {
@@ -2221,7 +2286,7 @@ export class TypesService {
         id?: number,
     ): Promise<number | string | boolean | any> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/types\`,
             query: {
@@ -2319,60 +2384,6 @@ export function catchGenericError(result: Result): void {
 "
 `;
 
-exports[`generation v3 file(./test/result/v3/core/Definition.ts): ./test/result/v3/core/Definition.ts 1`] = `
-"/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-/* prettier-ignore */
-
-import { Dictionary } from '../models/Dictionary';
-
-export type FieldDefinition = {
-    readonly type?: string;
-    readonly isReadOnly?: boolean;
-    readonly isRequired?: boolean;
-    readonly isNullable?: boolean;
-    readonly format?: string;
-    readonly maximum?: number;
-    readonly exclusiveMaximum?: boolean;
-    readonly minimum?: number;
-    readonly exclusiveMinimum?: boolean;
-    readonly multipleOf?: number;
-    readonly maxLength?: number;
-    readonly minLength?: number;
-    readonly pattern?: string;
-    readonly maxItems?: number;
-    readonly minItems?: number;
-    readonly uniqueItems?: boolean;
-    readonly maxProperties?: number;
-    readonly minProperties?: number;
-}
-
-type ArrayDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type DictionaryDefinition<T> = FieldDefinition & {
-    readonly item: Definition<T>;
-}
-
-type ObjectDefinition<T> = FieldDefinition & {
-        readonly [K in keyof T]: Definition<T[K]>;
-    }
-
-export type Definition<T> =
-    T extends string ? FieldDefinition :
-    T extends number ? FieldDefinition :
-    T extends boolean ? FieldDefinition :
-    T extends File ? FieldDefinition :
-    T extends Blob ? FieldDefinition :
-    T extends Array<infer U> ? ArrayDefinition<U> :
-    T extends Dictionary<infer U> ? DictionaryDefinition<U> :
-    T extends Object ? ObjectDefinition<T> :
-    FieldDefinition
-"
-`;
-
 exports[`generation v3 file(./test/result/v3/core/OpenAPI.ts): ./test/result/v3/core/OpenAPI.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
@@ -2421,6 +2432,50 @@ export interface Result {
 "
 `;
 
+exports[`generation v3 file(./test/result/v3/core/Schema.ts): ./test/result/v3/core/Schema.ts 1`] = `
+"/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+export type FieldSchema = {
+    readonly type?: string;
+    readonly isReadOnly?: boolean;
+    readonly isRequired?: boolean;
+    readonly isNullable?: boolean;
+    readonly format?: string;
+    readonly maximum?: number;
+    readonly exclusiveMaximum?: boolean;
+    readonly minimum?: number;
+    readonly exclusiveMinimum?: boolean;
+    readonly multipleOf?: number;
+    readonly maxLength?: number;
+    readonly minLength?: number;
+    readonly pattern?: string;
+    readonly maxItems?: number;
+    readonly minItems?: number;
+    readonly uniqueItems?: boolean;
+    readonly maxProperties?: number;
+    readonly minProperties?: number;
+}
+
+export type ObjectSchema<T> = FieldSchema & {
+    properties?: {
+        readonly [K in keyof T]: Schema<T[K]>;
+    }
+}
+
+export type Schema<T> =
+    T extends string ? FieldSchema :
+    T extends number ? FieldSchema :
+    T extends boolean ? FieldSchema :
+    T extends File ? FieldSchema :
+    T extends Blob ? FieldSchema :
+    T extends Object ? ObjectSchema<T> :
+    FieldSchema
+"
+`;
+
 exports[`generation v3 file(./test/result/v3/core/getFormData.ts): ./test/result/v3/core/getFormData.ts 1`] = `
 "/* istanbul ignore file */
 /* tslint:disable */
@@ -2494,7 +2549,7 @@ import * as schemas from '../schemas';
  * Get a schema object for a given model name.
  * @param model The model name to return the schema from.
  */
-export function getSchema<K extends keyof typeof schemas>(model: K) {
+export function getSchema<K extends keyof typeof schemas, T>(model: K) {
     if (schemas.hasOwnProperty(model)) {
         return schemas[model];
     }
@@ -2744,6 +2799,7 @@ export { ApiError } from './core/ApiError';
 export { getSchema } from './core/getSchema';
 export { isSuccess } from './core/isSuccess';
 export { OpenAPI } from './core/OpenAPI';
+export { FieldSchema, Schema, ObjectSchema } from './core/Schema';
 export * from './models/';
 export * from './services/';
 "
@@ -3450,8 +3506,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithArray.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithArray } from '../models/ArrayWithArray';
 
-export const $ArrayWithArray = {
+export const $ArrayWithArray: __Schema<ArrayWithArray> = {
     type: 'Array',
 };"
 `;
@@ -3462,8 +3520,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithBooleans.ts): ./t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithBooleans } from '../models/ArrayWithBooleans';
 
-export const $ArrayWithBooleans = {
+export const $ArrayWithBooleans: __Schema<ArrayWithBooleans> = {
     type: 'Array',
 };"
 `;
@@ -3474,8 +3534,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithNumbers.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithNumbers } from '../models/ArrayWithNumbers';
 
-export const $ArrayWithNumbers = {
+export const $ArrayWithNumbers: __Schema<ArrayWithNumbers> = {
     type: 'Array',
 };"
 `;
@@ -3486,8 +3548,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithProperties.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithProperties } from '../models/ArrayWithProperties';
 
-export const $ArrayWithProperties = {
+export const $ArrayWithProperties: __Schema<ArrayWithProperties> = {
     type: 'Array',
 };"
 `;
@@ -3498,8 +3562,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithReferences.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithReferences } from '../models/ArrayWithReferences';
 
-export const $ArrayWithReferences = {
+export const $ArrayWithReferences: __Schema<ArrayWithReferences> = {
     type: 'Array',
 };"
 `;
@@ -3510,8 +3576,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ArrayWithStrings.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ArrayWithStrings } from '../models/ArrayWithStrings';
 
-export const $ArrayWithStrings = {
+export const $ArrayWithStrings: __Schema<ArrayWithStrings> = {
     type: 'Array',
 };"
 `;
@@ -3534,8 +3602,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$DictionaryWithArray.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithArray } from '../models/DictionaryWithArray';
 
-export const $DictionaryWithArray = {
+export const $DictionaryWithArray: __Schema<DictionaryWithArray> = {
     type: 'Dictionary',
 };"
 `;
@@ -3546,8 +3616,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$DictionaryWithDictionary.t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithDictionary } from '../models/DictionaryWithDictionary';
 
-export const $DictionaryWithDictionary = {
+export const $DictionaryWithDictionary: __Schema<DictionaryWithDictionary> = {
     type: 'Dictionary',
 };"
 `;
@@ -3558,8 +3630,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$DictionaryWithProperties.t
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithProperties } from '../models/DictionaryWithProperties';
 
-export const $DictionaryWithProperties = {
+export const $DictionaryWithProperties: __Schema<DictionaryWithProperties> = {
     type: 'Dictionary',
 };"
 `;
@@ -3570,8 +3644,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$DictionaryWithReference.ts
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithReference } from '../models/DictionaryWithReference';
 
-export const $DictionaryWithReference = {
+export const $DictionaryWithReference: __Schema<DictionaryWithReference> = {
     type: 'Dictionary',
 };"
 `;
@@ -3582,8 +3658,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$DictionaryWithString.ts):
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { DictionaryWithString } from '../models/DictionaryWithString';
 
-export const $DictionaryWithString = {
+export const $DictionaryWithString: __Schema<DictionaryWithString> = {
     type: 'Dictionary',
 };"
 `;
@@ -3594,8 +3672,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$EnumFromDescription.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumFromDescription } from '../models/EnumFromDescription';
 
-export const $EnumFromDescription = {
+export const $EnumFromDescription: __Schema<EnumFromDescription> = {
     type: 'Enum',
 };"
 `;
@@ -3606,8 +3686,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$EnumWithNumbers.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumWithNumbers } from '../models/EnumWithNumbers';
 
-export const $EnumWithNumbers = {
+export const $EnumWithNumbers: __Schema<EnumWithNumbers> = {
     type: 'Enum',
 };"
 `;
@@ -3618,8 +3700,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$EnumWithStrings.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { EnumWithStrings } from '../models/EnumWithStrings';
 
-export const $EnumWithStrings = {
+export const $EnumWithStrings: __Schema<EnumWithStrings> = {
     type: 'Enum',
 };"
 `;
@@ -3630,8 +3714,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelLink.ts): ./test/resu
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelLink } from '../models/ModelLink';
 
-export const $ModelLink = {
+export const $ModelLink: __Schema<ModelLink> = {
     properties: {
         id: {
             type: 'string',
@@ -3647,8 +3733,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelThatExtends.ts): ./te
 /* prettier-ignore */
 
 import { $ModelWithString } from './$ModelWithString';
+import { Schema as __Schema } from '../core/Schema';
+import { ModelThatExtends } from '../models/ModelThatExtends';
 
-export const $ModelThatExtends = {
+export const $ModelThatExtends: __Schema<ModelThatExtends> = {
     properties: {
         ...$ModelWithString.properties,
         propExtendsA: {
@@ -3669,8 +3757,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelThatExtendsExtends.ts
 
 import { $ModelWithString } from './$ModelWithString';
 import { $ModelThatExtends } from './$ModelThatExtends';
+import { Schema as __Schema } from '../core/Schema';
+import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 
-export const $ModelThatExtendsExtends = {
+export const $ModelThatExtendsExtends: __Schema<ModelThatExtendsExtends> = {
     properties: {
         ...$ModelWithString.properties,
         ...$ModelThatExtends.properties,
@@ -3690,8 +3780,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithArray.ts): ./test
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithArray } from '../models/ModelWithArray';
 
-export const $ModelWithArray = {
+export const $ModelWithArray: __Schema<ModelWithArray> = {
     properties: {
         prop: {
             type: 'Array',
@@ -3712,8 +3804,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithBoolean.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithBoolean } from '../models/ModelWithBoolean';
 
-export const $ModelWithBoolean = {
+export const $ModelWithBoolean: __Schema<ModelWithBoolean> = {
     properties: {
         prop: {
             type: 'boolean',
@@ -3728,8 +3822,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithCircularReference
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithCircularReference } from '../models/ModelWithCircularReference';
 
-export const $ModelWithCircularReference = {
+export const $ModelWithCircularReference: __Schema<ModelWithCircularReference> = {
     properties: {
         prop: {
             type: 'ModelWithCircularReference',
@@ -3744,8 +3840,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithDictionary.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDictionary } from '../models/ModelWithDictionary';
 
-export const $ModelWithDictionary = {
+export const $ModelWithDictionary: __Schema<ModelWithDictionary> = {
     properties: {
         prop: {
             type: 'Dictionary',
@@ -3760,8 +3858,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithDuplicateImports.
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDuplicateImports } from '../models/ModelWithDuplicateImports';
 
-export const $ModelWithDuplicateImports = {
+export const $ModelWithDuplicateImports: __Schema<ModelWithDuplicateImports> = {
     properties: {
         propA: {
             type: 'ModelWithString',
@@ -3782,8 +3882,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithDuplicateProperti
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithDuplicateProperties } from '../models/ModelWithDuplicateProperties';
 
-export const $ModelWithDuplicateProperties = {
+export const $ModelWithDuplicateProperties: __Schema<ModelWithDuplicateProperties> = {
     properties: {
         prop: {
             type: 'ModelWithString',
@@ -3798,8 +3900,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithEnum.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithEnum } from '../models/ModelWithEnum';
 
-export const $ModelWithEnum = {
+export const $ModelWithEnum: __Schema<ModelWithEnum> = {
     properties: {
         Test: {
             type: 'Enum',
@@ -3814,8 +3918,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithEnumFromDescripti
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithEnumFromDescription } from '../models/ModelWithEnumFromDescription';
 
-export const $ModelWithEnumFromDescription = {
+export const $ModelWithEnumFromDescription: __Schema<ModelWithEnumFromDescription> = {
     properties: {
         Test: {
             type: 'Enum',
@@ -3830,8 +3936,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithInteger.ts): ./te
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithInteger } from '../models/ModelWithInteger';
 
-export const $ModelWithInteger = {
+export const $ModelWithInteger: __Schema<ModelWithInteger> = {
     properties: {
         prop: {
             type: 'number',
@@ -3846,8 +3954,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithLink.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithLink } from '../models/ModelWithLink';
 
-export const $ModelWithLink = {
+export const $ModelWithLink: __Schema<ModelWithLink> = {
     properties: {
         prop: {
             type: 'ModelLink',
@@ -3862,8 +3972,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithNestedEnums.ts):
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithNestedEnums } from '../models/ModelWithNestedEnums';
 
-export const $ModelWithNestedEnums = {
+export const $ModelWithNestedEnums: __Schema<ModelWithNestedEnums> = {
     properties: {
         arrayWithDescription: {
             type: 'Array',
@@ -3887,8 +3999,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithNestedProperties.
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithNestedProperties } from '../models/ModelWithNestedProperties';
 
-export const $ModelWithNestedProperties = {
+export const $ModelWithNestedProperties: __Schema<ModelWithNestedProperties> = {
     properties: {
         first: {
             properties: {
@@ -3920,8 +4034,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithProperties.ts): .
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithProperties } from '../models/ModelWithProperties';
 
-export const $ModelWithProperties = {
+export const $ModelWithProperties: __Schema<ModelWithProperties> = {
     properties: {
         boolean: {
             type: 'boolean',
@@ -3959,8 +4075,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithReference.ts): ./
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithReference } from '../models/ModelWithReference';
 
-export const $ModelWithReference = {
+export const $ModelWithReference: __Schema<ModelWithReference> = {
     properties: {
         prop: {
             type: 'ModelWithProperties',
@@ -3975,8 +4093,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$ModelWithString.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { ModelWithString } from '../models/ModelWithString';
 
-export const $ModelWithString = {
+export const $ModelWithString: __Schema<ModelWithString> = {
     properties: {
         prop: {
             type: 'string',
@@ -3991,8 +4111,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$SimpleBoolean.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleBoolean } from '../models/SimpleBoolean';
 
-export const $SimpleBoolean = {
+export const $SimpleBoolean: __Schema<SimpleBoolean> = {
     type: 'boolean',
 };"
 `;
@@ -4003,8 +4125,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$SimpleFile.ts): ./test/res
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleFile } from '../models/SimpleFile';
 
-export const $SimpleFile = {
+export const $SimpleFile: __Schema<SimpleFile> = {
     type: 'File',
 };"
 `;
@@ -4015,8 +4139,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$SimpleInteger.ts): ./test/
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleInteger } from '../models/SimpleInteger';
 
-export const $SimpleInteger = {
+export const $SimpleInteger: __Schema<SimpleInteger> = {
     type: 'number',
 };"
 `;
@@ -4027,8 +4153,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$SimpleReference.ts): ./tes
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleReference } from '../models/SimpleReference';
 
-export const $SimpleReference = {
+export const $SimpleReference: __Schema<SimpleReference> = {
     type: 'ModelWithString',
 };"
 `;
@@ -4039,8 +4167,10 @@ exports[`generation v3 file(./test/result/v3/schemas/$SimpleString.ts): ./test/r
 /* eslint-disable */
 /* prettier-ignore */
 
+import { Schema as __Schema } from '../core/Schema';
+import { SimpleString } from '../models/SimpleString';
 
-export const $SimpleString = {
+export const $SimpleString: __Schema<SimpleString> = {
     type: 'string',
 };"
 `;
@@ -4099,7 +4229,7 @@ exports[`generation v3 file(./test/result/v3/services/ComplexService.ts): ./test
 
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ComplexService {
@@ -4121,7 +4251,7 @@ export class ComplexService {
         },
     ): Promise<Array<ModelWithString>> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/complex\`,
             query: {
@@ -4153,7 +4283,7 @@ exports[`generation v3 file(./test/result/v3/services/DefaultsService.ts): ./tes
 
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class DefaultsService {
@@ -4176,7 +4306,7 @@ export class DefaultsService {
         },
     ): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/defaults\`,
             query: {
@@ -4203,7 +4333,7 @@ exports[`generation v3 file(./test/result/v3/services/MultipartService.ts): ./te
 /* prettier-ignore */
 
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class MultipartService {
@@ -4220,7 +4350,7 @@ export class MultipartService {
         },
     }> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/multipart\`,
         });
@@ -4241,7 +4371,7 @@ exports[`generation v3 file(./test/result/v3/services/ParametersService.ts): ./t
 
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ParametersService {
@@ -4262,7 +4392,7 @@ export class ParametersService {
         requestBody?: ModelWithString,
     ): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/parameters\`,
             cookies: {
@@ -4298,7 +4428,7 @@ import { ModelThatExtends } from '../models/ModelThatExtends';
 import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class ResponseService {
@@ -4309,7 +4439,7 @@ export class ResponseService {
      */
     public static async callWithDuplicateResponses(): Promise<ModelWithString> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'post',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -4333,7 +4463,7 @@ export class ResponseService {
      */
     public static async callWithResponse(): Promise<ModelWithString> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -4351,7 +4481,7 @@ export class ResponseService {
      */
     public static async callWithResponses(): Promise<ModelWithString | ModelThatExtends | ModelThatExtendsExtends> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'put',
             path: \`/api/v\${OpenAPI.VERSION}/response\`,
         });
@@ -4379,7 +4509,7 @@ exports[`generation v3 file(./test/result/v3/services/SimpleService.ts): ./test/
 /* prettier-ignore */
 
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class SimpleService {
@@ -4389,7 +4519,7 @@ export class SimpleService {
      */
     public static async deleteCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'delete',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4404,7 +4534,7 @@ export class SimpleService {
      */
     public static async getCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4419,7 +4549,7 @@ export class SimpleService {
      */
     public static async headCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'head',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4434,7 +4564,7 @@ export class SimpleService {
      */
     public static async optionsCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'options',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4449,7 +4579,7 @@ export class SimpleService {
      */
     public static async patchCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'patch',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4464,7 +4594,7 @@ export class SimpleService {
      */
     public static async postCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'post',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4479,7 +4609,7 @@ export class SimpleService {
      */
     public static async putCallWithoutParametersAndResponse(): Promise<void> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'put',
             path: \`/api/v\${OpenAPI.VERSION}/simple\`,
         });
@@ -4499,7 +4629,7 @@ exports[`generation v3 file(./test/result/v3/services/TypesService.ts): ./test/r
 /* prettier-ignore */
 
 import { ApiError, catchGenericError } from '../core/ApiError';
-import { request as $request } from '../core/request';
+import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
 export class TypesService {
@@ -4530,7 +4660,7 @@ export class TypesService {
         id?: number,
     ): Promise<number | string | boolean | any> {
 
-        const result = await $request({
+        const result = await __request({
             method: 'get',
             path: \`/api/v\${OpenAPI.VERSION}/types\`,
             query: {