diff --git a/overlord/src/app/account/account-list-resolver.service.spec.ts b/overlord/src/app/account/account-list-resolver.service.spec.ts
deleted file mode 100644
index ce9f77dd..00000000
--- a/overlord/src/app/account/account-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { AccountListResolver } from './account-list-resolver.service';
-
-describe('AccountListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [AccountListResolver],
-    });
-  });
-
-  it('should be created', inject([AccountListResolver], (service: AccountListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/account/account-list-resolver.service.ts b/overlord/src/app/account/account-list-resolver.service.ts
deleted file mode 100644
index fb09a6f1..00000000
--- a/overlord/src/app/account/account-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountListResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(): Observable<Account[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/account/account-list.resolver.spec.ts b/overlord/src/app/account/account-list.resolver.spec.ts
new file mode 100644
index 00000000..6aa7673c
--- /dev/null
+++ b/overlord/src/app/account/account-list.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+
+import { accountListResolver } from './account-list.resolver';
+
+describe('accountListResolver', () => {
+  const executeResolver: ResolveFn<Account[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => accountListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/account/account-list.resolver.ts b/overlord/src/app/account/account-list.resolver.ts
new file mode 100644
index 00000000..c63baed3
--- /dev/null
+++ b/overlord/src/app/account/account-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const accountListResolver: ResolveFn<Account[]> = () => {
+  return inject(AccountService).list();
+};
diff --git a/overlord/src/app/account/account-resolver.service.spec.ts b/overlord/src/app/account/account-resolver.service.spec.ts
deleted file mode 100644
index 85afcfaf..00000000
--- a/overlord/src/app/account/account-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { AccountResolver } from './account-resolver.service';
-
-describe('AccountResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [AccountResolver],
-    });
-  });
-
-  it('should be created', inject([AccountResolver], (service: AccountResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/account/account-resolver.service.ts b/overlord/src/app/account/account-resolver.service.ts
deleted file mode 100644
index 35fe496a..00000000
--- a/overlord/src/app/account/account-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Account> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/account/account-routing.module.ts b/overlord/src/app/account/account-routing.module.ts
index 71749d6d..ddc7eb80 100644
--- a/overlord/src/app/account/account-routing.module.ts
+++ b/overlord/src/app/account/account-routing.module.ts
@@ -3,13 +3,13 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
 import { AccountDetailComponent } from './account-detail/account-detail.component';
 import { AccountListComponent } from './account-list/account-list.component';
-import { AccountListResolver } from './account-list-resolver.service';
-import { AccountResolver } from './account-resolver.service';
-import { AccountTypeResolver } from './account-type-resolver.service';
+import { accountListResolver } from './account-list.resolver';
+import { accountTypeResolver } from './account-type.resolver';
+import { accountResolver } from './account.resolver';
 
 const accountRoutes: Routes = [
   {
@@ -22,8 +22,8 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      list: () => inject(AccountListResolver).resolve(),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
+      list: accountListResolver,
+      accountTypes: accountTypeResolver,
     },
   },
   {
@@ -36,9 +36,9 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: accountResolver,
+      accountTypes: accountTypeResolver,
+      costCentres: costCentreListResolver,
     },
   },
   {
@@ -51,9 +51,9 @@ const accountRoutes: Routes = [
       permission: 'Accounts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(AccountResolver).resolve(route),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: accountResolver,
+      accountTypes: accountTypeResolver,
+      costCentres: costCentreListResolver,
     },
   },
 ];
@@ -61,6 +61,5 @@ const accountRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(accountRoutes)],
   exports: [RouterModule],
-  providers: [AccountListResolver, AccountResolver],
 })
 export class AccountRoutingModule {}
diff --git a/overlord/src/app/account/account-type-resolver.service.spec.ts b/overlord/src/app/account/account-type-resolver.service.spec.ts
deleted file mode 100644
index a996ef88..00000000
--- a/overlord/src/app/account/account-type-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { AccountTypeResolver } from './account-type-resolver.service';
-
-describe('AccountTypeResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [AccountTypeResolver],
-    });
-  });
-
-  it('should be created', inject([AccountTypeResolver], (service: AccountTypeResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/account/account-type-resolver.service.ts b/overlord/src/app/account/account-type-resolver.service.ts
deleted file mode 100644
index fdbd4a62..00000000
--- a/overlord/src/app/account/account-type-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { AccountType } from '../core/account-type';
-
-import { AccountTypeService } from './account-type.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AccountTypeResolver {
-  constructor(private ser: AccountTypeService) {}
-
-  resolve(): Observable<AccountType[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/account/account-type.resolver.spec.ts b/overlord/src/app/account/account-type.resolver.spec.ts
new file mode 100644
index 00000000..7233f17d
--- /dev/null
+++ b/overlord/src/app/account/account-type.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { AccountType } from '../core/account-type';
+
+import { accountTypeResolver } from './account-type.resolver';
+
+describe('accountTypeResolver', () => {
+  const executeResolver: ResolveFn<AccountType[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => accountTypeResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/account/account-type.resolver.ts b/overlord/src/app/account/account-type.resolver.ts
new file mode 100644
index 00000000..ae82ffb6
--- /dev/null
+++ b/overlord/src/app/account/account-type.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { AccountType } from '../core/account-type';
+
+import { AccountTypeService } from './account-type.service';
+
+export const accountTypeResolver: ResolveFn<AccountType[]> = () => {
+  return inject(AccountTypeService).list();
+};
diff --git a/overlord/src/app/account/account.resolver.spec.ts b/overlord/src/app/account/account.resolver.spec.ts
new file mode 100644
index 00000000..2eb812a8
--- /dev/null
+++ b/overlord/src/app/account/account.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+
+import { accountResolver } from './account.resolver';
+
+describe('accountResolver', () => {
+  const executeResolver: ResolveFn<Account> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => accountResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/account/account.resolver.ts b/overlord/src/app/account/account.resolver.ts
new file mode 100644
index 00000000..e8957738
--- /dev/null
+++ b/overlord/src/app/account/account.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const accountResolver: ResolveFn<Account> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(AccountService).get(id);
+};
diff --git a/overlord/src/app/attendance/attendance-resolver.service.spec.ts b/overlord/src/app/attendance/attendance-resolver.service.spec.ts
deleted file mode 100644
index c75b877e..00000000
--- a/overlord/src/app/attendance/attendance-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { AttendanceResolver } from './attendance-resolver.service';
-
-describe('AttendanceResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [AttendanceResolver],
-    });
-  });
-
-  it('should be created', inject([AttendanceResolver], (service: AttendanceResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/attendance/attendance-resolver.service.ts b/overlord/src/app/attendance/attendance-resolver.service.ts
deleted file mode 100644
index 616c0b7d..00000000
--- a/overlord/src/app/attendance/attendance-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Attendance } from './attendance';
-import { AttendanceService } from './attendance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AttendanceResolver {
-  constructor(private ser: AttendanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Attendance> {
-    const date = route.paramMap.get('date');
-    return this.ser.get(date);
-  }
-}
diff --git a/overlord/src/app/attendance/attendance-routing.module.ts b/overlord/src/app/attendance/attendance-routing.module.ts
index 5e0fff3e..f419d1b9 100644
--- a/overlord/src/app/attendance/attendance-routing.module.ts
+++ b/overlord/src/app/attendance/attendance-routing.module.ts
@@ -4,9 +4,9 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { AttendanceResolver } from './attendance-resolver.service';
-import { AttendanceTypeResolver } from './attendance-type-resolver.service';
+import { attendanceTypeResolver } from './attendance-type.resolver';
 import { AttendanceComponent } from './attendance.component';
+import { attendanceResolver } from './attendance.resolver';
 
 const attendanceRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const attendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(AttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: attendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const attendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(AttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: attendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const attendanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(attendanceRoutes)],
   exports: [RouterModule],
-  providers: [AttendanceResolver],
 })
 export class AttendanceRoutingModule {}
diff --git a/overlord/src/app/attendance/attendance-type-resolver.service.ts b/overlord/src/app/attendance/attendance-type-resolver.service.ts
deleted file mode 100644
index 68a7f8b8..00000000
--- a/overlord/src/app/attendance/attendance-type-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { AttendanceType } from './attendance-type';
-import { AttendanceTypeService } from './attendance-type.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AttendanceTypeResolver {
-  constructor(private ser: AttendanceTypeService) {}
-
-  resolve(): Observable<AttendanceType[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/attendance/attendance-type.resolver.ts b/overlord/src/app/attendance/attendance-type.resolver.ts
new file mode 100644
index 00000000..b64d2136
--- /dev/null
+++ b/overlord/src/app/attendance/attendance-type.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { AttendanceType } from './attendance-type';
+import { AttendanceTypeService } from './attendance-type.service';
+
+export const attendanceTypeResolver: ResolveFn<AttendanceType[]> = () => {
+  return inject(AttendanceTypeService).list();
+};
diff --git a/overlord/src/app/attendance/attendance.resolver.spec.ts b/overlord/src/app/attendance/attendance.resolver.spec.ts
new file mode 100644
index 00000000..4003fad9
--- /dev/null
+++ b/overlord/src/app/attendance/attendance.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Attendance } from './attendance';
+import { attendanceResolver } from './attendance.resolver';
+
+describe('attendanceResolver', () => {
+  const executeResolver: ResolveFn<Attendance> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => attendanceResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/attendance/attendance.resolver.ts b/overlord/src/app/attendance/attendance.resolver.ts
new file mode 100644
index 00000000..3c131671
--- /dev/null
+++ b/overlord/src/app/attendance/attendance.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Attendance } from './attendance';
+import { AttendanceService } from './attendance.service';
+
+export const attendanceResolver: ResolveFn<Attendance> = (route) => {
+  const date = route.paramMap.get('date');
+  return inject(AttendanceService).get(date);
+};
diff --git a/overlord/src/app/balance-sheet/balance-sheet-resolver.service.spec.ts b/overlord/src/app/balance-sheet/balance-sheet-resolver.service.spec.ts
deleted file mode 100644
index 496f9f46..00000000
--- a/overlord/src/app/balance-sheet/balance-sheet-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { BalanceSheetResolver } from './balance-sheet-resolver.service';
-
-describe('BalanceSheetResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [BalanceSheetResolver],
-    });
-  });
-
-  it('should be created', inject([BalanceSheetResolver], (service: BalanceSheetResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/balance-sheet/balance-sheet-resolver.service.ts b/overlord/src/app/balance-sheet/balance-sheet-resolver.service.ts
deleted file mode 100644
index 374dfb12..00000000
--- a/overlord/src/app/balance-sheet/balance-sheet-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { BalanceSheet } from './balance-sheet';
-import { BalanceSheetService } from './balance-sheet.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class BalanceSheetResolver {
-  constructor(private ser: BalanceSheetService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<BalanceSheet> {
-    const date = route.paramMap.get('date');
-    return this.ser.list(date);
-  }
-}
diff --git a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts
index c78d55ca..bb0751a6 100644
--- a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts
+++ b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { BalanceSheetResolver } from './balance-sheet-resolver.service';
 import { BalanceSheetComponent } from './balance-sheet.component';
+import { balanceSheetResolver } from './balance-sheet.resolver';
 
 const balanceSheetRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const balanceSheetRoutes: Routes = [
       permission: 'Balance Sheet',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(BalanceSheetResolver).resolve(route),
+      info: balanceSheetResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const balanceSheetRoutes: Routes = [
       permission: 'Balance Sheet',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(BalanceSheetResolver).resolve(route),
+      info: balanceSheetResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const balanceSheetRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(balanceSheetRoutes)],
   exports: [RouterModule],
-  providers: [BalanceSheetResolver],
 })
 export class BalanceSheetRoutingModule {}
diff --git a/overlord/src/app/balance-sheet/balance-sheet.resolver.spec.ts b/overlord/src/app/balance-sheet/balance-sheet.resolver.spec.ts
new file mode 100644
index 00000000..00a54fda
--- /dev/null
+++ b/overlord/src/app/balance-sheet/balance-sheet.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { BalanceSheet } from './balance-sheet';
+import { balanceSheetResolver } from './balance-sheet.resolver';
+
+describe('balanceSheetResolver', () => {
+  const executeResolver: ResolveFn<BalanceSheet> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => balanceSheetResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/balance-sheet/balance-sheet.resolver.ts b/overlord/src/app/balance-sheet/balance-sheet.resolver.ts
new file mode 100644
index 00000000..93550e66
--- /dev/null
+++ b/overlord/src/app/balance-sheet/balance-sheet.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { BalanceSheet } from './balance-sheet';
+import { BalanceSheetService } from './balance-sheet.service';
+
+export const balanceSheetResolver: ResolveFn<BalanceSheet> = (route) => {
+  const date = route.paramMap.get('date');
+  return inject(BalanceSheetService).list(date);
+};
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts
index ad816449..997c8c5e 100644
--- a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts
+++ b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts
@@ -5,7 +5,7 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 import { AuthGuard } from '../auth/auth-guard.service';
 
 import { BatchIntegrityReportComponent } from './batch-integrity-report.component';
-import { BatchIntegrityResolverService } from './batch-integrity-resolver.service';
+import { batchIntegrityResolver } from './batch-integrity.resolver';
 
 const batchIntegrityRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const batchIntegrityRoutes: Routes = [
       permission: 'Product Ledger',
     },
     resolve: {
-      info: () => inject(BatchIntegrityResolverService).resolve(),
+      info: batchIntegrityResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const batchIntegrityRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(batchIntegrityRoutes)],
   exports: [RouterModule],
-  providers: [BatchIntegrityResolverService],
 })
 export class BatchIntegrityReportRoutingModule {}
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts
deleted file mode 100644
index fee58b7e..00000000
--- a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { BatchIntegrityResolverService } from './batch-integrity-resolver.service';
-
-describe('BatchIntegrityResolverService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [BatchIntegrityResolverService],
-    });
-  });
-
-  it('should be created', inject([BatchIntegrityResolverService], (service: BatchIntegrityResolverService) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.ts b/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.ts
deleted file mode 100644
index 5134a186..00000000
--- a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { BatchIntegrity } from './batch-integrity';
-import { BatchIntegrityReportService } from './batch-integrity-report.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class BatchIntegrityResolverService {
-  constructor(private ser: BatchIntegrityReportService) {}
-
-  resolve(): Observable<BatchIntegrity[]> {
-    return this.ser.batchIntegrity();
-  }
-}
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity.resolver.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity.resolver.spec.ts
new file mode 100644
index 00000000..8d35727b
--- /dev/null
+++ b/overlord/src/app/batch-integrity-report/batch-integrity.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { BatchIntegrity } from './batch-integrity';
+import { batchIntegrityResolver } from './batch-integrity.resolver';
+
+describe('batchIntegrityResolver', () => {
+  const executeResolver: ResolveFn<BatchIntegrity[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => batchIntegrityResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity.resolver.ts b/overlord/src/app/batch-integrity-report/batch-integrity.resolver.ts
new file mode 100644
index 00000000..c0aa883c
--- /dev/null
+++ b/overlord/src/app/batch-integrity-report/batch-integrity.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { BatchIntegrity } from './batch-integrity';
+import { BatchIntegrityReportService } from './batch-integrity-report.service';
+
+export const batchIntegrityResolver: ResolveFn<BatchIntegrity[]> = () => {
+  return inject(BatchIntegrityReportService).batchIntegrity();
+};
diff --git a/overlord/src/app/cash-flow/cash-flow-resolver.service.spec.ts b/overlord/src/app/cash-flow/cash-flow-resolver.service.spec.ts
deleted file mode 100644
index 426cf889..00000000
--- a/overlord/src/app/cash-flow/cash-flow-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { CashFlowResolver } from './cash-flow-resolver.service';
-
-describe('CashFlowResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [CashFlowResolver],
-    });
-  });
-
-  it('should be created', inject([CashFlowResolver], (service: CashFlowResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/cash-flow/cash-flow-resolver.service.ts b/overlord/src/app/cash-flow/cash-flow-resolver.service.ts
deleted file mode 100644
index cff86b9f..00000000
--- a/overlord/src/app/cash-flow/cash-flow-resolver.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CashFlow } from './cash-flow';
-import { CashFlowService } from './cash-flow.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CashFlowResolver {
-  constructor(private ser: CashFlowService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<CashFlow> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/cash-flow/cash-flow-routing.module.ts b/overlord/src/app/cash-flow/cash-flow-routing.module.ts
index 21e7d116..60319367 100644
--- a/overlord/src/app/cash-flow/cash-flow-routing.module.ts
+++ b/overlord/src/app/cash-flow/cash-flow-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { CashFlowResolver } from './cash-flow-resolver.service';
 import { CashFlowComponent } from './cash-flow.component';
+import { cashFlowResolver } from './cash-flow.resolver';
 
 const cashFlowRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const cashFlowRoutes: Routes = [
       permission: 'Cash Flow',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(CashFlowResolver).resolve(route),
+      info: cashFlowResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const cashFlowRoutes: Routes = [
       permission: 'Cash Flow',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(CashFlowResolver).resolve(route),
+      info: cashFlowResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const cashFlowRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(cashFlowRoutes)],
   exports: [RouterModule],
-  providers: [CashFlowResolver],
 })
 export class CashFlowRoutingModule {}
diff --git a/overlord/src/app/cash-flow/cash-flow.resolver.spec.ts b/overlord/src/app/cash-flow/cash-flow.resolver.spec.ts
new file mode 100644
index 00000000..3bec544b
--- /dev/null
+++ b/overlord/src/app/cash-flow/cash-flow.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { CashFlow } from './cash-flow';
+import { cashFlowResolver } from './cash-flow.resolver';
+
+describe('cashFlowResolver', () => {
+  const executeResolver: ResolveFn<CashFlow> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => cashFlowResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/cash-flow/cash-flow.resolver.ts b/overlord/src/app/cash-flow/cash-flow.resolver.ts
new file mode 100644
index 00000000..481a0915
--- /dev/null
+++ b/overlord/src/app/cash-flow/cash-flow.resolver.ts
@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CashFlow } from './cash-flow';
+import { CashFlowService } from './cash-flow.service';
+
+export const cashFlowResolver: ResolveFn<CashFlow> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(CashFlowService).list(id, startDate, finishDate);
+};
diff --git a/overlord/src/app/client/client-list-resolver.service.spec.ts b/overlord/src/app/client/client-list-resolver.service.spec.ts
deleted file mode 100644
index cc6c9d01..00000000
--- a/overlord/src/app/client/client-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ClientListResolver } from './client-list-resolver.service';
-
-describe('ClientListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ClientListResolver],
-    });
-  });
-
-  it('should be created', inject([ClientListResolver], (service: ClientListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/client/client-list-resolver.service.ts b/overlord/src/app/client/client-list-resolver.service.ts
deleted file mode 100644
index dbe9771c..00000000
--- a/overlord/src/app/client/client-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientListResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(): Observable<Client[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/client/client-list.resolver.spec.ts b/overlord/src/app/client/client-list.resolver.spec.ts
new file mode 100644
index 00000000..b6d9b28a
--- /dev/null
+++ b/overlord/src/app/client/client-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { clientListResolver } from './client-list.resolver';
+
+describe('clientListResolver', () => {
+  const executeResolver: ResolveFn<Client[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => clientListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/client/client-list.resolver.ts b/overlord/src/app/client/client-list.resolver.ts
new file mode 100644
index 00000000..ccc8dfb3
--- /dev/null
+++ b/overlord/src/app/client/client-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientListResolver: ResolveFn<Client[]> = () => {
+  return inject(ClientService).list();
+};
diff --git a/overlord/src/app/client/client-resolver.service.spec.ts b/overlord/src/app/client/client-resolver.service.spec.ts
deleted file mode 100644
index 46cf2d71..00000000
--- a/overlord/src/app/client/client-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ClientResolver } from './client-resolver.service';
-
-describe('ClientResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ClientResolver],
-    });
-  });
-
-  it('should be created', inject([ClientResolver], (service: ClientResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/client/client-resolver.service.ts b/overlord/src/app/client/client-resolver.service.ts
deleted file mode 100644
index 1f264247..00000000
--- a/overlord/src/app/client/client-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClientResolver {
-  constructor(private ser: ClientService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Client> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/client/client-routing.module.ts b/overlord/src/app/client/client-routing.module.ts
index af24a351..a80ee9d9 100644
--- a/overlord/src/app/client/client-routing.module.ts
+++ b/overlord/src/app/client/client-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { ClientDetailComponent } from './client-detail/client-detail.component';
 import { ClientListComponent } from './client-list/client-list.component';
-import { ClientListResolver } from './client-list-resolver.service';
-import { ClientResolver } from './client-resolver.service';
+import { clientListResolver } from './client-list.resolver';
+import { clientResolver } from './client.resolver';
 
 const clientRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(ClientListResolver).resolve(),
+      list: clientListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const clientRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ClientResolver).resolve(route),
+      item: clientResolver,
     },
   },
 ];
@@ -41,6 +41,5 @@ const clientRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(clientRoutes)],
   exports: [RouterModule],
-  providers: [ClientListResolver, ClientResolver],
 })
 export class ClientRoutingModule {}
diff --git a/overlord/src/app/client/client.resolver.spec.ts b/overlord/src/app/client/client.resolver.spec.ts
new file mode 100644
index 00000000..82fd888c
--- /dev/null
+++ b/overlord/src/app/client/client.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { clientResolver } from './client.resolver';
+
+describe('clientResolver', () => {
+  const executeResolver: ResolveFn<Client> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => clientResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/client/client.resolver.ts b/overlord/src/app/client/client.resolver.ts
new file mode 100644
index 00000000..829258d3
--- /dev/null
+++ b/overlord/src/app/client/client.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Client } from './client';
+import { ClientService } from './client.service';
+
+export const clientResolver: ResolveFn<Client> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ClientService).get(id);
+};
diff --git a/overlord/src/app/closing-stock/closing-stock-resolver.service.spec.ts b/overlord/src/app/closing-stock/closing-stock-resolver.service.spec.ts
deleted file mode 100644
index fae8af23..00000000
--- a/overlord/src/app/closing-stock/closing-stock-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ClosingStockResolver } from './closing-stock-resolver.service';
-
-describe('ClosingStockResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ClosingStockResolver],
-    });
-  });
-
-  it('should be created', inject([ClosingStockResolver], (service: ClosingStockResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/closing-stock/closing-stock-resolver.service.ts b/overlord/src/app/closing-stock/closing-stock-resolver.service.ts
deleted file mode 100644
index 39db789f..00000000
--- a/overlord/src/app/closing-stock/closing-stock-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ClosingStock } from './closing-stock';
-import { ClosingStockService } from './closing-stock.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ClosingStockResolver {
-  constructor(private ser: ClosingStockService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ClosingStock> {
-    const date = route.paramMap.get('date');
-    const costCentre = route.queryParamMap.get('d') || null;
-    return this.ser.list(date, costCentre);
-  }
-}
diff --git a/overlord/src/app/closing-stock/closing-stock-routing.module.ts b/overlord/src/app/closing-stock/closing-stock-routing.module.ts
index 0772437b..71104374 100644
--- a/overlord/src/app/closing-stock/closing-stock-routing.module.ts
+++ b/overlord/src/app/closing-stock/closing-stock-routing.module.ts
@@ -3,10 +3,10 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
-import { ClosingStockResolver } from './closing-stock-resolver.service';
 import { ClosingStockComponent } from './closing-stock.component';
+import { closingStockResolver } from './closing-stock.resolver';
 
 const closingStockRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const closingStockRoutes: Routes = [
       permission: 'Closing Stock',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ClosingStockResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      info: closingStockResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const closingStockRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(closingStockRoutes)],
   exports: [RouterModule],
-  providers: [ClosingStockResolver],
 })
 export class ClosingStockRoutingModule {}
