diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 16ba3325..e202105b 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -242,7 +242,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, SerialCo
                                              PowerSwitchIF& pwrSwitcher) {
   using namespace gpio;
   GpioCookie* gpioCookieAcsBoard = new GpioCookie();
-  std::array<DeviceHandlerBase*, 8> assemblyChildren;
 
   std::stringstream consumer;
   GpiodRegularByLineName* gpio = nullptr;
diff --git a/dummies/helpers.cpp b/dummies/helpers.cpp
index b983f221..98474289 100644
--- a/dummies/helpers.cpp
+++ b/dummies/helpers.cpp
@@ -28,6 +28,7 @@
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/system/tree/acsModeTree.h"
+#include "mission/system/tree/payloadModeTree.h"
 
 using namespace dummy;
 
@@ -49,7 +50,9 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
   rws[3] = new RwDummy(objects::RW4, objects::DUMMY_COM_IF, comCookieDummy);
   ObjectFactory::createRwAssy(pwrSwitcher, pcdu::Switches::PDU2_CH2_RW_5V, rws, rwIds);
   new SaDeplDummy(objects::SOLAR_ARRAY_DEPL_HANDLER);
-  new StarTrackerDummy(objects::STAR_TRACKER, objects::DUMMY_COM_IF, comCookieDummy);
+  auto* strDummy =
+      new StarTrackerDummy(objects::STAR_TRACKER, objects::DUMMY_COM_IF, comCookieDummy);
+  strDummy->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
   if (cfg.addSyrlinksDummies) {
     new SyrlinksDummy(objects::SYRLINKS_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
   }
@@ -185,6 +188,7 @@ void dummy::createDummies(DummyCfg cfg, PowerSwitchIF& pwrSwitcher, GpioIF* gpio
     new TemperatureSensorInserter(objects::THERMAL_TEMP_INSERTER, tempSensorDummies,
                                   tempTmpSensorDummies);
   }
-  new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::NO_SWITCH);
+  auto* camSwitcher = new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::NO_SWITCH);
+  camSwitcher->connectModeTreeParent(satsystem::pl::SUBSYSTEM);
   new PlPcduDummy(objects::PLPCDU_HANDLER, objects::DUMMY_COM_IF, comCookieDummy);
 }
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 6506c184..7c8bd689 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -281,3 +281,5 @@ void ObjectFactory::createAcsBoardAssy(PowerSwitchIF& pwrSwitcher,
   gpsCtrl->connectModeTreeParent(*acsAss);
   acsAss->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
 }
+
+void ObjectFactory::createTcsBoardAssy(PowerSwitchIF& pwrSwitcher) {}
diff --git a/mission/core/GenericFactory.h b/mission/core/GenericFactory.h
index 4b380336..dd7c6b18 100644
--- a/mission/core/GenericFactory.h
+++ b/mission/core/GenericFactory.h
@@ -26,6 +26,7 @@ void createRwAssy(PowerSwitchIF& pwrSwitcher, power::Switch_t theSwitch,
 void createSusAssy(PowerSwitchIF& pwrSwitcher, std::array<DeviceHandlerBase*, 12> suses);
 void createAcsBoardAssy(PowerSwitchIF& pwrSwitcher, std::array<DeviceHandlerBase*, 8> assemblyDhbs,
                         ExtendedControllerBase* gpsCtrl, GpioIF* gpioComIF);
+void createTcsBoardAssy(PowerSwitchIF& pwrSwitcher);
 
 }  // namespace ObjectFactory