diff --git a/src/client/interfaces/Model.d.ts b/src/client/interfaces/Model.d.ts
index f676cf82..53972d86 100644
--- a/src/client/interfaces/Model.d.ts
+++ b/src/client/interfaces/Model.d.ts
@@ -1,5 +1,6 @@
 import { ModelProperty } from './ModelProperty';
 import { Enum } from './Enum';
+import { EnumValue } from './EnumValue';
 
 export interface Model {
     isInterface: boolean;
@@ -14,5 +15,6 @@ export interface Model {
     extends: string | null;
     imports: string[];
     enums: Enum[];
+    values: EnumValue[];
     properties: ModelProperty[];
 }
diff --git a/src/utils/cleanupModels.spec.ts b/src/utils/cleanupModels.spec.ts
new file mode 100644
index 00000000..a4f48645
--- /dev/null
+++ b/src/utils/cleanupModels.spec.ts
@@ -0,0 +1,5 @@
+describe('cleanupModels', () => {
+    it('should cleanup models', () => {
+        // TODO
+    });
+});
diff --git a/src/utils/cleanupServices.spec.ts b/src/utils/cleanupServices.spec.ts
new file mode 100644
index 00000000..496cb029
--- /dev/null
+++ b/src/utils/cleanupServices.spec.ts
@@ -0,0 +1,5 @@
+describe('cleanupServices', () => {
+    it('should cleanup services', () => {
+        // TODO
+    });
+});
diff --git a/src/utils/getSortedModels.spec.ts b/src/utils/getSortedModels.spec.ts
index 068f64f8..2527a6c9 100644
--- a/src/utils/getSortedModels.spec.ts
+++ b/src/utils/getSortedModels.spec.ts
@@ -16,6 +16,7 @@ describe('getSortedModels', () => {
                 description: null,
                 extends: null,
                 imports: [],
+                values: [],
                 properties: [],
                 enums: [],
             },
@@ -31,6 +32,7 @@ describe('getSortedModels', () => {
                 description: null,
                 extends: null,
                 imports: [],
+                values: [],
                 properties: [],
                 enums: [],
             },
@@ -46,6 +48,7 @@ describe('getSortedModels', () => {
                 description: null,
                 extends: null,
                 imports: [],
+                values: [],
                 properties: [],
                 enums: [],
             },
diff --git a/src/utils/writeClient.spec.ts b/src/utils/writeClient.spec.ts
index 93d6bcfd..adec8222 100644
--- a/src/utils/writeClient.spec.ts
+++ b/src/utils/writeClient.spec.ts
@@ -3,9 +3,7 @@ import * as mkdirp from 'mkdirp';
 import * as rimraf from 'rimraf';
 import * as fs from 'fs';
 import { Client } from '../client/interfaces/Client';
-import { Model } from '../client/interfaces/Model';
 import { Templates } from './readHandlebarsTemplates';
-import { Service } from '../client/interfaces/Service';
 import { Language } from '../index';
 import * as glob from 'glob';
 
diff --git a/src/utils/writeClientIndex.spec.ts b/src/utils/writeClientIndex.spec.ts
index 62cdb2c0..e7e226a0 100644
--- a/src/utils/writeClientIndex.spec.ts
+++ b/src/utils/writeClientIndex.spec.ts
@@ -1,8 +1,6 @@
 import { writeClientIndex } from './writeClientIndex';
 import * as fs from 'fs';
 import { Client } from '../client/interfaces/Client';
-import { Model } from '../client/interfaces/Model';
-import { Service } from '../client/interfaces/Service';
 import { Language } from '../index';
 
 jest.mock('fs');
diff --git a/src/utils/writeClientModels.spec.ts b/src/utils/writeClientModels.spec.ts
index 53300301..cd58fbd8 100644
--- a/src/utils/writeClientModels.spec.ts
+++ b/src/utils/writeClientModels.spec.ts
@@ -22,6 +22,7 @@ describe('writeClientModels', () => {
                 description: null,
                 extends: null,
                 imports: [],
+                values: [],
                 properties: [],
                 enums: [],
             },