diff --git a/overlord/src/app/closing-stock/closing-stock.resolver.spec.ts b/overlord/src/app/closing-stock/closing-stock.resolver.spec.ts
new file mode 100644
index 00000000..d3b8d9cd
--- /dev/null
+++ b/overlord/src/app/closing-stock/closing-stock.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ClosingStock } from './closing-stock';
+import { closingStockResolver } from './closing-stock.resolver';
+
+describe('closingStockResolver', () => {
+  const executeResolver: ResolveFn<ClosingStock> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => closingStockResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/closing-stock/closing-stock.resolver.ts b/overlord/src/app/closing-stock/closing-stock.resolver.ts
new file mode 100644
index 00000000..107f694e
--- /dev/null
+++ b/overlord/src/app/closing-stock/closing-stock.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ClosingStock } from './closing-stock';
+import { ClosingStockService } from './closing-stock.service';
+
+export const closingStockResolver: ResolveFn<ClosingStock> = (route) => {
+  const date = route.paramMap.get('date');
+  const costCentre = route.queryParamMap.get('d') || null;
+  return inject(ClosingStockService).list(date, costCentre);
+};
diff --git a/overlord/src/app/cost-centre/cost-centre-list-resolver.service.spec.ts b/overlord/src/app/cost-centre/cost-centre-list-resolver.service.spec.ts
deleted file mode 100644
index 712ed632..00000000
--- a/overlord/src/app/cost-centre/cost-centre-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { CostCentreListResolver } from './cost-centre-list-resolver.service';
-
-describe('CostCentreListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [CostCentreListResolver],
-    });
-  });
-
-  it('should be created', inject([CostCentreListResolver], (service: CostCentreListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/cost-centre/cost-centre-list-resolver.service.ts b/overlord/src/app/cost-centre/cost-centre-list-resolver.service.ts
deleted file mode 100644
index ca92d31d..00000000
--- a/overlord/src/app/cost-centre/cost-centre-list-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CostCentre } from '../core/cost-centre';
-
-import { CostCentreService } from './cost-centre.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CostCentreListResolver {
-  constructor(private ser: CostCentreService) {}
-
-  resolve(): Observable<CostCentre[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/cost-centre/cost-centre-list.resolver.spec.ts b/overlord/src/app/cost-centre/cost-centre-list.resolver.spec.ts
new file mode 100644
index 00000000..594fbd6e
--- /dev/null
+++ b/overlord/src/app/cost-centre/cost-centre-list.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { costCentreListResolver } from './cost-centre-list.resolver';
+
+describe('costCentreListResolver', () => {
+  const executeResolver: ResolveFn<CostCentre[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => costCentreListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/cost-centre/cost-centre-list.resolver.ts b/overlord/src/app/cost-centre/cost-centre-list.resolver.ts
new file mode 100644
index 00000000..e164d7c6
--- /dev/null
+++ b/overlord/src/app/cost-centre/cost-centre-list.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { CostCentreService } from './cost-centre.service';
+
+export const costCentreListResolver: ResolveFn<CostCentre[]> = () => {
+  return inject(CostCentreService).list();
+};
diff --git a/overlord/src/app/cost-centre/cost-centre-resolver.service.spec.ts b/overlord/src/app/cost-centre/cost-centre-resolver.service.spec.ts
deleted file mode 100644
index bbe55c58..00000000
--- a/overlord/src/app/cost-centre/cost-centre-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { CostCentreResolver } from './cost-centre-resolver.service';
-
-describe('CostCentreResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [CostCentreResolver],
-    });
-  });
-
-  it('should be created', inject([CostCentreResolver], (service: CostCentreResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/cost-centre/cost-centre-resolver.service.ts b/overlord/src/app/cost-centre/cost-centre-resolver.service.ts
deleted file mode 100644
index 256e7b0e..00000000
--- a/overlord/src/app/cost-centre/cost-centre-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { CostCentre } from '../core/cost-centre';
-
-import { CostCentreService } from './cost-centre.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class CostCentreResolver {
-  constructor(private ser: CostCentreService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<CostCentre> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/cost-centre/cost-centre-routing.module.ts b/overlord/src/app/cost-centre/cost-centre-routing.module.ts
index d0ae1543..d88766c0 100644
--- a/overlord/src/app/cost-centre/cost-centre-routing.module.ts
+++ b/overlord/src/app/cost-centre/cost-centre-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { CostCentreDetailComponent } from './cost-centre-detail/cost-centre-detail.component';
 import { CostCentreListComponent } from './cost-centre-list/cost-centre-list.component';
-import { CostCentreListResolver } from './cost-centre-list-resolver.service';
-import { CostCentreResolver } from './cost-centre-resolver.service';
+import { costCentreListResolver } from './cost-centre-list.resolver';
+import { costCentreResolver } from './cost-centre.resolver';
 
 const costCentreRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(CostCentreListResolver).resolve(),
+      list: costCentreListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(CostCentreResolver).resolve(route),
+      item: costCentreResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const costCentreRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(CostCentreResolver).resolve(route),
+      item: costCentreResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const costCentreRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(costCentreRoutes)],
   exports: [RouterModule],
-  providers: [CostCentreListResolver, CostCentreResolver],
 })
 export class CostCentreRoutingModule {}
diff --git a/overlord/src/app/cost-centre/cost-centre.resolver.spec.ts b/overlord/src/app/cost-centre/cost-centre.resolver.spec.ts
new file mode 100644
index 00000000..6be9f070
--- /dev/null
+++ b/overlord/src/app/cost-centre/cost-centre.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { costCentreResolver } from './cost-centre.resolver';
+
+describe('costCentreResolver', () => {
+  const executeResolver: ResolveFn<CostCentre> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => costCentreResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/cost-centre/cost-centre.resolver.ts b/overlord/src/app/cost-centre/cost-centre.resolver.ts
new file mode 100644
index 00000000..b4042ad6
--- /dev/null
+++ b/overlord/src/app/cost-centre/cost-centre.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { CostCentre } from '../core/cost-centre';
+
+import { CostCentreService } from './cost-centre.service';
+
+export const costCentreResolver: ResolveFn<CostCentre> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(CostCentreService).get(id);
+};
diff --git a/overlord/src/app/daybook/daybook-resolver.service.spec.ts b/overlord/src/app/daybook/daybook-resolver.service.spec.ts
deleted file mode 100644
index 63c41bc7..00000000
--- a/overlord/src/app/daybook/daybook-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { DaybookResolver } from './daybook-resolver.service';
-
-describe('DaybookResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [DaybookResolver],
-    });
-  });
-
-  it('should be created', inject([DaybookResolver], (service: DaybookResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/daybook/daybook-resolver.service.ts b/overlord/src/app/daybook/daybook-resolver.service.ts
deleted file mode 100644
index c9db98d6..00000000
--- a/overlord/src/app/daybook/daybook-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Daybook } from './daybook';
-import { DaybookService } from './daybook.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class DaybookResolver {
-  constructor(private ser: DaybookService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Daybook> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/daybook/daybook-routing.module.ts b/overlord/src/app/daybook/daybook-routing.module.ts
index 8eadcf5f..63b76f28 100644
--- a/overlord/src/app/daybook/daybook-routing.module.ts
+++ b/overlord/src/app/daybook/daybook-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { DaybookResolver } from './daybook-resolver.service';
 import { DaybookComponent } from './daybook.component';
+import { daybookResolver } from './daybook.resolver';
 
 const daybookRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const daybookRoutes: Routes = [
       permission: 'Daybook',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(DaybookResolver).resolve(route),
+      info: daybookResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const daybookRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(daybookRoutes)],
   exports: [RouterModule],
-  providers: [DaybookResolver],
 })
 export class DaybookRoutingModule {}
diff --git a/overlord/src/app/daybook/daybook.resolver.spec.ts b/overlord/src/app/daybook/daybook.resolver.spec.ts
new file mode 100644
index 00000000..a64bdca1
--- /dev/null
+++ b/overlord/src/app/daybook/daybook.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Daybook } from './daybook';
+import { daybookResolver } from './daybook.resolver';
+
+describe('daybookResolver', () => {
+  const executeResolver: ResolveFn<Daybook> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => daybookResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/daybook/daybook.resolver.ts b/overlord/src/app/daybook/daybook.resolver.ts
new file mode 100644
index 00000000..ae8514ff
--- /dev/null
+++ b/overlord/src/app/daybook/daybook.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Daybook } from './daybook';
+import { DaybookService } from './daybook.service';
+
+export const daybookResolver: ResolveFn<Daybook> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(DaybookService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/employee-attendance/employee-attendance-resolver.service.ts b/overlord/src/app/employee-attendance/employee-attendance-resolver.service.ts
deleted file mode 100644
index 833cf7ab..00000000
--- a/overlord/src/app/employee-attendance/employee-attendance-resolver.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { EmployeeAttendance } from './employee-attendance';
-import { EmployeeAttendanceService } from './employee-attendance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeAttendanceResolver {
-  constructor(private ser: EmployeeAttendanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<EmployeeAttendance> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.get(id, startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts
index e0ef2143..590f7ede 100644
--- a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts
+++ b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts
@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
-import { AttendanceTypeResolver } from '../attendance/attendance-type-resolver.service';
+import { attendanceTypeResolver } from '../attendance/attendance-type.resolver';
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EmployeeAttendanceResolver } from './employee-attendance-resolver.service';
 import { EmployeeAttendanceComponent } from './employee-attendance.component';
+import { employeeAttendanceResolver } from './employee-attendance.resolver';
 
 const employeeEmployeeAttendanceRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const employeeEmployeeAttendanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeEmployeeAttendanceRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeAttendanceResolver],
 })
 export class EmployeeAttendanceRoutingModule {}
diff --git a/overlord/src/app/employee-attendance/employee-attendance.resolver.ts b/overlord/src/app/employee-attendance/employee-attendance.resolver.ts
new file mode 100644
index 00000000..37d3d3e4
--- /dev/null
+++ b/overlord/src/app/employee-attendance/employee-attendance.resolver.ts
@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { EmployeeAttendance } from './employee-attendance';
+import { EmployeeAttendanceService } from './employee-attendance.service';
+
+export const employeeAttendanceResolver: ResolveFn<EmployeeAttendance> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(EmployeeAttendanceService).get(id, startDate, finishDate);
+};
diff --git a/overlord/src/app/employee-benefits/employee-benefits-resolver.service.ts b/overlord/src/app/employee-benefits/employee-benefits-resolver.service.ts
deleted file mode 100644
index 80c6c70f..00000000
--- a/overlord/src/app/employee-benefits/employee-benefits-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeBenefitsResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Employee Benefit');
-    }
-    return this.ser.get(id, 'Employee Benefit');
-  }
-}
diff --git a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts
index 06de72d0..0c796fc1 100644
--- a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts
+++ b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EmployeeBenefitsResolver } from './employee-benefits-resolver.service';
 import { EmployeeBenefitsComponent } from './employee-benefits.component';
