diff --git a/src/abstractions/cipher.service.ts b/src/abstractions/cipher.service.ts
index d68aa99549..58f092b696 100644
--- a/src/abstractions/cipher.service.ts
+++ b/src/abstractions/cipher.service.ts
@@ -1,8 +1,8 @@
-import { CipherData } from '../models/data';
+import { CipherData } from '../models/data/cipherData';
 
-import { Cipher } from '../models/domain';
-import { Field } from '../models/domain';
-import { SymmetricCryptoKey } from '../models/domain';
+import { Cipher } from '../models/domain/cipher';
+import { Field } from '../models/domain/field';
+import { SymmetricCryptoKey } from '../models/domain/symmetricCryptoKey';
 
 export interface CipherService {
     decryptedCipherCache: any[];
diff --git a/src/services/collection.service.ts b/src/services/collection.service.ts
index c409925cd7..35327f1e2a 100644
--- a/src/services/collection.service.ts
+++ b/src/services/collection.service.ts
@@ -2,6 +2,7 @@ import { CollectionData } from '../models/data/collectionData';
 
 import { Collection } from '../models/domain/collection';
 
+import { CollectionService as CollectionServiceInterface } from '../abstractions/collection.service';
 import { CryptoService } from '../abstractions/crypto.service';
 import { StorageService } from '../abstractions/storage.service';
 import { UserService } from '../abstractions/user.service';
@@ -10,7 +11,7 @@ const Keys = {
     collectionsPrefix: 'collections_',
 };
 
-export class CollectionService {
+export class CollectionService implements CollectionServiceInterface {
     decryptedCollectionCache: any[];
 
     constructor(private cryptoService: CryptoService, private userService: UserService,
diff --git a/src/services/environment.service.ts b/src/services/environment.service.ts
index 292ee89a4d..2ba63ad6bf 100644
--- a/src/services/environment.service.ts
+++ b/src/services/environment.service.ts
@@ -6,7 +6,7 @@ import { ApiService } from '../abstractions/api.service';
 import { EnvironmentService as EnvironmentServiceInterface } from '../abstractions/environment.service';
 import { StorageService } from '../abstractions/storage.service';
 
-export class EnvironmentService {
+export class EnvironmentService implements EnvironmentServiceInterface {
     baseUrl: string;
     webVaultUrl: string;
     apiUrl: string;
diff --git a/src/services/settings.service.ts b/src/services/settings.service.ts
index 0f1227c7a8..87302a638c 100644
--- a/src/services/settings.service.ts
+++ b/src/services/settings.service.ts
@@ -7,7 +7,7 @@ const Keys = {
     equivalentDomains: 'equivalentDomains',
 };
 
-export class SettingsService {
+export class SettingsService implements SettingsServiceInterface {
     private settingsCache: any;
 
     constructor(private userService: UserService, private storageService: StorageService) {