diff --git a/src/Api/V1/Job/Scheduler/AwareInterface.php b/src/Api/V1/Job/Scheduler/AwareInterface.php
new file mode 100644
index 00000000..86fc43d0
--- /dev/null
+++ b/src/Api/V1/Job/Scheduler/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Job\Scheduler;
+
+use Neighborhoods\Kojo\Api\V1\Job\SchedulerInterface;
+
+interface AwareInterface
+{
+    public function setApiV1JobScheduler(SchedulerInterface $apiV1JobScheduler);
+}
diff --git a/src/Api/V1/Job/Scheduler/Factory/AwareInterface.php b/src/Api/V1/Job/Scheduler/Factory/AwareInterface.php
new file mode 100644
index 00000000..b3bec9bc
--- /dev/null
+++ b/src/Api/V1/Job/Scheduler/Factory/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Job\Scheduler\Factory;
+
+use Neighborhoods\Kojo\Api\V1\Job\Scheduler\FactoryInterface;
+
+interface AwareInterface
+{
+    public function setApiV1JobSchedulerFactory(FactoryInterface $apiV1JobSchedulerFactory);
+}
diff --git a/src/Api/V1/Job/Scheduler/FactoryInterface.php b/src/Api/V1/Job/Scheduler/FactoryInterface.php
index 8cf25ffb..3593651c 100644
--- a/src/Api/V1/Job/Scheduler/FactoryInterface.php
+++ b/src/Api/V1/Job/Scheduler/FactoryInterface.php
@@ -6,13 +6,10 @@
 use Neighborhoods\Kojo\Api\V1\Job\SchedulerInterface;
 use Neighborhoods\Kojo\Service;
 
-interface FactoryInterface
+interface FactoryInterface extends AwareInterface
 {
     public function create(): SchedulerInterface;
 
-    /** @injected:configuration */
-    public function setApiV1JobScheduler(SchedulerInterface $apiV1JobScheduler);
-
     /** @injected:configuration */
     public function setServiceCreateFactory(Service\Create\FactoryInterface $serviceCreateFactory);
-}
\ No newline at end of file
+}
diff --git a/src/Api/V1/Job/Type/Registrar/AwareInterface.php b/src/Api/V1/Job/Type/Registrar/AwareInterface.php
new file mode 100644
index 00000000..2230c8f0
--- /dev/null
+++ b/src/Api/V1/Job/Type/Registrar/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Job\Type\Registrar;
+
+use Neighborhoods\Kojo\Api\V1\Job\Type\RegistrarInterface;
+
+interface AwareInterface
+{
+    public function setApiV1JobTypeRegistrar(RegistrarInterface $apiV1JobTypeRegistrar);
+}
diff --git a/src/Api/V1/Job/Type/Registrar/Factory/AwareInterface.php b/src/Api/V1/Job/Type/Registrar/Factory/AwareInterface.php
new file mode 100644
index 00000000..47c53061
--- /dev/null
+++ b/src/Api/V1/Job/Type/Registrar/Factory/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Job\Type\Registrar\Factory;
+
+use Neighborhoods\Kojo\Api\V1\Job\Type\Registrar\FactoryInterface;
+
+interface AwareInterface
+{
+    public function setApiV1JobTypeRegistrarFactory(FactoryInterface $apiV1JobTypeRegistrarFactory);
+}
diff --git a/src/Api/V1/Job/Type/Registrar/FactoryInterface.php b/src/Api/V1/Job/Type/Registrar/FactoryInterface.php
index 25c42c9e..2df31955 100644
--- a/src/Api/V1/Job/Type/Registrar/FactoryInterface.php
+++ b/src/Api/V1/Job/Type/Registrar/FactoryInterface.php
@@ -5,7 +5,7 @@
 
 use Neighborhoods\Kojo\Api\V1\Job\Type\RegistrarInterface;
 
