diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index 13b46171..ee1dba07 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -1,7 +1,6 @@
 #include "SolarArrayDeploymentHandler.h"
 
 #include <devices/gpioIds.h>
-#include <devices/powerSwitcherList.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
@@ -10,7 +9,7 @@ SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(object_id_t setObjectId
                                                          object_id_t gpioDriverId_,
                                                          CookieIF* gpioCookie_,
                                                          object_id_t mainLineSwitcherObjectId_,
-                                                         uint8_t mainLineSwitch_, gpioId_t deplSA1,
+                                                         pcduSwitches::Switches mainLineSwitch_, gpioId_t deplSA1,
                                                          gpioId_t deplSA2, uint32_t burnTimeMs)
     : SystemObject(setObjectId_),
       gpioDriverId(gpioDriverId_),
diff --git a/mission/devices/SolarArrayDeploymentHandler.h b/mission/devices/SolarArrayDeploymentHandler.h
index 90380ae2..1e5bd9b1 100644
--- a/mission/devices/SolarArrayDeploymentHandler.h
+++ b/mission/devices/SolarArrayDeploymentHandler.h
@@ -1,6 +1,8 @@
 #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
+#include <devices/powerSwitcherList.h>
+
 #include <fsfw/action/HasActionsIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
@@ -42,7 +44,7 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   SolarArrayDeploymentHandler(object_id_t setObjectId, object_id_t gpioDriverId,
                               CookieIF* gpioCookie, object_id_t mainLineSwitcherObjectId,
-                              uint8_t mainLineSwitch, gpioId_t deplSA1, gpioId_t deplSA2,
+                              pcduSwitches::Switches mainLineSwitch, gpioId_t deplSA1, gpioId_t deplSA2,
                               uint32_t burnTimeMs);
 
   virtual ~SolarArrayDeploymentHandler();
diff --git a/tmtc b/tmtc
index 6e14e1b2..85ccf408 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 6e14e1b2687bef60a1a6f14840deac31e6285a56
+Subproject commit 85ccf4082cc3385a80617b7c7eb3c4c072b8bbd9