diff --git a/src/entities/System.ts b/src/entities/System.ts
index d4737c5..456fd7a 100644
--- a/src/entities/System.ts
+++ b/src/entities/System.ts
@@ -4,12 +4,15 @@ import { TimedApiBasedShuttleRepositoryLoader } from "../loaders/TimedApiBasedSh
 import { UnoptimizedInMemoryShuttleRepository } from "../repositories/UnoptimizedInMemoryShuttleRepository";
 import { RedisNotificationRepository } from "../repositories/RedisNotificationRepository";
 import { NotificationRepository } from "../repositories/NotificationRepository";
+import { ShuttleGetterSetterRepository } from "../repositories/ShuttleGetterSetterRepository";
 
 export class System {
   constructor(
     public systemId: string,
     public shuttleDataLoader: ShuttleRepositoryLoader,
+    public shuttleRepository: ShuttleGetterSetterRepository,
     public notificationScheduler: ETANotificationScheduler,
+    public notificationRepository: NotificationRepository,
   ) {
   }
 
@@ -31,7 +34,9 @@ export class System {
     const system = new System(
       systemId,
       shuttleDataLoader,
+      shuttleRepository,
       notificationScheduler,
+      notificationRepository,
     );
     return system;
   }