+import { employeeBenefitsResolver } from './employee-benefits.resolver';
 
 const employeeBenefitsRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const employeeBenefitsRoutes: Routes = [
       permission: 'employee-benefit',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(EmployeeBenefitsResolver).resolve(route),
+      voucher: employeeBenefitsResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const employeeBenefitsRoutes: Routes = [
       permission: 'employee-benefit',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(EmployeeBenefitsResolver).resolve(route),
+      voucher: employeeBenefitsResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const employeeBenefitsRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeBenefitsRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeBenefitsResolver],
 })
 export class EmployeeBenefitsRoutingModule {}
diff --git a/overlord/src/app/employee-benefits/employee-benefits.resolver.ts b/overlord/src/app/employee-benefits/employee-benefits.resolver.ts
new file mode 100644
index 00000000..efee72e7
--- /dev/null
+++ b/overlord/src/app/employee-benefits/employee-benefits.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const employeeBenefitsResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Employee Benefit');
+  }
+  return inject(VoucherService).get(id, 'Employee Benefit');
+};
diff --git a/overlord/src/app/employee/employee-list-resolver.service.spec.ts b/overlord/src/app/employee/employee-list-resolver.service.spec.ts
deleted file mode 100644
index e3a84852..00000000
--- a/overlord/src/app/employee/employee-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { EmployeeListResolver } from './employee-list-resolver.service';
-
-describe('EmployeeListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [EmployeeListResolver],
-    });
-  });
-
-  it('should be created', inject([EmployeeListResolver], (service: EmployeeListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/employee/employee-list-resolver.service.ts b/overlord/src/app/employee/employee-list-resolver.service.ts
deleted file mode 100644
index 815bf8c2..00000000
--- a/overlord/src/app/employee/employee-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Employee } from './employee';
-import { EmployeeService } from './employee.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeListResolver {
-  constructor(private ser: EmployeeService) {}
-
-  resolve(): Observable<Employee[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/employee/employee-list.resolver.spec.ts b/overlord/src/app/employee/employee-list.resolver.spec.ts
new file mode 100644
index 00000000..07e5d993
--- /dev/null
+++ b/overlord/src/app/employee/employee-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { employeeListResolver } from './employee-list.resolver';
+
+describe('employeeListResolver', () => {
+  const executeResolver: ResolveFn<Employee[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => employeeListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/employee/employee-list.resolver.ts b/overlord/src/app/employee/employee-list.resolver.ts
new file mode 100644
index 00000000..dcdcda85
--- /dev/null
+++ b/overlord/src/app/employee/employee-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { EmployeeService } from './employee.service';
+
+export const employeeListResolver: ResolveFn<Employee[]> = () => {
+  return inject(EmployeeService).list();
+};
diff --git a/overlord/src/app/employee/employee-resolver.service.spec.ts b/overlord/src/app/employee/employee-resolver.service.spec.ts
deleted file mode 100644
index 7348550e..00000000
--- a/overlord/src/app/employee/employee-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { EmployeeResolver } from './employee-resolver.service';
-
-describe('EmployeeResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [EmployeeResolver],
-    });
-  });
-
-  it('should be created', inject([EmployeeResolver], (service: EmployeeResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/employee/employee-resolver.service.ts b/overlord/src/app/employee/employee-resolver.service.ts
deleted file mode 100644
index 71a2104b..00000000
--- a/overlord/src/app/employee/employee-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Employee } from './employee';
-import { EmployeeService } from './employee.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeResolver {
-  constructor(private ser: EmployeeService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Employee> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/employee/employee-routing.module.ts b/overlord/src/app/employee/employee-routing.module.ts
index 7dbfdc37..78d7b2b9 100644
--- a/overlord/src/app/employee/employee-routing.module.ts
+++ b/overlord/src/app/employee/employee-routing.module.ts
@@ -3,12 +3,12 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
 import { EmployeeDetailComponent } from './employee-detail/employee-detail.component';
 import { EmployeeListComponent } from './employee-list/employee-list.component';
-import { EmployeeListResolver } from './employee-list-resolver.service';
-import { EmployeeResolver } from './employee-resolver.service';
+import { employeeListResolver } from './employee-list.resolver';
+import { employeeResolver } from './employee.resolver';
 
 const employeeRoutes: Routes = [
   {
@@ -21,7 +21,7 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      list: () => inject(EmployeeListResolver).resolve(),
+      list: employeeListResolver,
     },
   },
   {
@@ -34,8 +34,8 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(EmployeeResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: employeeResolver,
+      costCentres: costCentreListResolver,
     },
   },
   {
@@ -48,8 +48,8 @@ const employeeRoutes: Routes = [
       permission: 'Employees',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(EmployeeResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: employeeResolver,
+      costCentres: costCentreListResolver,
     },
   },
 ];
@@ -57,6 +57,5 @@ const employeeRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeListResolver, EmployeeResolver],
 })
 export class EmployeeRoutingModule {}
diff --git a/overlord/src/app/employee/employee.resolver.spec.ts b/overlord/src/app/employee/employee.resolver.spec.ts
new file mode 100644
index 00000000..78bcb821
--- /dev/null
+++ b/overlord/src/app/employee/employee.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { employeeResolver } from './employee.resolver';
+
+describe('employeeResolver', () => {
+  const executeResolver: ResolveFn<Employee> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => employeeResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/employee/employee.resolver.ts b/overlord/src/app/employee/employee.resolver.ts
new file mode 100644
index 00000000..92534942
--- /dev/null
+++ b/overlord/src/app/employee/employee.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Employee } from './employee';
+import { EmployeeService } from './employee.service';
+
+export const employeeResolver: ResolveFn<Employee> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(EmployeeService).get(id);
+};
diff --git a/overlord/src/app/entries/entries-resolver.service.spec.ts b/overlord/src/app/entries/entries-resolver.service.spec.ts
deleted file mode 100644
index 30c9e3e6..00000000
--- a/overlord/src/app/entries/entries-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { EntriesResolver } from './entries-resolver.service';
-
-describe('EntriesResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [EntriesResolver],
-    });
-  });
-
-  it('should be created', inject([EntriesResolver], (service: EntriesResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/entries/entries-resolver.service.ts b/overlord/src/app/entries/entries-resolver.service.ts
deleted file mode 100644
index 219c4358..00000000
--- a/overlord/src/app/entries/entries-resolver.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { EntriesService } from './entries.service';
-import { Report } from './report';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EntriesResolver {
-  constructor(private ser: EntriesService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Report> {
-    const start_date = route.queryParamMap.get('s');
-    const finish_date = route.queryParamMap.get('f');
-    const posted = route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true';
-    const page_size = route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string);
-    const page_index = route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string);
-    const sort = route.queryParamMap.get('a') ?? 'date';
-    const direction = route.queryParamMap.get('d') ?? 'desc';
-    const issue_vouchers = route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true';
-    return this.ser.list(start_date, finish_date, posted, page_size, page_index, sort, direction, issue_vouchers);
-  }
-}
diff --git a/overlord/src/app/entries/entries-routing.module.ts b/overlord/src/app/entries/entries-routing.module.ts
index dd6ca554..e816aa09 100644
--- a/overlord/src/app/entries/entries-routing.module.ts
+++ b/overlord/src/app/entries/entries-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EntriesResolver } from './entries-resolver.service';
 import { EntriesComponent } from './entries.component';
+import { entriesResolver } from './entries.resolver';
 
 const entriesRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const entriesRoutes: Routes = [
       permission: 'Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EntriesResolver).resolve(route),
+      info: entriesResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const entriesRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(entriesRoutes)],
   exports: [RouterModule],
-  providers: [EntriesResolver],
 })
 export class EntriesRoutingModule {}
diff --git a/overlord/src/app/entries/entries.resolver.spec.ts b/overlord/src/app/entries/entries.resolver.spec.ts
new file mode 100644
index 00000000..a1190a0b
--- /dev/null
+++ b/overlord/src/app/entries/entries.resolver.spec.ts
@@ -0,0 +1,17 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { entriesResolver } from './entries.resolver';
+
+describe('entriesResolver', () => {
+  const executeResolver: ResolveFn<Report> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => entriesResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/entries/entries.resolver.ts b/overlord/src/app/entries/entries.resolver.ts
new file mode 100644
index 00000000..48b5bc52
--- /dev/null
+++ b/overlord/src/app/entries/entries.resolver.ts
@@ -0,0 +1,26 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { EntriesService } from './entries.service';
+import { Report } from './report';
+
+export const entriesResolver: ResolveFn<Report> = (route) => {
+  const start_date = route.queryParamMap.get('s');
+  const finish_date = route.queryParamMap.get('f');
+  const posted = route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true';
+  const page_size = route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string);
+  const page_index = route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string);
+  const sort = route.queryParamMap.get('a') ?? 'date';
+  const direction = route.queryParamMap.get('d') ?? 'desc';
+  const issue_vouchers = route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true';
+  return inject(EntriesService).list(
+    start_date,
+    finish_date,
+    posted,
+    page_size,
+    page_index,
+    sort,
+    direction,
+    issue_vouchers,
+  );
+};
diff --git a/overlord/src/app/incentive/incentive-resolver.service.spec.ts b/overlord/src/app/incentive/incentive-resolver.service.spec.ts
deleted file mode 100644
index db539888..00000000
--- a/overlord/src/app/incentive/incentive-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { IncentiveResolver } from './incentive-resolver.service';
-
-describe('IncentiveResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [IncentiveResolver],
-    });
-  });
-
-  it('should be created', inject([IncentiveResolver], (service: IncentiveResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/incentive/incentive-resolver.service.ts b/overlord/src/app/incentive/incentive-resolver.service.ts
deleted file mode 100644
index 58b914f9..00000000
--- a/overlord/src/app/incentive/incentive-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IncentiveResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Incentive');
-    }
-    return this.ser.get(id, 'Incentive');
-  }
-}
diff --git a/overlord/src/app/incentive/incentive-routing.module.ts b/overlord/src/app/incentive/incentive-routing.module.ts
index 18a7642b..3f7c4f19 100644
--- a/overlord/src/app/incentive/incentive-routing.module.ts
+++ b/overlord/src/app/incentive/incentive-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { IncentiveResolver } from './incentive-resolver.service';
 import { IncentiveComponent } from './incentive.component';
+import { incentiveResolver } from './incentive.resolver';
 
 const incentiveRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const incentiveRoutes: Routes = [
       permission: 'incentive',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IncentiveResolver).resolve(route),
+      voucher: incentiveResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const incentiveRoutes: Routes = [
       permission: 'incentive',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IncentiveResolver).resolve(route),
+      voucher: incentiveResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const incentiveRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(incentiveRoutes)],
   exports: [RouterModule],
-  providers: [IncentiveResolver],
 })
 export class IncentiveRoutingModule {}
diff --git a/overlord/src/app/incentive/incentive.resolver.spec.ts b/overlord/src/app/incentive/incentive.resolver.spec.ts
new file mode 100644
index 00000000..31c04da0
--- /dev/null
+++ b/overlord/src/app/incentive/incentive.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { incentiveResolver } from './incentive.resolver';
+
+describe('incentiveResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => incentiveResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/incentive/incentive.resolver.ts b/overlord/src/app/incentive/incentive.resolver.ts
new file mode 100644
index 00000000..e10a47f8
--- /dev/null
+++ b/overlord/src/app/incentive/incentive.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const incentiveResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Incentive');
+  }
+  return inject(VoucherService).get(id, 'Incentive');
+};
diff --git a/overlord/src/app/issue/issue-resolver.service.spec.ts b/overlord/src/app/issue/issue-resolver.service.spec.ts
deleted file mode 100644
index 54834144..00000000
--- a/overlord/src/app/issue/issue-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { IssueResolver } from './issue-resolver.service';
-
-describe('IssueResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [IssueResolver],
-    });
-  });
-
-  it('should be created', inject([IssueResolver], (service: IssueResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/issue/issue-resolver.service.ts b/overlord/src/app/issue/issue-resolver.service.ts
deleted file mode 100644
index 50a0287f..00000000
--- a/overlord/src/app/issue/issue-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class IssueResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Issue');
-    }
-    return this.ser.get(id, 'Issue');
-  }
-}
diff --git a/overlord/src/app/issue/issue-routing.module.ts b/overlord/src/app/issue/issue-routing.module.ts
index ad8709a7..8231925e 100644
--- a/overlord/src/app/issue/issue-routing.module.ts
+++ b/overlord/src/app/issue/issue-routing.module.ts
@@ -3,10 +3,10 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
-import { IssueResolver } from './issue-resolver.service';
 import { IssueComponent } from './issue.component';
+import { issueResolver } from './issue.resolver';
 
 const issueRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const issueRoutes: Routes = [
       permission: 'Issue',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IssueResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      voucher: issueResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const issueRoutes: Routes = [
       permission: 'Issue',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(IssueResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      voucher: issueResolver,
+      costCentres: costCentreListResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const issueRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(issueRoutes)],
   exports: [RouterModule],
-  providers: [IssueResolver],
 })
 export class IssueRoutingModule {}
diff --git a/overlord/src/app/issue/issue.resolver.spec.ts b/overlord/src/app/issue/issue.resolver.spec.ts
new file mode 100644
index 00000000..0809340d
--- /dev/null
+++ b/overlord/src/app/issue/issue.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { issueResolver } from './issue.resolver';
+
+describe('issueResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => issueResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/issue/issue.resolver.ts b/overlord/src/app/issue/issue.resolver.ts
new file mode 100644
index 00000000..4a746e82
--- /dev/null
+++ b/overlord/src/app/issue/issue.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const issueResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Issue');
+  }
+  return inject(VoucherService).get(id, 'Issue');
+};
diff --git a/overlord/src/app/journal/journal-resolver.service.spec.ts b/overlord/src/app/journal/journal-resolver.service.spec.ts
deleted file mode 100644
index 8d0e3d16..00000000
--- a/overlord/src/app/journal/journal-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { JournalResolver } from './journal-resolver.service';
-
-describe('JournalResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [JournalResolver],
-    });
-  });
-
-  it('should be created', inject([JournalResolver], (service: JournalResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/journal/journal-resolver.service.ts b/overlord/src/app/journal/journal-resolver.service.ts
deleted file mode 100644
index 6c116930..00000000
--- a/overlord/src/app/journal/journal-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class JournalResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Journal');
-    }
-    return this.ser.get(id, 'Journal');
-  }
-}
diff --git a/overlord/src/app/journal/journal-routing.module.ts b/overlord/src/app/journal/journal-routing.module.ts
index 86df6af2..5f1ae814 100644
--- a/overlord/src/app/journal/journal-routing.module.ts
+++ b/overlord/src/app/journal/journal-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { JournalResolver } from './journal-resolver.service';
 import { JournalComponent } from './journal.component';
+import { journalResolver } from './journal.resolver';
 
 const journalRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const journalRoutes: Routes = [
       permission: 'Journal',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(JournalResolver).resolve(route),
+      voucher: journalResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const journalRoutes: Routes = [
       permission: 'Journal',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(JournalResolver).resolve(route),
+      voucher: journalResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const journalRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(journalRoutes)],
   exports: [RouterModule],
-  providers: [JournalResolver],
 })
 export class JournalRoutingModule {}
