diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp
index 90cd2173..7ef9ad24 100644
--- a/bsp_q7s/core/scheduling.cpp
+++ b/bsp_q7s/core/scheduling.cpp
@@ -337,9 +337,7 @@ void scheduling::initTasks() {
       "PL_TASK", 30, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, missedDeadlineFunc);
   plTask->addComponent(objects::CAM_SWITCHER);
   scheduling::addMpsocSupvHandlers(plTask);
-#if OBSW_ADD_SCEX_DEVICE == 1
   scheduling::scheduleScexDev(plTask);
-#endif
 
 #if OBSW_ADD_SCEX_DEVICE == 1
   PeriodicTaskIF* scexReaderTask;
diff --git a/dummies/PlocMpsocDummy.cpp b/dummies/PlocMpsocDummy.cpp
index 2df55b1d..e1410ba1 100644
--- a/dummies/PlocMpsocDummy.cpp
+++ b/dummies/PlocMpsocDummy.cpp
@@ -5,9 +5,9 @@ PlocMpsocDummy::PlocMpsocDummy(object_id_t objectId, object_id_t comif, CookieIF
 
 PlocMpsocDummy::~PlocMpsocDummy() {}
 
-void PlocMpsocDummy::doStartUp() {}
+void PlocMpsocDummy::doStartUp() { setMode(MODE_ON); }
 
-void PlocMpsocDummy::doShutDown() {}
+void PlocMpsocDummy::doShutDown() { setMode(MODE_OFF); }
 
 ReturnValue_t PlocMpsocDummy::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   return NOTHING_TO_SEND;
diff --git a/dummies/PlocSupervisorDummy.cpp b/dummies/PlocSupervisorDummy.cpp
index d4730fe9..c3eea5b0 100644
--- a/dummies/PlocSupervisorDummy.cpp
+++ b/dummies/PlocSupervisorDummy.cpp
@@ -6,9 +6,9 @@ PlocSupervisorDummy::PlocSupervisorDummy(object_id_t objectId, object_id_t comif
 
 PlocSupervisorDummy::~PlocSupervisorDummy() {}
 
-void PlocSupervisorDummy::doStartUp() {}
+void PlocSupervisorDummy::doStartUp() { setMode(MODE_ON); }
 
-void PlocSupervisorDummy::doShutDown() {}
+void PlocSupervisorDummy::doShutDown() { setMode(_MODE_POWER_DOWN); }
 
 ReturnValue_t PlocSupervisorDummy::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   return NOTHING_TO_SEND;
diff --git a/dummies/ScexDummy.cpp b/dummies/ScexDummy.cpp
index 303570ff..1f476064 100644
--- a/dummies/ScexDummy.cpp
+++ b/dummies/ScexDummy.cpp
@@ -5,9 +5,9 @@ ScexDummy::ScexDummy(object_id_t objectId, object_id_t comif, CookieIF *comCooki
 
 ScexDummy::~ScexDummy() {}
 
-void ScexDummy::doStartUp() {}
+void ScexDummy::doStartUp() { setMode(MODE_ON); }
 
-void ScexDummy::doShutDown() {}
+void ScexDummy::doShutDown() { setMode(MODE_OFF); }
 
 ReturnValue_t ScexDummy::buildNormalDeviceCommand(DeviceCommandId_t *id) { return NOTHING_TO_SEND; }
 
diff --git a/linux/scheduling.cpp b/linux/scheduling.cpp
index 85394dea..85735729 100644
--- a/linux/scheduling.cpp
+++ b/linux/scheduling.cpp
@@ -27,7 +27,6 @@ void scheduling::scheduleScexReader(TaskFactory& factory, PeriodicTaskIF*& scexR
 }
 
 void scheduling::addMpsocSupvHandlers(PeriodicTaskIF* plTask) {
-#if OBSW_ADD_PLOC_SUPERVISOR == 1
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::PERFORM_OPERATION);
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::SEND_WRITE);
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::GET_WRITE);
@@ -35,9 +34,7 @@ void scheduling::addMpsocSupvHandlers(PeriodicTaskIF* plTask) {
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::GET_READ);
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::SEND_READ);
   plTask->addComponent(objects::PLOC_SUPERVISOR_HANDLER, DeviceHandlerIF::GET_READ);
-#endif
 
-#if OBSW_ADD_PLOC_MPSOC == 1
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::PERFORM_OPERATION);
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::SEND_WRITE);
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::GET_WRITE);
@@ -45,7 +42,6 @@ void scheduling::addMpsocSupvHandlers(PeriodicTaskIF* plTask) {
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::GET_READ);
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::SEND_READ);
   plTask->addComponent(objects::PLOC_MPSOC_HANDLER, DeviceHandlerIF::GET_READ);
-#endif
 }
 
 void scheduling::scheduleScexDev(PeriodicTaskIF*& scexDevHandler) {