-interface FactoryInterface
+interface FactoryInterface extends AwareInterface
 {
     public function create(): RegistrarInterface;
-}
\ No newline at end of file
+}
diff --git a/src/Api/V1/Logger/AwareInterface.php b/src/Api/V1/Logger/AwareInterface.php
new file mode 100644
index 00000000..3c54410c
--- /dev/null
+++ b/src/Api/V1/Logger/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Logger;
+
+use Neighborhoods\Kojo\Api\V1\LoggerInterface;
+
+interface AwareInterface
+{
+    public function setApiV1Logger(LoggerInterface $apiV1Logger);
+}
diff --git a/src/Api/V1/RDBMS/Connection/Service/AwareInterface.php b/src/Api/V1/RDBMS/Connection/Service/AwareInterface.php
new file mode 100644
index 00000000..491af19f
--- /dev/null
+++ b/src/Api/V1/RDBMS/Connection/Service/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\RDBMS\Connection\Service;
+
+use Neighborhoods\Kojo\Api\V1\RDBMS\Connection\ServiceInterface;
+
+interface AwareInterface
+{
+    public function setApiV1RDBMSConnectionService(ServiceInterface $ApiV1RDBMSConnectionService);
+}
diff --git a/src/Api/V1/Worker/Service/AwareInterface.php b/src/Api/V1/Worker/Service/AwareInterface.php
new file mode 100644
index 00000000..8d9c9cdf
--- /dev/null
+++ b/src/Api/V1/Worker/Service/AwareInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neighborhoods\Kojo\Api\V1\Worker\Service;
+
+use Neighborhoods\Kojo\Api\V1\Worker\ServiceInterface;
+
+interface AwareInterface
+{
+    public function setApiV1WorkerService(ServiceInterface $apiV1WorkerService);
+}
diff --git a/src/Api/V1/Worker/ServiceInterface.php b/src/Api/V1/Worker/ServiceInterface.php
index 307be786..574dabae 100644
--- a/src/Api/V1/Worker/ServiceInterface.php
+++ b/src/Api/V1/Worker/ServiceInterface.php
@@ -3,7 +3,9 @@
 
 namespace Neighborhoods\Kojo\Api\V1\Worker;
 
+use Neighborhoods\Kojo\Api\V1\Job\Scheduler;
 use Neighborhoods\Kojo\Api\V1\Job\SchedulerInterface;
+use Neighborhoods\Kojo\Api\V1\Logger;
 use Neighborhoods\Kojo\Api\V1\LoggerInterface;
 use Neighborhoods\Kojo\Data\JobInterface;
 use Neighborhoods\Kojo\Service\Update\Hold;
@@ -12,7 +14,7 @@
 use Neighborhoods\Kojo\Service\Update\Complete\Failed;
 use Neighborhoods\Kojo\Apm;
 
-interface ServiceInterface
+interface ServiceInterface extends Scheduler\Factory\AwareInterface, Logger\AwareInterface
 {
     public function requestRetry(\DateTime $retryDateTime): ServiceInterface;
 
diff --git a/src/ForemanInterface.php b/src/ForemanInterface.php
index 440e037d..fcdaf7cd 100644
--- a/src/ForemanInterface.php
+++ b/src/ForemanInterface.php
@@ -3,14 +3,13 @@
 
 namespace Neighborhoods\Kojo;
 
+use Neighborhoods\Kojo\Api\V1\RDBMS\Connection;
+use Neighborhoods\Kojo\Api\V1\Worker;
 use Neighborhoods\Kojo\Service\Update;
-use Neighborhoods\Kojo\Api\V1\Worker\ServiceInterface;
 
 interface ForemanInterface
 {
     public function workWorker(): ForemanInterface;
 
     public function setServiceUpdateWorkFactory(Update\Work\FactoryInterface $updateWorkFactory);
-
-    public function setApiV1WorkerService(ServiceInterface $workerService);
 }