diff --git a/overlord/src/app/journal/journal.resolver.spec.ts b/overlord/src/app/journal/journal.resolver.spec.ts
new file mode 100644
index 00000000..458ae315
--- /dev/null
+++ b/overlord/src/app/journal/journal.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { journalResolver } from './journal.resolver';
+
+describe('journalResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => journalResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/journal/journal.resolver.ts b/overlord/src/app/journal/journal.resolver.ts
new file mode 100644
index 00000000..8826f89b
--- /dev/null
+++ b/overlord/src/app/journal/journal.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const journalResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Journal');
+  }
+  return inject(VoucherService).get(id, 'Journal');
+};
diff --git a/overlord/src/app/ledger/ledger-resolver.service.spec.ts b/overlord/src/app/ledger/ledger-resolver.service.spec.ts
deleted file mode 100644
index 510bf250..00000000
--- a/overlord/src/app/ledger/ledger-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { LedgerResolver } from './ledger-resolver.service';
-
-describe('LedgerResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [LedgerResolver],
-    });
-  });
-
-  it('should be created', inject([LedgerResolver], (service: LedgerResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/ledger/ledger-resolver.service.ts b/overlord/src/app/ledger/ledger-resolver.service.ts
deleted file mode 100644
index e8a800ed..00000000
--- a/overlord/src/app/ledger/ledger-resolver.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Ledger } from './ledger';
-import { LedgerService } from './ledger.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LedgerResolver {
-  constructor(private ser: LedgerService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Ledger> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/ledger/ledger-routing.module.ts b/overlord/src/app/ledger/ledger-routing.module.ts
index 41cde0cd..acae86e8 100644
--- a/overlord/src/app/ledger/ledger-routing.module.ts
+++ b/overlord/src/app/ledger/ledger-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { LedgerResolver } from './ledger-resolver.service';
 import { LedgerComponent } from './ledger.component';
+import { ledgerResolver } from './ledger.resolver';
 
 const ledgerRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const ledgerRoutes: Routes = [
       permission: 'Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(LedgerResolver).resolve(route),
+      info: ledgerResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const ledgerRoutes: Routes = [
       permission: 'Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(LedgerResolver).resolve(route),
+      info: ledgerResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const ledgerRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(ledgerRoutes)],
   exports: [RouterModule],
-  providers: [LedgerResolver],
 })
 export class LedgerRoutingModule {}
diff --git a/overlord/src/app/ledger/ledger.resolver.spec.ts b/overlord/src/app/ledger/ledger.resolver.spec.ts
new file mode 100644
index 00000000..875a42e2
--- /dev/null
+++ b/overlord/src/app/ledger/ledger.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Ledger } from './ledger';
+import { ledgerResolver } from './ledger.resolver';
+
+describe('ledgerResolver', () => {
+  const executeResolver: ResolveFn<Ledger> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => ledgerResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/ledger/ledger.resolver.ts b/overlord/src/app/ledger/ledger.resolver.ts
new file mode 100644
index 00000000..4db44161
--- /dev/null
+++ b/overlord/src/app/ledger/ledger.resolver.ts
@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Ledger } from './ledger';
+import { LedgerService } from './ledger.service';
+
+export const ledgerResolver: ResolveFn<Ledger> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(LedgerService).list(id, startDate, finishDate);
+};
diff --git a/overlord/src/app/net-transactions/net-transactions-resolver.service.spec.ts b/overlord/src/app/net-transactions/net-transactions-resolver.service.spec.ts
deleted file mode 100644
index 169c8d7f..00000000
--- a/overlord/src/app/net-transactions/net-transactions-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { NetTransactionsResolver } from './net-transactions-resolver.service';
-
-describe('NetTransactionsResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [NetTransactionsResolver],
-    });
-  });
-
-  it('should be created', inject([NetTransactionsResolver], (service: NetTransactionsResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/net-transactions/net-transactions-resolver.service.ts b/overlord/src/app/net-transactions/net-transactions-resolver.service.ts
deleted file mode 100644
index 46bec321..00000000
--- a/overlord/src/app/net-transactions/net-transactions-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { NetTransactions } from './net-transactions';
-import { NetTransactionsService } from './net-transactions.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class NetTransactionsResolver {
-  constructor(private ser: NetTransactionsService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<NetTransactions> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/net-transactions/net-transactions-routing.module.ts b/overlord/src/app/net-transactions/net-transactions-routing.module.ts
index f39ed972..21890d14 100644
--- a/overlord/src/app/net-transactions/net-transactions-routing.module.ts
+++ b/overlord/src/app/net-transactions/net-transactions-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { NetTransactionsResolver } from './net-transactions-resolver.service';
 import { NetTransactionsComponent } from './net-transactions.component';
+import { netTransactionsResolver } from './net-transactions.resolver';
 
 const netTransactionsRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const netTransactionsRoutes: Routes = [
       permission: 'Net Transactions',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(NetTransactionsResolver).resolve(route),
+      info: netTransactionsResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const netTransactionsRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(netTransactionsRoutes)],
   exports: [RouterModule],
-  providers: [NetTransactionsResolver],
 })
 export class NetTransactionsRoutingModule {}
diff --git a/overlord/src/app/net-transactions/net-transactions.resolver.spec.ts b/overlord/src/app/net-transactions/net-transactions.resolver.spec.ts
new file mode 100644
index 00000000..a491b386
--- /dev/null
+++ b/overlord/src/app/net-transactions/net-transactions.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { NetTransactions } from './net-transactions';
+import { netTransactionsResolver } from './net-transactions.resolver';
+
+describe('netTransactionsResolver', () => {
+  const executeResolver: ResolveFn<NetTransactions> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => netTransactionsResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/net-transactions/net-transactions.resolver.ts b/overlord/src/app/net-transactions/net-transactions.resolver.ts
new file mode 100644
index 00000000..70c8a4be
--- /dev/null
+++ b/overlord/src/app/net-transactions/net-transactions.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { NetTransactions } from './net-transactions';
+import { NetTransactionsService } from './net-transactions.service';
+
+export const netTransactionsResolver: ResolveFn<NetTransactions> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(NetTransactionsService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.spec.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.spec.ts
deleted file mode 100644
index 2244be82..00000000
--- a/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.spec.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { NonContractPurchaseResolverService } from './non-contract-purchase-resolver.service';
-
-describe('NonContractPurchaseResolverService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [NonContractPurchaseResolverService],
-    });
-  });
-
-  it('should be created', inject(
-    [NonContractPurchaseResolverService],
-    (service: NonContractPurchaseResolverService) => {
-      expect(service).toBeTruthy();
-    },
-  ));
-});
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.ts
deleted file mode 100644
index a51aca88..00000000
--- a/overlord/src/app/non-contact-purchase/non-contract-purchase-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { NonContractPurchase } from './non-contract-purchase';
-import { NonContractPurchaseService } from './non-contract-purchase.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class NonContractPurchaseResolverService {
-  constructor(private ser: NonContractPurchaseService) {}
-
-  resolve(): Observable<NonContractPurchase[]> {
-    return this.ser.nonContractPurchase();
-  }
-}
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts
index 00f08bf5..2669d06e 100644
--- a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts
+++ b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { NonContractPurchaseResolverService } from './non-contract-purchase-resolver.service';
 import { NonContractPurchaseComponent } from './non-contract-purchase.component';
+import { nonContractPurchaseResolver } from './non-contract-purchase.resolver';
 
 const nonContractPurchaseRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const nonContractPurchaseRoutes: Routes = [
       permission: 'Product Ledger',
     },
     resolve: {
-      info: () => inject(NonContractPurchaseResolverService).resolve(),
+      info: nonContractPurchaseResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const nonContractPurchaseRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(nonContractPurchaseRoutes)],
   exports: [RouterModule],
-  providers: [NonContractPurchaseResolverService],
 })
 export class NonContractPurchaseRoutingModule {}
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.spec.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.spec.ts
new file mode 100644
index 00000000..ece1807a
--- /dev/null
+++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { NonContractPurchase } from './non-contract-purchase';
+import { nonContractPurchaseResolver } from './non-contract-purchase.resolver';
+
+describe('nonContractPurchaseResolver', () => {
+  const executeResolver: ResolveFn<NonContractPurchase[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => nonContractPurchaseResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.ts
new file mode 100644
index 00000000..8c003b21
--- /dev/null
+++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { NonContractPurchase } from './non-contract-purchase';
+import { NonContractPurchaseService } from './non-contract-purchase.service';
+
+export const nonContractPurchaseResolver: ResolveFn<NonContractPurchase[]> = () => {
+  return inject(NonContractPurchaseService).nonContractPurchase();
+};
diff --git a/overlord/src/app/payment/payment-accounts-resolver.service.spec.ts b/overlord/src/app/payment/payment-accounts-resolver.service.spec.ts
deleted file mode 100644
index 4831c600..00000000
--- a/overlord/src/app/payment/payment-accounts-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PaymentAccountsResolver } from './payment-accounts-resolver.service';
-
-describe('PaymentAccountsResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PaymentAccountsResolver],
-    });
-  });
-
-  it('should be created', inject([PaymentAccountsResolver], (service: PaymentAccountsResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/payment/payment-accounts-resolver.service.ts b/overlord/src/app/payment/payment-accounts-resolver.service.ts
deleted file mode 100644
index 3a4fa91a..00000000
--- a/overlord/src/app/payment/payment-accounts-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PaymentAccountsResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(): Observable<Account[]> {
-    return this.ser.paymentAutocomplete('');
-  }
-}
diff --git a/overlord/src/app/payment/payment-accounts.resolver.spec.ts b/overlord/src/app/payment/payment-accounts.resolver.spec.ts
new file mode 100644
index 00000000..4adcfa76
--- /dev/null
+++ b/overlord/src/app/payment/payment-accounts.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+
+import { paymentAccountsResolver } from './payment-accounts.resolver';
+
+describe('paymentAccountsResolver', () => {
+  const executeResolver: ResolveFn<Account[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => paymentAccountsResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/payment/payment-accounts.resolver.ts b/overlord/src/app/payment/payment-accounts.resolver.ts
new file mode 100644
index 00000000..047f7527
--- /dev/null
+++ b/overlord/src/app/payment/payment-accounts.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const paymentAccountsResolver: ResolveFn<Account[]> = () => {
+  return inject(AccountService).paymentAutocomplete('');
+};
diff --git a/overlord/src/app/payment/payment-resolver.service.spec.ts b/overlord/src/app/payment/payment-resolver.service.spec.ts
deleted file mode 100644
index d7564c35..00000000
--- a/overlord/src/app/payment/payment-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PaymentResolver } from './payment-resolver.service';
-
-describe('PaymentResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PaymentResolver],
-    });
-  });
-
-  it('should be created', inject([PaymentResolver], (service: PaymentResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/payment/payment-resolver.service.ts b/overlord/src/app/payment/payment-resolver.service.ts
deleted file mode 100644
index b10388ec..00000000
--- a/overlord/src/app/payment/payment-resolver.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PaymentResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    const account = route.queryParamMap.get('a') || null;
-    if (id !== null) {
-      return this.ser.get(id, 'Payment');
-    }
-    if (account !== null) {
-      return this.ser.getOfType('Payment', account);
-    }
-    return this.ser.getOfType('Payment');
-  }
-}
diff --git a/overlord/src/app/payment/payment-routing.module.ts b/overlord/src/app/payment/payment-routing.module.ts
index aabd46cb..c553c6e7 100644
--- a/overlord/src/app/payment/payment-routing.module.ts
+++ b/overlord/src/app/payment/payment-routing.module.ts
@@ -4,9 +4,9 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PaymentAccountsResolver } from './payment-accounts-resolver.service';
-import { PaymentResolver } from './payment-resolver.service';
+import { paymentAccountsResolver } from './payment-accounts.resolver';
 import { PaymentComponent } from './payment.component';
+import { paymentResolver } from './payment.resolver';
 
 const paymentRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const paymentRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      paymentAccounts: () => inject(PaymentAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(PaymentResolver).resolve(route),
+      paymentAccounts: paymentAccountsResolver,
+      voucher: paymentResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -34,8 +34,8 @@ const paymentRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      paymentAccounts: () => inject(PaymentAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(PaymentResolver).resolve(route),
+      paymentAccounts: paymentAccountsResolver,
+      voucher: paymentResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -44,6 +44,5 @@ const paymentRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(paymentRoutes)],
   exports: [RouterModule],
-  providers: [PaymentResolver],
 })
 export class PaymentRoutingModule {}
diff --git a/overlord/src/app/payment/payment.resolver.spec.ts b/overlord/src/app/payment/payment.resolver.spec.ts
new file mode 100644
index 00000000..d4a89b8c
--- /dev/null
+++ b/overlord/src/app/payment/payment.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { paymentResolver } from './payment.resolver';
+
+describe('paymentResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => paymentResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/payment/payment.resolver.ts b/overlord/src/app/payment/payment.resolver.ts
new file mode 100644
index 00000000..891a1177
--- /dev/null
+++ b/overlord/src/app/payment/payment.resolver.ts
@@ -0,0 +1,17 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const paymentResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  const account = route.queryParamMap.get('a') || null;
+  if (id !== null) {
+    return inject(VoucherService).get(id, 'Payment');
+  }
+  if (account !== null) {
+    return inject(VoucherService).getOfType('Payment', account);
+  }
+  return inject(VoucherService).getOfType('Payment');
+};
diff --git a/overlord/src/app/period/period-list-resolver.service.spec.ts b/overlord/src/app/period/period-list-resolver.service.spec.ts
deleted file mode 100644
index 1517dad1..00000000
--- a/overlord/src/app/period/period-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PeriodListResolver } from './period-list-resolver.service';
-
-describe('PeriodListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PeriodListResolver],
-    });
-  });
-
-  it('should be created', inject([PeriodListResolver], (service: PeriodListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/period/period-list-resolver.service.ts b/overlord/src/app/period/period-list-resolver.service.ts
deleted file mode 100644
index 8d0eb98b..00000000
--- a/overlord/src/app/period/period-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Period } from './period';
-import { PeriodService } from './period.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PeriodListResolver {
-  constructor(private ser: PeriodService) {}
-
-  resolve(): Observable<Period[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/period/period-list.resolver.spec.ts b/overlord/src/app/period/period-list.resolver.spec.ts
new file mode 100644
index 00000000..9cecfd52
--- /dev/null
+++ b/overlord/src/app/period/period-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Period } from './period';
+import { periodListResolver } from './period-list.resolver';
+
+describe('periodListResolver', () => {
+  const executeResolver: ResolveFn<Period[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => periodListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/period/period-list.resolver.ts b/overlord/src/app/period/period-list.resolver.ts
new file mode 100644
index 00000000..b092bd9d
--- /dev/null
+++ b/overlord/src/app/period/period-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Period } from './period';
+import { PeriodService } from './period.service';
+
+export const periodListResolver: ResolveFn<Period[]> = () => {
+  return inject(PeriodService).list();
+};
diff --git a/overlord/src/app/period/period-resolver.service.spec.ts b/overlord/src/app/period/period-resolver.service.spec.ts
deleted file mode 100644
index f481d135..00000000
--- a/overlord/src/app/period/period-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { PeriodResolver } from './period-resolver.service';
-
-describe('PeriodResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [PeriodResolver],
-    });
-  });
-
-  it('should be created', inject([PeriodResolver], (service: PeriodResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/period/period-resolver.service.ts b/overlord/src/app/period/period-resolver.service.ts
deleted file mode 100644
index 2f7092ba..00000000
--- a/overlord/src/app/period/period-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Period } from './period';
-import { PeriodService } from './period.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PeriodResolver {
-  constructor(private ser: PeriodService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Period> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/period/period-routing.module.ts b/overlord/src/app/period/period-routing.module.ts
index 0ee021c7..b27b78fc 100644
--- a/overlord/src/app/period/period-routing.module.ts
+++ b/overlord/src/app/period/period-routing.module.ts
@@ -3,12 +3,12 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
+import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver';
 
 import { PeriodDetailComponent } from './period-detail/period-detail.component';
 import { PeriodListComponent } from './period-list/period-list.component';
-import { PeriodListResolver } from './period-list-resolver.service';
-import { PeriodResolver } from './period-resolver.service';
+import { periodListResolver } from './period-list.resolver';
+import { periodResolver } from './period.resolver';
 
 const periodRoutes: Routes = [
   {
@@ -21,7 +21,7 @@ const periodRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      list: () => inject(PeriodListResolver).resolve(),
+      list: periodListResolver,
     },
   },
   {
@@ -34,8 +34,8 @@ const periodRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(PeriodResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: periodResolver,
+      costCentres: costCentreListResolver,
     },
   },
   {
@@ -48,8 +48,8 @@ const periodRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(PeriodResolver).resolve(route),
-      costCentres: () => inject(CostCentreListResolver).resolve(),
+      item: periodResolver,
+      costCentres: costCentreListResolver,
     },
   },
 ];
@@ -57,6 +57,5 @@ const periodRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(periodRoutes)],
   exports: [RouterModule],
-  providers: [PeriodListResolver, PeriodResolver],
 })
 export class PeriodRoutingModule {}
diff --git a/overlord/src/app/period/period.resolver.spec.ts b/overlord/src/app/period/period.resolver.spec.ts
new file mode 100644
index 00000000..4e7788b7
--- /dev/null
+++ b/overlord/src/app/period/period.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Period } from './period';
+import { periodResolver } from './period.resolver';
+
+describe('periodResolver', () => {
+  const executeResolver: ResolveFn<Period> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => periodResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/period/period.resolver.ts b/overlord/src/app/period/period.resolver.ts
new file mode 100644
index 00000000..9c41d359
--- /dev/null
+++ b/overlord/src/app/period/period.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Period } from './period';
+import { PeriodService } from './period.service';
+
+export const periodResolver: ResolveFn<Period> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(PeriodService).get(id);
+};
diff --git a/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts b/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts
deleted file mode 100644
index f46a3c66..00000000
--- a/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ProductGroupListResolver } from './product-group-list-resolver.service';
-
-describe('ProductGroupListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductGroupListResolver],
-    });
-  });
-
-  it('should be created', inject([ProductGroupListResolver], (service: ProductGroupListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/product-group/product-group-list-resolver.service.ts b/overlord/src/app/product-group/product-group-list-resolver.service.ts
deleted file mode 100644
index 30aa24b2..00000000
--- a/overlord/src/app/product-group/product-group-list-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProductGroup } from '../core/product-group';
-
-import { ProductGroupService } from './product-group.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductGroupListResolver {
-  constructor(private ser: ProductGroupService) {}
-
-  resolve(): Observable<ProductGroup[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/product-group/product-group-list.resolver.spec.ts b/overlord/src/app/product-group/product-group-list.resolver.spec.ts
new file mode 100644
index 00000000..7fdde6fb
--- /dev/null
+++ b/overlord/src/app/product-group/product-group-list.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { productGroupListResolver } from './product-group-list.resolver';
+
+describe('productGroupListResolver', () => {
+  const executeResolver: ResolveFn<ProductGroup[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productGroupListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/product-group/product-group-list.resolver.ts b/overlord/src/app/product-group/product-group-list.resolver.ts
new file mode 100644
index 00000000..c61beea9
--- /dev/null
+++ b/overlord/src/app/product-group/product-group-list.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { ProductGroupService } from './product-group.service';
+
+export const productGroupListResolver: ResolveFn<ProductGroup[]> = () => {
+  return inject(ProductGroupService).list();
+};
diff --git a/overlord/src/app/product-group/product-group-resolver.service.spec.ts b/overlord/src/app/product-group/product-group-resolver.service.spec.ts
deleted file mode 100644
index 376555c1..00000000
--- a/overlord/src/app/product-group/product-group-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ProductGroupResolver } from './product-group-resolver.service';
-
-describe('ProductGroupResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductGroupResolver],
-    });
-  });
-
-  it('should be created', inject([ProductGroupResolver], (service: ProductGroupResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/product-group/product-group-resolver.service.ts b/overlord/src/app/product-group/product-group-resolver.service.ts
deleted file mode 100644
index 9385f37b..00000000
--- a/overlord/src/app/product-group/product-group-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProductGroup } from '../core/product-group';
-
-import { ProductGroupService } from './product-group.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductGroupResolver {
-  constructor(private ser: ProductGroupService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ProductGroup> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/product-group/product-group-routing.module.ts b/overlord/src/app/product-group/product-group-routing.module.ts
index ac7e09d3..efcff1e1 100644
--- a/overlord/src/app/product-group/product-group-routing.module.ts
+++ b/overlord/src/app/product-group/product-group-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component';
 import { ProductGroupListComponent } from './product-group-list/product-group-list.component';
-import { ProductGroupListResolver } from './product-group-list-resolver.service';
-import { ProductGroupResolver } from './product-group-resolver.service';
+import { productGroupListResolver } from './product-group-list.resolver';
+import { productGroupResolver } from './product-group.resolver';
 
 const productGroupRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const productGroupRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      list: () => inject(ProductGroupListResolver).resolve(),
+      list: productGroupListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const productGroupRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductGroupResolver).resolve(route),
+      item: productGroupResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const productGroupRoutes: Routes = [
       permission: 'Cost Centres',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductGroupResolver).resolve(route),
+      item: productGroupResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const productGroupRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(productGroupRoutes)],
   exports: [RouterModule],
-  providers: [ProductGroupListResolver, ProductGroupResolver],
 })
 export class ProductGroupRoutingModule {}
diff --git a/overlord/src/app/product-group/product-group.resolver.spec.ts b/overlord/src/app/product-group/product-group.resolver.spec.ts
new file mode 100644
index 00000000..0e5c4ab1
--- /dev/null
+++ b/overlord/src/app/product-group/product-group.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { productGroupResolver } from './product-group.resolver';
+
+describe('productGroupResolver', () => {
+  const executeResolver: ResolveFn<ProductGroup> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productGroupResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/product-group/product-group.resolver.ts b/overlord/src/app/product-group/product-group.resolver.ts
new file mode 100644
index 00000000..277c9565
--- /dev/null
+++ b/overlord/src/app/product-group/product-group.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProductGroup } from '../core/product-group';
+
+import { ProductGroupService } from './product-group.service';
+
+export const productGroupResolver: ResolveFn<ProductGroup> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ProductGroupService).get(id);
+};
diff --git a/overlord/src/app/product-ledger/product-ledger-resolver.service.spec.ts b/overlord/src/app/product-ledger/product-ledger-resolver.service.spec.ts
deleted file mode 100644
index 661e3d8a..00000000
--- a/overlord/src/app/product-ledger/product-ledger-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ProductLedgerResolver } from './product-ledger-resolver.service';
-
-describe('ProductLedgerResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ProductLedgerResolver],
-    });
-  });
-
-  it('should be created', inject([ProductLedgerResolver], (service: ProductLedgerResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/product-ledger/product-ledger-resolver.service.ts b/overlord/src/app/product-ledger/product-ledger-resolver.service.ts
deleted file mode 100644
index 250cf783..00000000
--- a/overlord/src/app/product-ledger/product-ledger-resolver.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProductLedger } from './product-ledger';
-import { ProductLedgerService } from './product-ledger.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductLedgerResolver {
-  constructor(private ser: ProductLedgerService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ProductLedger> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/product-ledger/product-ledger-routing.module.ts b/overlord/src/app/product-ledger/product-ledger-routing.module.ts
index 104f9d42..00283003 100644
--- a/overlord/src/app/product-ledger/product-ledger-routing.module.ts
+++ b/overlord/src/app/product-ledger/product-ledger-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { ProductLedgerResolver } from './product-ledger-resolver.service';
 import { ProductLedgerComponent } from './product-ledger.component';
+import { productLedgerResolver } from './product-ledger.resolver';
 
 const productLedgerRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const productLedgerRoutes: Routes = [
       permission: 'Product Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ProductLedgerResolver).resolve(route),
+      info: productLedgerResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const productLedgerRoutes: Routes = [
       permission: 'Product Ledger',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ProductLedgerResolver).resolve(route),
+      info: productLedgerResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const productLedgerRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(productLedgerRoutes)],
   exports: [RouterModule],
-  providers: [ProductLedgerResolver],
 })
 export class ProductLedgerRoutingModule {}
diff --git a/overlord/src/app/product-ledger/product-ledger.resolver.spec.ts b/overlord/src/app/product-ledger/product-ledger.resolver.spec.ts
new file mode 100644
index 00000000..44559bb0
--- /dev/null
+++ b/overlord/src/app/product-ledger/product-ledger.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProductLedger } from './product-ledger';
+import { productLedgerResolver } from './product-ledger.resolver';
+
+describe('productLedgerResolver', () => {
+  const executeResolver: ResolveFn<ProductLedger> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productLedgerResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/product-ledger/product-ledger.resolver.ts b/overlord/src/app/product-ledger/product-ledger.resolver.ts
new file mode 100644
index 00000000..7da09c9c
--- /dev/null
+++ b/overlord/src/app/product-ledger/product-ledger.resolver.ts
@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProductLedger } from './product-ledger';
+import { ProductLedgerService } from './product-ledger.service';
+
+export const productLedgerResolver: ResolveFn<ProductLedger> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(ProductLedgerService).list(id, startDate, finishDate);
+};
diff --git a/overlord/src/app/product/product-list-resolver.service.spec.ts b/overlord/src/app/product/product-list-resolver.service.spec.ts
deleted file mode 100644
index e285b2b0..00000000
--- a/overlord/src/app/product/product-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ProductListResolver } from './product-list-resolver.service';
-
-describe('ProductListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ProductListResolver],
-    });
-  });
-
-  it('should be created', inject([ProductListResolver], (service: ProductListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/product/product-list-resolver.service.ts b/overlord/src/app/product/product-list-resolver.service.ts
deleted file mode 100644
index f2be3370..00000000
--- a/overlord/src/app/product/product-list-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Product } from '../core/product';
-
-import { ProductService } from './product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductListResolver {
-  constructor(private ser: ProductService) {}
-
-  resolve(): Observable<Product[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/product/product-list.resolver.spec.ts b/overlord/src/app/product/product-list.resolver.spec.ts
new file mode 100644
index 00000000..bc481571
--- /dev/null
+++ b/overlord/src/app/product/product-list.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { productListResolver } from './product-list.resolver';
+
+describe('productListResolver', () => {
+  const executeResolver: ResolveFn<Product[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/product/product-list.resolver.ts b/overlord/src/app/product/product-list.resolver.ts
new file mode 100644
index 00000000..c50e3549
--- /dev/null
+++ b/overlord/src/app/product/product-list.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productListResolver: ResolveFn<Product[]> = () => {
+  return inject(ProductService).list();
+};
diff --git a/overlord/src/app/product/product-resolver.service.spec.ts b/overlord/src/app/product/product-resolver.service.spec.ts
deleted file mode 100644
index fb76cb88..00000000
--- a/overlord/src/app/product/product-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ProductResolver } from './product-resolver.service';
-
-describe('ProductResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [ProductResolver],
-    });
-  });
-
-  it('should be created', inject([ProductResolver], (service: ProductResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/product/product-resolver.service.ts b/overlord/src/app/product/product-resolver.service.ts
deleted file mode 100644
index 8e7fd4b3..00000000
--- a/overlord/src/app/product/product-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Product } from '../core/product';
-
-import { ProductService } from './product.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductResolver {
-  constructor(private ser: ProductService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Product> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/product/product-routing.module.ts b/overlord/src/app/product/product-routing.module.ts
index 71aea44d..3033c143 100644
--- a/overlord/src/app/product/product-routing.module.ts
+++ b/overlord/src/app/product/product-routing.module.ts
@@ -3,12 +3,12 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { ProductGroupListResolver } from '../product-group/product-group-list-resolver.service';
+import { productGroupListResolver } from '../product-group/product-group-list.resolver';
 
 import { ProductDetailComponent } from './product-detail/product-detail.component';
 import { ProductListComponent } from './product-list/product-list.component';
-import { ProductListResolver } from './product-list-resolver.service';
-import { ProductResolver } from './product-resolver.service';
+import { productListResolver } from './product-list.resolver';
+import { productResolver } from './product.resolver';
 
 const productRoutes: Routes = [
   {
@@ -21,7 +21,7 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      list: () => inject(ProductListResolver).resolve(),
+      list: productListResolver,
     },
   },
   {
@@ -34,8 +34,8 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
-      productGroups: () => inject(ProductGroupListResolver).resolve(),
+      item: productResolver,
+      productGroups: productGroupListResolver,
     },
   },
   {
@@ -48,8 +48,8 @@ const productRoutes: Routes = [
       permission: 'Products',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
-      productGroups: () => inject(ProductGroupListResolver).resolve(),
+      item: productResolver,
+      productGroups: productGroupListResolver,
     },
   },
 ];
@@ -57,6 +57,5 @@ const productRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(productRoutes)],
   exports: [RouterModule],
-  providers: [ProductListResolver, ProductResolver],
 })
 export class ProductRoutingModule {}
diff --git a/overlord/src/app/product/product.resolver.spec.ts b/overlord/src/app/product/product.resolver.spec.ts
new file mode 100644
index 00000000..cbbaed07
--- /dev/null
+++ b/overlord/src/app/product/product.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { productResolver } from './product.resolver';
+
+describe('productResolver', () => {
+  const executeResolver: ResolveFn<Product> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => productResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/product/product.resolver.ts b/overlord/src/app/product/product.resolver.ts
new file mode 100644
index 00000000..548a4816
--- /dev/null
+++ b/overlord/src/app/product/product.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Product } from '../core/product';
+
+import { ProductService } from './product.service';
+
+export const productResolver: ResolveFn<Product> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(ProductService).get(id);
+};
diff --git a/overlord/src/app/profit-loss/profit-loss-resolver.service.spec.ts b/overlord/src/app/profit-loss/profit-loss-resolver.service.spec.ts
deleted file mode 100644
index 664edcd5..00000000
--- a/overlord/src/app/profit-loss/profit-loss-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ProfitLossResolver } from './profit-loss-resolver.service';
-
-describe('ProfitLossResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ProfitLossResolver],
-    });
-  });
-
-  it('should be created', inject([ProfitLossResolver], (service: ProfitLossResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/profit-loss/profit-loss-resolver.service.ts b/overlord/src/app/profit-loss/profit-loss-resolver.service.ts
deleted file mode 100644
index 6ee18be4..00000000
--- a/overlord/src/app/profit-loss/profit-loss-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { ProfitLoss } from './profit-loss';
-import { ProfitLossService } from './profit-loss.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProfitLossResolver {
-  constructor(private ser: ProfitLossService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<ProfitLoss> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/profit-loss/profit-loss-routing.module.ts b/overlord/src/app/profit-loss/profit-loss-routing.module.ts
index 9c55251e..6e770faf 100644
--- a/overlord/src/app/profit-loss/profit-loss-routing.module.ts
+++ b/overlord/src/app/profit-loss/profit-loss-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { ProfitLossResolver } from './profit-loss-resolver.service';
 import { ProfitLossComponent } from './profit-loss.component';
+import { profitLossResolver } from './profit-loss.resolver';
 
 const profitLossRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const profitLossRoutes: Routes = [
       permission: 'Profit & Loss',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(ProfitLossResolver).resolve(route),
+      info: profitLossResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const profitLossRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(profitLossRoutes)],
   exports: [RouterModule],
-  providers: [ProfitLossResolver],
 })
 export class ProfitLossRoutingModule {}
diff --git a/overlord/src/app/profit-loss/profit-loss.resolver.spec.ts b/overlord/src/app/profit-loss/profit-loss.resolver.spec.ts
new file mode 100644
index 00000000..2b735beb
--- /dev/null
+++ b/overlord/src/app/profit-loss/profit-loss.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { ProfitLoss } from './profit-loss';
+import { profitLossResolver } from './profit-loss.resolver';
+
+describe('profitLossResolver', () => {
+  const executeResolver: ResolveFn<ProfitLoss> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => profitLossResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/profit-loss/profit-loss.resolver.ts b/overlord/src/app/profit-loss/profit-loss.resolver.ts
new file mode 100644
index 00000000..df9d225e
--- /dev/null
+++ b/overlord/src/app/profit-loss/profit-loss.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { ProfitLoss } from './profit-loss';
+import { ProfitLossService } from './profit-loss.service';
+
+export const profitLossResolver: ResolveFn<ProfitLoss> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(ProfitLossService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/purchase-entries/purchase-entries-resolver.service.spec.ts b/overlord/src/app/purchase-entries/purchase-entries-resolver.service.spec.ts
deleted file mode 100644
index a0704f39..00000000
--- a/overlord/src/app/purchase-entries/purchase-entries-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PurchaseEntriesResolver } from './purchase-entries-resolver.service';
-
-describe('PurchaseEntriesResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PurchaseEntriesResolver],
-    });
-  });
-
-  it('should be created', inject([PurchaseEntriesResolver], (service: PurchaseEntriesResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/purchase-entries/purchase-entries-resolver.service.ts b/overlord/src/app/purchase-entries/purchase-entries-resolver.service.ts
deleted file mode 100644
index 218acd03..00000000
--- a/overlord/src/app/purchase-entries/purchase-entries-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { PurchaseEntries } from './purchase-entries';
-import { PurchaseEntriesService } from './purchase-entries.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PurchaseEntriesResolver {
-  constructor(private ser: PurchaseEntriesService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<PurchaseEntries> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts
index 9435f478..d4847db1 100644
--- a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts
+++ b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PurchaseEntriesResolver } from './purchase-entries-resolver.service';
 import { PurchaseEntriesComponent } from './purchase-entries.component';
+import { purchaseEntriesResolver } from './purchase-entries.resolver';
 
 const purchaseEntriesRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const purchaseEntriesRoutes: Routes = [
       permission: 'Purchase Entries',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(PurchaseEntriesResolver).resolve(route),
+      info: purchaseEntriesResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const purchaseEntriesRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(purchaseEntriesRoutes)],
   exports: [RouterModule],
-  providers: [PurchaseEntriesResolver],
 })
 export class PurchaseEntriesRoutingModule {}
diff --git a/overlord/src/app/purchase-entries/purchase-entries.resolver.spec.ts b/overlord/src/app/purchase-entries/purchase-entries.resolver.spec.ts
new file mode 100644
index 00000000..852c2745
--- /dev/null
+++ b/overlord/src/app/purchase-entries/purchase-entries.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { PurchaseEntries } from './purchase-entries';
+import { purchaseEntriesResolver } from './purchase-entries.resolver';
+
+describe('purchaseEntriesResolver', () => {
+  const executeResolver: ResolveFn<PurchaseEntries> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => purchaseEntriesResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/purchase-entries/purchase-entries.resolver.ts b/overlord/src/app/purchase-entries/purchase-entries.resolver.ts
new file mode 100644
index 00000000..445e8c3e
--- /dev/null
+++ b/overlord/src/app/purchase-entries/purchase-entries.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { PurchaseEntries } from './purchase-entries';
+import { PurchaseEntriesService } from './purchase-entries.service';
+
+export const purchaseEntriesResolver: ResolveFn<PurchaseEntries> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(PurchaseEntriesService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/purchase-return/purchase-return-resolver.service.spec.ts b/overlord/src/app/purchase-return/purchase-return-resolver.service.spec.ts
deleted file mode 100644
index 1af2d40e..00000000
--- a/overlord/src/app/purchase-return/purchase-return-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PurchaseReturnResolver } from './purchase-return-resolver.service';
-
-describe('PurchaseReturnResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PurchaseReturnResolver],
-    });
-  });
-
-  it('should be created', inject([PurchaseReturnResolver], (service: PurchaseReturnResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/purchase-return/purchase-return-resolver.service.ts b/overlord/src/app/purchase-return/purchase-return-resolver.service.ts
deleted file mode 100644
index 2d955c7b..00000000
--- a/overlord/src/app/purchase-return/purchase-return-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PurchaseReturnResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Purchase Return');
-    }
-    return this.ser.get(id, 'Purchase Return');
-  }
-}
diff --git a/overlord/src/app/purchase-return/purchase-return-routing.module.ts b/overlord/src/app/purchase-return/purchase-return-routing.module.ts
index db7f3c77..ceae5990 100644
--- a/overlord/src/app/purchase-return/purchase-return-routing.module.ts
+++ b/overlord/src/app/purchase-return/purchase-return-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PurchaseReturnResolver } from './purchase-return-resolver.service';
 import { PurchaseReturnComponent } from './purchase-return.component';
+import { purchaseReturnResolver } from './purchase-return.resolver';
 
 const purchaseReturnRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const purchaseReturnRoutes: Routes = [
       permission: 'Purchase Return',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(PurchaseReturnResolver).resolve(route),
+      voucher: purchaseReturnResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const purchaseReturnRoutes: Routes = [
       permission: 'Purchase Return',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(PurchaseReturnResolver).resolve(route),
+      voucher: purchaseReturnResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const purchaseReturnRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(purchaseReturnRoutes)],
   exports: [RouterModule],
-  providers: [PurchaseReturnResolver],
 })
 export class PurchaseReturnRoutingModule {}
diff --git a/overlord/src/app/purchase-return/purchase-return.resolver.spec.ts b/overlord/src/app/purchase-return/purchase-return.resolver.spec.ts
new file mode 100644
index 00000000..2ef85aae
--- /dev/null
+++ b/overlord/src/app/purchase-return/purchase-return.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { purchaseReturnResolver } from './purchase-return.resolver';
+
+describe('purchaseReturnResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => purchaseReturnResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/purchase-return/purchase-return.resolver.ts b/overlord/src/app/purchase-return/purchase-return.resolver.ts
new file mode 100644
index 00000000..a5034315
--- /dev/null
+++ b/overlord/src/app/purchase-return/purchase-return.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const purchaseReturnResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Purchase Return');
+  }
+  return inject(VoucherService).get(id, 'Purchase Return');
+};
diff --git a/overlord/src/app/purchase/purchase-resolver.service.spec.ts b/overlord/src/app/purchase/purchase-resolver.service.spec.ts
deleted file mode 100644
index e048a883..00000000
--- a/overlord/src/app/purchase/purchase-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PurchaseResolver } from './purchase-resolver.service';
-
-describe('PurchaseResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PurchaseResolver],
-    });
-  });
-
-  it('should be created', inject([PurchaseResolver], (service: PurchaseResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/purchase/purchase-resolver.service.ts b/overlord/src/app/purchase/purchase-resolver.service.ts
deleted file mode 100644
index 2df3cafb..00000000
--- a/overlord/src/app/purchase/purchase-resolver.service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PurchaseResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    if (id === null) {
-      return this.ser.getOfType('Purchase');
-    }
-    return this.ser.get(id, 'Purchase');
-  }
-}
diff --git a/overlord/src/app/purchase/purchase-routing.module.ts b/overlord/src/app/purchase/purchase-routing.module.ts
index e52cd2bd..ffc15fc6 100644
--- a/overlord/src/app/purchase/purchase-routing.module.ts
+++ b/overlord/src/app/purchase/purchase-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PurchaseResolver } from './purchase-resolver.service';
 import { PurchaseComponent } from './purchase.component';
+import { purchaseResolver } from './purchase.resolver';
 
 const purchaseRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const purchaseRoutes: Routes = [
       permission: 'Purchase',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(PurchaseResolver).resolve(route),
+      voucher: purchaseResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const purchaseRoutes: Routes = [
       permission: 'Purchase',
     },
     resolve: {
-      voucher: (route: ActivatedRouteSnapshot) => inject(PurchaseResolver).resolve(route),
+      voucher: purchaseResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const purchaseRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(purchaseRoutes)],
   exports: [RouterModule],
-  providers: [PurchaseResolver],
 })
 export class PurchaseRoutingModule {}
diff --git a/overlord/src/app/purchase/purchase.resolver.spec.ts b/overlord/src/app/purchase/purchase.resolver.spec.ts
new file mode 100644
index 00000000..58926556
--- /dev/null
+++ b/overlord/src/app/purchase/purchase.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { purchaseResolver } from './purchase.resolver';
+
+describe('purchaseResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => purchaseResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/purchase/purchase.resolver.ts b/overlord/src/app/purchase/purchase.resolver.ts
new file mode 100644
index 00000000..0b784c9c
--- /dev/null
+++ b/overlord/src/app/purchase/purchase.resolver.ts
@@ -0,0 +1,13 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const purchaseResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  if (id === null) {
+    return inject(VoucherService).getOfType('Purchase');
+  }
+  return inject(VoucherService).get(id, 'Purchase');
+};
diff --git a/overlord/src/app/purchases/purchases-resolver.service.spec.ts b/overlord/src/app/purchases/purchases-resolver.service.spec.ts
deleted file mode 100644
index f12140c0..00000000
--- a/overlord/src/app/purchases/purchases-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { PurchasesResolver } from './purchases-resolver.service';
-
-describe('PurchasesResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [PurchasesResolver],
-    });
-  });
-
-  it('should be created', inject([PurchasesResolver], (service: PurchasesResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/purchases/purchases-resolver.service.ts b/overlord/src/app/purchases/purchases-resolver.service.ts
deleted file mode 100644
index c17ccba9..00000000
--- a/overlord/src/app/purchases/purchases-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Purchases } from './purchases';
-import { PurchasesService } from './purchases.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class PurchasesResolver {
-  constructor(private ser: PurchasesService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Purchases> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/purchases/purchases-routing.module.ts b/overlord/src/app/purchases/purchases-routing.module.ts
index 1379fb78..91c15383 100644
--- a/overlord/src/app/purchases/purchases-routing.module.ts
+++ b/overlord/src/app/purchases/purchases-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { PurchasesResolver } from './purchases-resolver.service';
 import { PurchasesComponent } from './purchases.component';
+import { purchasesResolver } from './purchases.resolver';
 
 const purchasesRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const purchasesRoutes: Routes = [
       permission: 'Purchases',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(PurchasesResolver).resolve(route),
+      info: purchasesResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const purchasesRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(purchasesRoutes)],
   exports: [RouterModule],
-  providers: [PurchasesResolver],
 })
 export class PurchasesRoutingModule {}
diff --git a/overlord/src/app/purchases/purchases.resolver.spec.ts b/overlord/src/app/purchases/purchases.resolver.spec.ts
new file mode 100644
index 00000000..cd375f21
--- /dev/null
+++ b/overlord/src/app/purchases/purchases.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Purchases } from './purchases';
+import { purchasesResolver } from './purchases.resolver';
+
+describe('purchasesResolver', () => {
+  const executeResolver: ResolveFn<Purchases> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => purchasesResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/purchases/purchases.resolver.ts b/overlord/src/app/purchases/purchases.resolver.ts
new file mode 100644
index 00000000..86d2205e
--- /dev/null
+++ b/overlord/src/app/purchases/purchases.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Purchases } from './purchases';
+import { PurchasesService } from './purchases.service';
+
+export const purchasesResolver: ResolveFn<Purchases> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(PurchasesService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts b/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts
deleted file mode 100644
index 277abc79..00000000
--- a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RateContractListResolver } from './rate-contract-list-resolver.service';
-
-describe('RateContractListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RateContractListResolver],
-    });
-  });
-
-  it('should be created', inject([RateContractListResolver], (service: RateContractListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.ts b/overlord/src/app/rate-contract/rate-contract-list-resolver.service.ts
deleted file mode 100644
index 5e0bbc25..00000000
--- a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { RateContract } from './rate-contract';
-import { RateContractService } from './rate-contract.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RateContractListResolver {
-  constructor(private ser: RateContractService) {}
-
-  resolve(): Observable<RateContract[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/rate-contract/rate-contract-list.resolver.spec.ts b/overlord/src/app/rate-contract/rate-contract-list.resolver.spec.ts
new file mode 100644
index 00000000..66c33c7e
--- /dev/null
+++ b/overlord/src/app/rate-contract/rate-contract-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { RateContract } from './rate-contract';
+import { rateContractListResolver } from './rate-contract-list.resolver';
+
+describe('rateContractListResolver', () => {
+  const executeResolver: ResolveFn<RateContract[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => rateContractListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/rate-contract/rate-contract-list.resolver.ts b/overlord/src/app/rate-contract/rate-contract-list.resolver.ts
new file mode 100644
index 00000000..7b9a5397
--- /dev/null
+++ b/overlord/src/app/rate-contract/rate-contract-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { RateContract } from './rate-contract';
+import { RateContractService } from './rate-contract.service';
+
+export const rateContractListResolver: ResolveFn<RateContract[]> = () => {
+  return inject(RateContractService).list();
+};
diff --git a/overlord/src/app/rate-contract/rate-contract-resolver.service.spec.ts b/overlord/src/app/rate-contract/rate-contract-resolver.service.spec.ts
deleted file mode 100644
index 8542b384..00000000
--- a/overlord/src/app/rate-contract/rate-contract-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RateContractResolver } from './rate-contract-resolver.service';
-
-describe('RateContractResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RateContractResolver],
-    });
-  });
-
-  it('should be created', inject([RateContractResolver], (service: RateContractResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/rate-contract/rate-contract-resolver.service.ts b/overlord/src/app/rate-contract/rate-contract-resolver.service.ts
deleted file mode 100644
index 5d17b654..00000000
--- a/overlord/src/app/rate-contract/rate-contract-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { RateContract } from './rate-contract';
-import { RateContractService } from './rate-contract.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RateContractResolver {
-  constructor(private ser: RateContractService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<RateContract> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/rate-contract/rate-contract-routing.module.ts b/overlord/src/app/rate-contract/rate-contract-routing.module.ts
index 5382740f..cfad85ce 100644
--- a/overlord/src/app/rate-contract/rate-contract-routing.module.ts
+++ b/overlord/src/app/rate-contract/rate-contract-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { RateContractDetailComponent } from './rate-contract-detail/rate-contract-detail.component';
 import { RateContractListComponent } from './rate-contract-list/rate-contract-list.component';
-import { RateContractListResolver } from './rate-contract-list-resolver.service';
-import { RateContractResolver } from './rate-contract-resolver.service';
+import { rateContractListResolver } from './rate-contract-list.resolver';
+import { rateContractResolver } from './rate-contract.resolver';
 
 const rateContractRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const rateContractRoutes: Routes = [
       permission: 'Rate Contracts',
     },
     resolve: {
-      list: () => inject(RateContractListResolver).resolve(),
+      list: rateContractListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const rateContractRoutes: Routes = [
       permission: 'Rate Contracts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RateContractResolver).resolve(route),
+      item: rateContractResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const rateContractRoutes: Routes = [
       permission: 'Rate Contracts',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RateContractResolver).resolve(route),
+      item: rateContractResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const rateContractRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(rateContractRoutes)],
   exports: [RouterModule],
-  providers: [RateContractListResolver, RateContractResolver],
 })
 export class RateContractRoutingModule {}
diff --git a/overlord/src/app/rate-contract/rate-contract.resolver.spec.ts b/overlord/src/app/rate-contract/rate-contract.resolver.spec.ts
new file mode 100644
index 00000000..089285f7
--- /dev/null
+++ b/overlord/src/app/rate-contract/rate-contract.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { RateContract } from './rate-contract';
+import { rateContractResolver } from './rate-contract.resolver';
+
+describe('rateContractResolver', () => {
+  const executeResolver: ResolveFn<RateContract> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => rateContractResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/rate-contract/rate-contract.resolver.ts b/overlord/src/app/rate-contract/rate-contract.resolver.ts
new file mode 100644
index 00000000..24816c5a
--- /dev/null
+++ b/overlord/src/app/rate-contract/rate-contract.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { RateContract } from './rate-contract';
+import { RateContractService } from './rate-contract.service';
+
+export const rateContractResolver: ResolveFn<RateContract> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(RateContractService).get(id);
+};
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.spec.ts b/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.spec.ts
deleted file mode 100644
index d7b6c949..00000000
--- a/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { RawMaterialCostResolver } from './raw-material-cost-resolver.service';
-
-describe('RawMaterialCostResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [RawMaterialCostResolver],
-    });
-  });
-
-  it('should be created', inject([RawMaterialCostResolver], (service: RawMaterialCostResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.ts b/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.ts
deleted file mode 100644
index cfb9997f..00000000
--- a/overlord/src/app/raw-material-cost/raw-material-cost-resolver.service.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { RawMaterialCost } from './raw-material-cost';
-import { RawMaterialCostService } from './raw-material-cost.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RawMaterialCostResolver {
-  constructor(private ser: RawMaterialCostService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<RawMaterialCost> {
-    const id = route.paramMap.get('id') || null;
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(id, startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts
index 45fb6572..997ad6a9 100644
--- a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts
+++ b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { RawMaterialCostResolver } from './raw-material-cost-resolver.service';
 import { RawMaterialCostComponent } from './raw-material-cost.component';
+import { rawMaterialCostResolver } from './raw-material-cost.resolver';
 
 const rawMaterialCostRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const rawMaterialCostRoutes: Routes = [
       permission: 'Raw Material Cost',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(RawMaterialCostResolver).resolve(route),
+      info: rawMaterialCostResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const rawMaterialCostRoutes: Routes = [
       permission: 'Raw Material Cost',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(RawMaterialCostResolver).resolve(route),
+      info: rawMaterialCostResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const rawMaterialCostRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(rawMaterialCostRoutes)],
   exports: [RouterModule],
-  providers: [RawMaterialCostResolver],
 })
 export class RawMaterialCostRoutingModule {}
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.resolver.spec.ts b/overlord/src/app/raw-material-cost/raw-material-cost.resolver.spec.ts
new file mode 100644
index 00000000..9c3e0b9a
--- /dev/null
+++ b/overlord/src/app/raw-material-cost/raw-material-cost.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { RawMaterialCost } from './raw-material-cost';
+import { rawMaterialCostResolver } from './raw-material-cost.resolver';
+
+describe('rawMaterialCostResolver', () => {
+  const executeResolver: ResolveFn<RawMaterialCost> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => rawMaterialCostResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.resolver.ts b/overlord/src/app/raw-material-cost/raw-material-cost.resolver.ts
new file mode 100644
index 00000000..ccd56819
--- /dev/null
+++ b/overlord/src/app/raw-material-cost/raw-material-cost.resolver.ts
@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { RawMaterialCost } from './raw-material-cost';
+import { RawMaterialCostService } from './raw-material-cost.service';
+
+export const rawMaterialCostResolver: ResolveFn<RawMaterialCost> = (route) => {
+  const id = route.paramMap.get('id') || null;
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(RawMaterialCostService).list(id, startDate, finishDate);
+};
diff --git a/overlord/src/app/receipt/receipt-accounts-resolver.service.spec.ts b/overlord/src/app/receipt/receipt-accounts-resolver.service.spec.ts
deleted file mode 100644
index e353aad2..00000000
--- a/overlord/src/app/receipt/receipt-accounts-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ReceiptAccountsResolver } from './receipt-accounts-resolver.service';
-
-describe('ReceiptAccountsResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ReceiptAccountsResolver],
-    });
-  });
-
-  it('should be created', inject([ReceiptAccountsResolver], (service: ReceiptAccountsResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/receipt/receipt-accounts-resolver.service.ts b/overlord/src/app/receipt/receipt-accounts-resolver.service.ts
deleted file mode 100644
index 5562a1f5..00000000
--- a/overlord/src/app/receipt/receipt-accounts-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Account } from '../core/account';
-import { AccountService } from '../core/account.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ReceiptAccountsResolver {
-  constructor(private ser: AccountService) {}
-
-  resolve(): Observable<Account[]> {
-    return this.ser.receiptAutocomplete('');
-  }
-}
diff --git a/overlord/src/app/receipt/receipt-accounts.resolver.spec.ts b/overlord/src/app/receipt/receipt-accounts.resolver.spec.ts
new file mode 100644
index 00000000..72e57c17
--- /dev/null
+++ b/overlord/src/app/receipt/receipt-accounts.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+
+import { receiptAccountsResolver } from './receipt-accounts.resolver';
+
+describe('receiptAccountsResolver', () => {
+  const executeResolver: ResolveFn<Account[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => receiptAccountsResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/receipt/receipt-accounts.resolver.ts b/overlord/src/app/receipt/receipt-accounts.resolver.ts
new file mode 100644
index 00000000..26f647b7
--- /dev/null
+++ b/overlord/src/app/receipt/receipt-accounts.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Account } from '../core/account';
+import { AccountService } from '../core/account.service';
+
+export const receiptAccountsResolver: ResolveFn<Account[]> = () => {
+  return inject(AccountService).receiptAutocomplete('');
+};
diff --git a/overlord/src/app/receipt/receipt-resolver.service.spec.ts b/overlord/src/app/receipt/receipt-resolver.service.spec.ts
deleted file mode 100644
index fa3bfd92..00000000
--- a/overlord/src/app/receipt/receipt-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { ReceiptResolver } from './receipt-resolver.service';
-
-describe('ReceiptResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [ReceiptResolver],
-    });
-  });
-
-  it('should be created', inject([ReceiptResolver], (service: ReceiptResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/receipt/receipt-resolver.service.ts b/overlord/src/app/receipt/receipt-resolver.service.ts
deleted file mode 100644
index 7c5ab154..00000000
--- a/overlord/src/app/receipt/receipt-resolver.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Voucher } from '../core/voucher';
-import { VoucherService } from '../core/voucher.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ReceiptResolver {
-  constructor(private ser: VoucherService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
-    const id = route.paramMap.get('id');
-    const account = route.queryParamMap.get('a') || null;
-    if (id !== null) {
-      return this.ser.get(id, 'Receipt');
-    }
-    if (account !== null) {
-      return this.ser.getOfType('Receipt', account);
-    }
-    return this.ser.getOfType('Receipt');
-  }
-}
diff --git a/overlord/src/app/receipt/receipt-routing.module.ts b/overlord/src/app/receipt/receipt-routing.module.ts
index 102df19b..5c2770ac 100644
--- a/overlord/src/app/receipt/receipt-routing.module.ts
+++ b/overlord/src/app/receipt/receipt-routing.module.ts
@@ -4,9 +4,9 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { ReceiptAccountsResolver } from './receipt-accounts-resolver.service';
-import { ReceiptResolver } from './receipt-resolver.service';
+import { receiptAccountsResolver } from './receipt-accounts.resolver';
 import { ReceiptComponent } from './receipt.component';
+import { receiptResolver } from './receipt.resolver';
 
 const receiptRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const receiptRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      receiptAccounts: () => inject(ReceiptAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(ReceiptResolver).resolve(route),
+      receiptAccounts: receiptAccountsResolver,
+      voucher: receiptResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -34,8 +34,8 @@ const receiptRoutes: Routes = [
       permission: 'journal',
     },
     resolve: {
-      receiptAccounts: () => inject(ReceiptAccountsResolver).resolve(),
-      voucher: (route: ActivatedRouteSnapshot) => inject(ReceiptResolver).resolve(route),
+      receiptAccounts: receiptAccountsResolver,
+      voucher: receiptResolver,
     },
     runGuardsAndResolvers: 'paramsChange',
   },
@@ -44,6 +44,5 @@ const receiptRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(receiptRoutes)],
   exports: [RouterModule],
-  providers: [ReceiptResolver],
 })
 export class ReceiptRoutingModule {}
diff --git a/overlord/src/app/receipt/receipt.resolver.spec.ts b/overlord/src/app/receipt/receipt.resolver.spec.ts
new file mode 100644
index 00000000..98c99c83
--- /dev/null
+++ b/overlord/src/app/receipt/receipt.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+
+import { receiptResolver } from './receipt.resolver';
+
+describe('receiptResolver', () => {
+  const executeResolver: ResolveFn<Voucher> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => receiptResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/receipt/receipt.resolver.ts b/overlord/src/app/receipt/receipt.resolver.ts
new file mode 100644
index 00000000..18840480
--- /dev/null
+++ b/overlord/src/app/receipt/receipt.resolver.ts
@@ -0,0 +1,17 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Voucher } from '../core/voucher';
+import { VoucherService } from '../core/voucher.service';
+
+export const receiptResolver: ResolveFn<Voucher> = (route) => {
+  const id = route.paramMap.get('id');
+  const account = route.queryParamMap.get('a') || null;
+  if (id !== null) {
+    return inject(VoucherService).get(id, 'Receipt');
+  }
+  if (account !== null) {
+    return inject(VoucherService).getOfType('Receipt', account);
+  }
+  return inject(VoucherService).getOfType('Receipt');
+};
diff --git a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts b/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts
deleted file mode 100644
index 14e44904..00000000
--- a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RecipeTemplateListResolver } from './recipe-template-list-resolver.service';
-
-describe('RecipeTemplateListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RecipeTemplateListResolver],
-    });
-  });
-
-  it('should be created', inject([RecipeTemplateListResolver], (service: RecipeTemplateListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.ts b/overlord/src/app/recipe-template/recipe-template-list-resolver.service.ts
deleted file mode 100644
index aeea2eb4..00000000
--- a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { RecipeTemplate } from './recipe-template';
-import { RecipeTemplateService } from './recipe-template.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RecipeTemplateListResolver {
-  constructor(private ser: RecipeTemplateService) {}
-
-  resolve(): Observable<RecipeTemplate[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/recipe-template/recipe-template-list.resolver.spec.ts b/overlord/src/app/recipe-template/recipe-template-list.resolver.spec.ts
new file mode 100644
index 00000000..6e5c0307
--- /dev/null
+++ b/overlord/src/app/recipe-template/recipe-template-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { RecipeTemplate } from './recipe-template';
+import { recipeTemplateListResolver } from './recipe-template-list.resolver';
+
+describe('recipeTemplateListResolver', () => {
+  const executeResolver: ResolveFn<RecipeTemplate[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => recipeTemplateListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/recipe-template/recipe-template-list.resolver.ts b/overlord/src/app/recipe-template/recipe-template-list.resolver.ts
new file mode 100644
index 00000000..17be743a
--- /dev/null
+++ b/overlord/src/app/recipe-template/recipe-template-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { RecipeTemplate } from './recipe-template';
+import { RecipeTemplateService } from './recipe-template.service';
+
+export const recipeTemplateListResolver: ResolveFn<RecipeTemplate[]> = () => {
+  return inject(RecipeTemplateService).list();
+};
diff --git a/overlord/src/app/recipe-template/recipe-template-resolver.service.spec.ts b/overlord/src/app/recipe-template/recipe-template-resolver.service.spec.ts
deleted file mode 100644
index 296ba168..00000000
--- a/overlord/src/app/recipe-template/recipe-template-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RecipeTemplateResolver } from './recipe-template-resolver.service';
-
-describe('RecipeTemplateResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RecipeTemplateResolver],
-    });
-  });
-
-  it('should be created', inject([RecipeTemplateResolver], (service: RecipeTemplateResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/recipe-template/recipe-template-resolver.service.ts b/overlord/src/app/recipe-template/recipe-template-resolver.service.ts
deleted file mode 100644
index af9dda55..00000000
--- a/overlord/src/app/recipe-template/recipe-template-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { RecipeTemplate } from './recipe-template';
-import { RecipeTemplateService } from './recipe-template.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RecipeTemplateResolver {
-  constructor(private ser: RecipeTemplateService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<RecipeTemplate> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/recipe-template/recipe-template-routing.module.ts b/overlord/src/app/recipe-template/recipe-template-routing.module.ts
index 9c98ab66..3b2f67c6 100644
--- a/overlord/src/app/recipe-template/recipe-template-routing.module.ts
+++ b/overlord/src/app/recipe-template/recipe-template-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { RecipeTemplateDetailComponent } from './recipe-template-detail/recipe-template-detail.component';
 import { RecipeTemplateListComponent } from './recipe-template-list/recipe-template-list.component';
-import { RecipeTemplateListResolver } from './recipe-template-list-resolver.service';
-import { RecipeTemplateResolver } from './recipe-template-resolver.service';
+import { recipeTemplateListResolver } from './recipe-template-list.resolver';
+import { recipeTemplateResolver } from './recipe-template.resolver';
 
 const recipeTemplateRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const recipeTemplateRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      list: () => inject(RecipeTemplateListResolver).resolve(),
+      list: recipeTemplateListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const recipeTemplateRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RecipeTemplateResolver).resolve(route),
+      item: recipeTemplateResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const recipeTemplateRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RecipeTemplateResolver).resolve(route),
+      item: recipeTemplateResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const recipeTemplateRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(recipeTemplateRoutes)],
   exports: [RouterModule],
-  providers: [RecipeTemplateListResolver, RecipeTemplateResolver],
 })
 export class RecipeTemplateRoutingModule {}
diff --git a/overlord/src/app/recipe-template/recipe-template.resolver.spec.ts b/overlord/src/app/recipe-template/recipe-template.resolver.spec.ts
new file mode 100644
index 00000000..38aebb83
--- /dev/null
+++ b/overlord/src/app/recipe-template/recipe-template.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { RecipeTemplate } from './recipe-template';
+import { recipeTemplateResolver } from './recipe-template.resolver';
+
+describe('recipeTemplateResolver', () => {
+  const executeResolver: ResolveFn<RecipeTemplate> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => recipeTemplateResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/recipe-template/recipe-template.resolver.ts b/overlord/src/app/recipe-template/recipe-template.resolver.ts
new file mode 100644
index 00000000..2f7c0f3b
--- /dev/null
+++ b/overlord/src/app/recipe-template/recipe-template.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { RecipeTemplate } from './recipe-template';
+import { RecipeTemplateService } from './recipe-template.service';
+
+export const recipeTemplateResolver: ResolveFn<RecipeTemplate> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(RecipeTemplateService).get(id);
+};
diff --git a/overlord/src/app/recipe/recipe-list-resolver.service.spec.ts b/overlord/src/app/recipe/recipe-list-resolver.service.spec.ts
deleted file mode 100644
index 2d28204b..00000000
--- a/overlord/src/app/recipe/recipe-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RecipeListResolver } from './recipe-list-resolver.service';
-
-describe('RecipeListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RecipeListResolver],
-    });
-  });
-
-  it('should be created', inject([RecipeListResolver], (service: RecipeListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/recipe/recipe-list-resolver.service.ts b/overlord/src/app/recipe/recipe-list-resolver.service.ts
deleted file mode 100644
index 0a275056..00000000
--- a/overlord/src/app/recipe/recipe-list-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Recipe } from './recipe';
-import { RecipeService } from './recipe.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RecipeListResolver {
-  constructor(private ser: RecipeService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Recipe[]> {
-    const period = route.queryParamMap.get('p') || null;
-    return this.ser.list(period);
-  }
-}
diff --git a/overlord/src/app/recipe/recipe-list.resolver.spec.ts b/overlord/src/app/recipe/recipe-list.resolver.spec.ts
new file mode 100644
index 00000000..1d055426
--- /dev/null
+++ b/overlord/src/app/recipe/recipe-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Recipe } from './recipe';
+import { recipeListResolver } from './recipe-list.resolver';
+
+describe('recipeListResolver', () => {
+  const executeResolver: ResolveFn<Recipe[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => recipeListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/recipe/recipe-list.resolver.ts b/overlord/src/app/recipe/recipe-list.resolver.ts
new file mode 100644
index 00000000..1427f091
--- /dev/null
+++ b/overlord/src/app/recipe/recipe-list.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Recipe } from './recipe';
+import { RecipeService } from './recipe.service';
+
+export const recipeListResolver: ResolveFn<Recipe[]> = (route) => {
+  const period = route.queryParamMap.get('p') || null;
+  return inject(RecipeService).list(period);
+};
diff --git a/overlord/src/app/recipe/recipe-resolver.service.spec.ts b/overlord/src/app/recipe/recipe-resolver.service.spec.ts
deleted file mode 100644
index 2df94428..00000000
--- a/overlord/src/app/recipe/recipe-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RecipeResolver } from './recipe-resolver.service';
-
-describe('RecipeResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RecipeResolver],
-    });
-  });
-
-  it('should be created', inject([RecipeResolver], (service: RecipeResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/recipe/recipe-resolver.service.ts b/overlord/src/app/recipe/recipe-resolver.service.ts
deleted file mode 100644
index 983ae72d..00000000
--- a/overlord/src/app/recipe/recipe-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Recipe } from './recipe';
-import { RecipeService } from './recipe.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RecipeResolver {
-  constructor(private ser: RecipeService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Recipe> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/recipe/recipe-routing.module.ts b/overlord/src/app/recipe/recipe-routing.module.ts
index 01889bb4..649a57b0 100644
--- a/overlord/src/app/recipe/recipe-routing.module.ts
+++ b/overlord/src/app/recipe/recipe-routing.module.ts
@@ -3,13 +3,13 @@ import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
-import { PeriodListResolver } from '../period/period-list-resolver.service';
-import { ProductGroupListResolver } from '../product-group/product-group-list-resolver.service';
+import { periodListResolver } from '../period/period-list.resolver';
+import { productGroupListResolver } from '../product-group/product-group-list.resolver';
 
 import { RecipeDetailComponent } from './recipe-detail/recipe-detail.component';
 import { RecipeListComponent } from './recipe-list/recipe-list.component';
-import { RecipeListResolver } from './recipe-list-resolver.service';
-import { RecipeResolver } from './recipe-resolver.service';
+import { recipeListResolver } from './recipe-list.resolver';
+import { recipeResolver } from './recipe.resolver';
 
 const recipeRoutes: Routes = [
   {
@@ -22,9 +22,9 @@ const recipeRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      list: (route: ActivatedRouteSnapshot) => inject(RecipeListResolver).resolve(route),
-      productGroups: () => inject(ProductGroupListResolver).resolve(),
-      periods: () => inject(PeriodListResolver).resolve(),
+      list: recipeListResolver,
+      productGroups: productGroupListResolver,
+      periods: periodListResolver,
     },
     runGuardsAndResolvers: 'paramsOrQueryParamsChange',
   },
@@ -38,8 +38,8 @@ const recipeRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RecipeResolver).resolve(route),
-      periods: () => inject(PeriodListResolver).resolve(),
+      item: recipeResolver,
+      periods: periodListResolver,
     },
   },
   {
@@ -52,8 +52,8 @@ const recipeRoutes: Routes = [
       permission: 'Recipes',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RecipeResolver).resolve(route),
-      periods: () => inject(PeriodListResolver).resolve(),
+      item: recipeResolver,
+      periods: periodListResolver,
     },
   },
 ];
@@ -61,6 +61,5 @@ const recipeRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(recipeRoutes)],
   exports: [RouterModule],
-  providers: [RecipeListResolver, RecipeResolver],
 })
 export class RecipeRoutingModule {}
diff --git a/overlord/src/app/recipe/recipe.resolver.spec.ts b/overlord/src/app/recipe/recipe.resolver.spec.ts
new file mode 100644
index 00000000..474c17fd
--- /dev/null
+++ b/overlord/src/app/recipe/recipe.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Recipe } from './recipe';
+import { recipeResolver } from './recipe.resolver';
+
+describe('recipeResolver', () => {
+  const executeResolver: ResolveFn<Recipe> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => recipeResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/recipe/recipe.resolver.ts b/overlord/src/app/recipe/recipe.resolver.ts
new file mode 100644
index 00000000..7917d847
--- /dev/null
+++ b/overlord/src/app/recipe/recipe.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Recipe } from './recipe';
+import { RecipeService } from './recipe.service';
+
+export const recipeResolver: ResolveFn<Recipe> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(RecipeService).get(id);
+};
diff --git a/overlord/src/app/role/role-list-resolver.service.spec.ts b/overlord/src/app/role/role-list-resolver.service.spec.ts
deleted file mode 100644
index df006769..00000000
--- a/overlord/src/app/role/role-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RoleListResolver } from './role-list-resolver.service';
-
-describe('RoleListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RoleListResolver],
-    });
-  });
-
-  it('should be created', inject([RoleListResolver], (service: RoleListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/role/role-list-resolver.service.ts b/overlord/src/app/role/role-list-resolver.service.ts
deleted file mode 100644
index 09121e99..00000000
--- a/overlord/src/app/role/role-list-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Role } from './role';
-import { RoleService } from './role.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RoleListResolver {
-  constructor(private ser: RoleService) {}
-
-  resolve(): Observable<Role[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/role/role-list.resolver.spec.ts b/overlord/src/app/role/role-list.resolver.spec.ts
new file mode 100644
index 00000000..57bf4b33
--- /dev/null
+++ b/overlord/src/app/role/role-list.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Role } from './role';
+import { roleListResolver } from './role-list.resolver';
+
+describe('roleListResolver', () => {
+  const executeResolver: ResolveFn<Role[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => roleListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/role/role-list.resolver.ts b/overlord/src/app/role/role-list.resolver.ts
new file mode 100644
index 00000000..3f670665
--- /dev/null
+++ b/overlord/src/app/role/role-list.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Role } from './role';
+import { RoleService } from './role.service';
+
+export const roleListResolver: ResolveFn<Role[]> = () => {
+  return inject(RoleService).list();
+};
diff --git a/overlord/src/app/role/role-resolver.service.spec.ts b/overlord/src/app/role/role-resolver.service.spec.ts
deleted file mode 100644
index a55cf6ba..00000000
--- a/overlord/src/app/role/role-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { RoleResolver } from './role-resolver.service';
-
-describe('RoleResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [RoleResolver],
-    });
-  });
-
-  it('should be created', inject([RoleResolver], (service: RoleResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/role/role-resolver.service.ts b/overlord/src/app/role/role-resolver.service.ts
deleted file mode 100644
index 5a122b9e..00000000
--- a/overlord/src/app/role/role-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { Role } from './role';
-import { RoleService } from './role.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class RoleResolver {
-  constructor(private ser: RoleService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Role> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/role/role-routing.module.ts b/overlord/src/app/role/role-routing.module.ts
index 79a00d7c..78f21580 100644
--- a/overlord/src/app/role/role-routing.module.ts
+++ b/overlord/src/app/role/role-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { RoleDetailComponent } from './role-detail/role-detail.component';
 import { RoleListComponent } from './role-list/role-list.component';
-import { RoleListResolver } from './role-list-resolver.service';
-import { RoleResolver } from './role-resolver.service';
+import { roleListResolver } from './role-list.resolver';
+import { roleResolver } from './role.resolver';
 
 const roleRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      list: () => inject(RoleListResolver).resolve(),
+      list: roleListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
+      item: roleResolver,
     },
   },
   {
@@ -46,7 +46,7 @@ const roleRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
+      item: roleResolver,
     },
   },
 ];
@@ -54,6 +54,5 @@ const roleRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(roleRoutes)],
   exports: [RouterModule],
-  providers: [RoleListResolver, RoleResolver],
 })
 export class RoleRoutingModule {}
diff --git a/overlord/src/app/role/role.resolver.spec.ts b/overlord/src/app/role/role.resolver.spec.ts
new file mode 100644
index 00000000..d3e556a4
--- /dev/null
+++ b/overlord/src/app/role/role.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { Role } from './role';
+import { roleResolver } from './role.resolver';
+
+describe('roleResolver', () => {
+  const executeResolver: ResolveFn<Role> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => roleResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/role/role.resolver.ts b/overlord/src/app/role/role.resolver.ts
new file mode 100644
index 00000000..fc621d81
--- /dev/null
+++ b/overlord/src/app/role/role.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Role } from './role';
+import { RoleService } from './role.service';
+
+export const roleResolver: ResolveFn<Role> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(RoleService).get(id);
+};
diff --git a/overlord/src/app/settings/lock-information-resolver.service.ts b/overlord/src/app/settings/lock-information-resolver.service.ts
deleted file mode 100644
index add293d0..00000000
--- a/overlord/src/app/settings/lock-information-resolver.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { LockInfo } from './lock-info';
-import { SettingsService } from './settings.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class LockInformationResolver {
-  constructor(private ser: SettingsService) {}
-
-  resolve(): Observable<[LockInfo]> {
-    return this.ser.getLockInformation();
-  }
-}
diff --git a/overlord/src/app/settings/lock-information.resolver.ts b/overlord/src/app/settings/lock-information.resolver.ts
new file mode 100644
index 00000000..e66b021c
--- /dev/null
+++ b/overlord/src/app/settings/lock-information.resolver.ts
@@ -0,0 +1,9 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { LockInfo } from './lock-info';
+import { SettingsService } from './settings.service';
+
+export const lockInformationResolver: ResolveFn<[LockInfo]> = () => {
+  return inject(SettingsService).getLockInformation();
+};
diff --git a/overlord/src/app/settings/maintenance-resolver.service.ts b/overlord/src/app/settings/maintenance-resolver.service.ts
deleted file mode 100644
index a64231e7..00000000
--- a/overlord/src/app/settings/maintenance-resolver.service.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { SettingsService } from './settings.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class MaintenanceResolver {
-  constructor(private ser: SettingsService) {}
-
-  resolve(): Observable<{ enabled: boolean; user: string }> {
-    return this.ser.getMaintenance();
-  }
-}
diff --git a/overlord/src/app/settings/maintenance.resolver.ts b/overlord/src/app/settings/maintenance.resolver.ts
new file mode 100644
index 00000000..b35cc47a
--- /dev/null
+++ b/overlord/src/app/settings/maintenance.resolver.ts
@@ -0,0 +1,8 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { SettingsService } from './settings.service';
+
+export const maintenanceResolver: ResolveFn<{ enabled: boolean; user: string }> = () => {
+  return inject(SettingsService).getMaintenance();
+};
diff --git a/overlord/src/app/settings/settings-routing.module.ts b/overlord/src/app/settings/settings-routing.module.ts
index 2e730501..79a6a49d 100644
--- a/overlord/src/app/settings/settings-routing.module.ts
+++ b/overlord/src/app/settings/settings-routing.module.ts
@@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common';
 import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
-import { AccountTypeResolver } from '../account/account-type-resolver.service';
+import { accountTypeResolver } from '../account/account-type.resolver';
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { LockInformationResolver } from './lock-information-resolver.service';
-import { MaintenanceResolver } from './maintenance-resolver.service';
+import { lockInformationResolver } from './lock-information.resolver';
+import { maintenanceResolver } from './maintenance.resolver';
 import { SettingsComponent } from './settings.component';
-import { VoucherTypeResolver } from './voucher-type-resolver.service';
+import { voucherTypeResolver } from './voucher-type.resolver';
 
 const settingsRoutes: Routes = [
   {
@@ -21,10 +21,10 @@ const settingsRoutes: Routes = [
       permission: 'Maintenance', // 'Lock Date'
     },
     resolve: {
-      maintenance: () => inject(MaintenanceResolver).resolve(),
-      lockInformation: () => inject(LockInformationResolver).resolve(),
-      accountTypes: () => inject(AccountTypeResolver).resolve(),
-      voucherTypes: () => inject(VoucherTypeResolver).resolve(),
+      maintenance: maintenanceResolver,
+      lockInformation: lockInformationResolver,
+      accountTypes: accountTypeResolver,
+      voucherTypes: voucherTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
diff --git a/overlord/src/app/settings/voucher-type-resolver.service.ts b/overlord/src/app/settings/voucher-type-resolver.service.ts
deleted file mode 100644
index ca85f2af..00000000
--- a/overlord/src/app/settings/voucher-type-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { AccountType } from '../core/account-type';
-
-import { VoucherTypeService } from './voucher-type.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class VoucherTypeResolver {
-  constructor(private ser: VoucherTypeService) {}
-
-  resolve(): Observable<AccountType[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/settings/voucher-type.resolver.ts b/overlord/src/app/settings/voucher-type.resolver.ts
new file mode 100644
index 00000000..62d10c86
--- /dev/null
+++ b/overlord/src/app/settings/voucher-type.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { AccountType } from '../core/account-type';
+
+import { VoucherTypeService } from './voucher-type.service';
+
+export const voucherTypeResolver: ResolveFn<AccountType[]> = () => {
+  return inject(VoucherTypeService).list();
+};
diff --git a/overlord/src/app/stock-movement/stock-movement-resolver.service.spec.ts b/overlord/src/app/stock-movement/stock-movement-resolver.service.spec.ts
deleted file mode 100644
index 21157696..00000000
--- a/overlord/src/app/stock-movement/stock-movement-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { StockMovementResolver } from './stock-movement-resolver.service';
-
-describe('StockMovementResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [StockMovementResolver],
-    });
-  });
-
-  it('should be created', inject([StockMovementResolver], (service: StockMovementResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/stock-movement/stock-movement-resolver.service.ts b/overlord/src/app/stock-movement/stock-movement-resolver.service.ts
deleted file mode 100644
index 2a676a04..00000000
--- a/overlord/src/app/stock-movement/stock-movement-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { StockMovement } from './stock-movement';
-import { StockMovementService } from './stock-movement.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class StockMovementResolver {
-  constructor(private ser: StockMovementService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<StockMovement> {
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.list(startDate, finishDate);
-  }
-}
diff --git a/overlord/src/app/stock-movement/stock-movement-routing.module.ts b/overlord/src/app/stock-movement/stock-movement-routing.module.ts
index 6ed6af23..a3b76f03 100644
--- a/overlord/src/app/stock-movement/stock-movement-routing.module.ts
+++ b/overlord/src/app/stock-movement/stock-movement-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { StockMovementResolver } from './stock-movement-resolver.service';
 import { StockMovementComponent } from './stock-movement.component';
+import { stockMovementResolver } from './stock-movement.resolver';
 
 const stockMovementRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const stockMovementRoutes: Routes = [
       permission: 'Stock Movement',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(StockMovementResolver).resolve(route),
+      info: stockMovementResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -27,6 +27,5 @@ const stockMovementRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(stockMovementRoutes)],
   exports: [RouterModule],
-  providers: [StockMovementResolver],
 })
 export class StockMovementRoutingModule {}
diff --git a/overlord/src/app/stock-movement/stock-movement.resolver.spec.ts b/overlord/src/app/stock-movement/stock-movement.resolver.spec.ts
new file mode 100644
index 00000000..2abdef58
--- /dev/null
+++ b/overlord/src/app/stock-movement/stock-movement.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { StockMovement } from './stock-movement';
+import { stockMovementResolver } from './stock-movement.resolver';
+
+describe('stockMovementResolver', () => {
+  const executeResolver: ResolveFn<StockMovement> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => stockMovementResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/stock-movement/stock-movement.resolver.ts b/overlord/src/app/stock-movement/stock-movement.resolver.ts
new file mode 100644
index 00000000..d03cc976
--- /dev/null
+++ b/overlord/src/app/stock-movement/stock-movement.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { StockMovement } from './stock-movement';
+import { StockMovementService } from './stock-movement.service';
+
+export const stockMovementResolver: ResolveFn<StockMovement> = (route) => {
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(StockMovementService).list(startDate, finishDate);
+};
diff --git a/overlord/src/app/trial-balance/trial-balance-resolver.service.spec.ts b/overlord/src/app/trial-balance/trial-balance-resolver.service.spec.ts
deleted file mode 100644
index deb205d6..00000000
--- a/overlord/src/app/trial-balance/trial-balance-resolver.service.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-
-import { TrialBalanceResolver } from './trial-balance-resolver.service';
-
-describe('TrialBalanceResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule],
-      providers: [TrialBalanceResolver],
-    });
-  });
-
-  it('should be created', inject([TrialBalanceResolver], (service: TrialBalanceResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/trial-balance/trial-balance-resolver.service.ts b/overlord/src/app/trial-balance/trial-balance-resolver.service.ts
deleted file mode 100644
index cdf6ed12..00000000
--- a/overlord/src/app/trial-balance/trial-balance-resolver.service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { TrialBalance } from './trial-balance';
-import { TrialBalanceService } from './trial-balance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TrialBalanceResolver {
-  constructor(private ser: TrialBalanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<TrialBalance> {
-    const date = route.paramMap.get('date');
-    return this.ser.list(date);
-  }
-}
diff --git a/overlord/src/app/trial-balance/trial-balance-routing.module.ts b/overlord/src/app/trial-balance/trial-balance-routing.module.ts
index fc585b01..ef32a670 100644
--- a/overlord/src/app/trial-balance/trial-balance-routing.module.ts
+++ b/overlord/src/app/trial-balance/trial-balance-routing.module.ts
@@ -4,8 +4,8 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } fro
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { TrialBalanceResolver } from './trial-balance-resolver.service';
 import { TrialBalanceComponent } from './trial-balance.component';
+import { trialBalanceResolver } from './trial-balance.resolver';
 
 const trialBalanceRoutes: Routes = [
   {
@@ -18,7 +18,7 @@ const trialBalanceRoutes: Routes = [
       permission: 'Trial Balance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(TrialBalanceResolver).resolve(route),
+      info: trialBalanceResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -32,7 +32,7 @@ const trialBalanceRoutes: Routes = [
       permission: 'Trial Balance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(TrialBalanceResolver).resolve(route),
+      info: trialBalanceResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -41,6 +41,5 @@ const trialBalanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(trialBalanceRoutes)],
   exports: [RouterModule],
-  providers: [TrialBalanceResolver],
 })
 export class TrialBalanceRoutingModule {}
diff --git a/overlord/src/app/trial-balance/trial-balance.resolver.spec.ts b/overlord/src/app/trial-balance/trial-balance.resolver.spec.ts
new file mode 100644
index 00000000..c4d8a736
--- /dev/null
+++ b/overlord/src/app/trial-balance/trial-balance.resolver.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { TrialBalance } from './trial-balance';
+import { trialBalanceResolver } from './trial-balance.resolver';
+
+describe('trialBalanceResolver', () => {
+  const executeResolver: ResolveFn<TrialBalance> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => trialBalanceResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/trial-balance/trial-balance.resolver.ts b/overlord/src/app/trial-balance/trial-balance.resolver.ts
new file mode 100644
index 00000000..36013a5c
--- /dev/null
+++ b/overlord/src/app/trial-balance/trial-balance.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { TrialBalance } from './trial-balance';
+import { TrialBalanceService } from './trial-balance.service';
+
+export const trialBalanceResolver: ResolveFn<TrialBalance> = (route) => {
+  const date = route.paramMap.get('date');
+  return inject(TrialBalanceService).list(date);
+};
diff --git a/overlord/src/app/user/user-list-resolver.service.spec.ts b/overlord/src/app/user/user-list-resolver.service.spec.ts
deleted file mode 100644
index cc3d3d24..00000000
--- a/overlord/src/app/user/user-list-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { UserListResolver } from './user-list-resolver.service';
-
-describe('UserListResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [UserListResolver],
-    });
-  });
-
-  it('should be created', inject([UserListResolver], (service: UserListResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/user/user-list-resolver.service.ts b/overlord/src/app/user/user-list-resolver.service.ts
deleted file mode 100644
index 34ea9a77..00000000
--- a/overlord/src/app/user/user-list-resolver.service.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { User } from '../core/user';
-
-import { UserService } from './user.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class UserListResolver {
-  constructor(private ser: UserService) {}
-
-  resolve(): Observable<User[]> {
-    return this.ser.list();
-  }
-}
diff --git a/overlord/src/app/user/user-list.resolver.spec.ts b/overlord/src/app/user/user-list.resolver.spec.ts
new file mode 100644
index 00000000..3a8630cd
--- /dev/null
+++ b/overlord/src/app/user/user-list.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { User } from '../core/user';
+
+import { userListResolver } from './user-list.resolver';
+
+describe('userListResolver', () => {
+  const executeResolver: ResolveFn<User[]> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => userListResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/user/user-list.resolver.ts b/overlord/src/app/user/user-list.resolver.ts
new file mode 100644
index 00000000..eac25ae5
--- /dev/null
+++ b/overlord/src/app/user/user-list.resolver.ts
@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { User } from '../core/user';
+
+import { UserService } from './user.service';
+
+export const userListResolver: ResolveFn<User[]> = () => {
+  return inject(UserService).list();
+};
diff --git a/overlord/src/app/user/user-resolver.service.spec.ts b/overlord/src/app/user/user-resolver.service.spec.ts
deleted file mode 100644
index 5ff94812..00000000
--- a/overlord/src/app/user/user-resolver.service.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { HttpClientModule } from '@angular/common/http';
-import { inject, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { UserResolver } from './user-resolver.service';
-
-describe('UserResolver', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [HttpClientModule, RouterTestingModule],
-      providers: [UserResolver],
-    });
-  });
-
-  it('should be created', inject([UserResolver], (service: UserResolver) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/overlord/src/app/user/user-resolver.service.ts b/overlord/src/app/user/user-resolver.service.ts
deleted file mode 100644
index 61653321..00000000
--- a/overlord/src/app/user/user-resolver.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { User } from '../core/user';
-
-import { UserService } from './user.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class UserResolver {
-  constructor(private ser: UserService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<User> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}
diff --git a/overlord/src/app/user/user-routing.module.ts b/overlord/src/app/user/user-routing.module.ts
index c43b743d..2acb95ab 100644
--- a/overlord/src/app/user/user-routing.module.ts
+++ b/overlord/src/app/user/user-routing.module.ts
@@ -6,8 +6,8 @@ import { AuthGuard } from '../auth/auth-guard.service';
 
 import { UserDetailComponent } from './user-detail/user-detail.component';
 import { UserListComponent } from './user-list/user-list.component';
-import { UserListResolver } from './user-list-resolver.service';
-import { UserResolver } from './user-resolver.service';
+import { userListResolver } from './user-list.resolver';
+import { userResolver } from './user.resolver';
 
 const userRoutes: Routes = [
   {
@@ -20,7 +20,7 @@ const userRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      list: () => inject(UserListResolver).resolve(),
+      list: userListResolver,
     },
   },
   {
@@ -33,7 +33,7 @@ const userRoutes: Routes = [
       permission: 'Users',
     },
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(UserResolver).resolve(route),
+      item: userResolver,
     },
   },
   {
@@ -43,7 +43,7 @@ const userRoutes: Routes = [
       (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state),
     ],
     resolve: {
-      item: (route: ActivatedRouteSnapshot) => inject(UserResolver).resolve(route),
+      item: userResolver,
     },
   },
 ];
@@ -51,6 +51,5 @@ const userRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(userRoutes)],
   exports: [RouterModule],
-  providers: [UserListResolver, UserResolver],
 })
 export class UserRoutingModule {}
diff --git a/overlord/src/app/user/user.resolver.spec.ts b/overlord/src/app/user/user.resolver.spec.ts
new file mode 100644
index 00000000..708480e8
--- /dev/null
+++ b/overlord/src/app/user/user.resolver.spec.ts
@@ -0,0 +1,19 @@
+import { TestBed } from '@angular/core/testing';
+import { ResolveFn } from '@angular/router';
+
+import { User } from '../core/user';
+
+import { userResolver } from './user.resolver';
+
+describe('userResolver', () => {
+  const executeResolver: ResolveFn<User> = (...resolverParameters) =>
+    TestBed.runInInjectionContext(() => userResolver(...resolverParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeResolver).toBeTruthy();
+  });
+});
diff --git a/overlord/src/app/user/user.resolver.ts b/overlord/src/app/user/user.resolver.ts
new file mode 100644
index 00000000..884371cb
--- /dev/null
+++ b/overlord/src/app/user/user.resolver.ts
@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { User } from '../core/user';
+
+import { UserService } from './user.service';
+
+export const userResolver: ResolveFn<User> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(UserService).get(id);
+};