diff --git a/generators/fsfwgen b/generators/fsfwgen
index 5ad9fb94..9a92c7de 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit 5ad9fb94af3312d29863527106396395f7b808a5
+Subproject commit 9a92c7de0a2fedfcc638c0517e3edea123e977f8
diff --git a/mission/devices/IMTQHandler.cpp b/mission/devices/IMTQHandler.cpp
index 645a8aa7..e9483d35 100644
--- a/mission/devices/IMTQHandler.cpp
+++ b/mission/devices/IMTQHandler.cpp
@@ -118,7 +118,7 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(DeviceCommandId_t deviceComma
     case (IMTQ::START_ACTUATION_DIPOLE): {
       /* IMTQ expects low byte first */
       commandBuffer[0] = IMTQ::CC::START_ACTUATION_DIPOLE;
-      if(commandData == nullptr) {
+      if (commandData == nullptr) {
         return DeviceHandlerIF::INVALID_COMMAND_PARAMETER;
       }
       commandBuffer[1] = commandData[1];
diff --git a/mission/system/AcsSubsystem.cpp b/mission/system/AcsSubsystem.cpp
index 4d9fe841..37da0123 100644
--- a/mission/system/AcsSubsystem.cpp
+++ b/mission/system/AcsSubsystem.cpp
@@ -1 +1,5 @@
 #include "AcsSubsystem.h"
+
+AcsSubsystem::AcsSubsystem(object_id_t setObjectId, object_id_t parent,
+                           uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables)
+    : Subsystem(setObjectId, parent, maxNumberOfSequences, maxNumberOfTables) {}
diff --git a/mission/system/AcsSubsystem.h b/mission/system/AcsSubsystem.h
index 39d1fca9..20fffdbe 100644
--- a/mission/system/AcsSubsystem.h
+++ b/mission/system/AcsSubsystem.h
@@ -1,4 +1,14 @@
 #ifndef MISSION_SYSTEM_ACSSUBSYSTEM_H_
 #define MISSION_SYSTEM_ACSSUBSYSTEM_H_
 
+#include <fsfw/subsystem/Subsystem.h>
+
+class AcsSubsystem : public Subsystem {
+ public:
+  AcsSubsystem(object_id_t setObjectId, object_id_t parent, uint32_t maxNumberOfSequences,
+               uint32_t maxNumberOfTables);
+
+ private:
+};
+
 #endif /* MISSION_SYSTEM_ACSSUBSYSTEM_H_ */
diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt
index 27637339..59418a07 100644
--- a/mission/system/CMakeLists.txt
+++ b/mission/system/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(${LIB_EIVE_MISSION} PRIVATE
+    EiveSystem.cpp
+    AcsSubsystem.cpp
+    ComSubsystem.cpp
+    PayloadSubsystem.cpp
+
     AcsBoardAssembly.cpp
     SusAssembly.cpp
-    AcsSubsystem.cpp
-    EiveSystem.cpp
-    ComSubsystem.cpp
     DualLanePowerStateMachine.cpp
     PowerStateMachineBase.cpp
     DualLaneAssemblyBase.cpp
diff --git a/mission/system/ComSubsystem.cpp b/mission/system/ComSubsystem.cpp
index fe91daff..3308de8c 100644
--- a/mission/system/ComSubsystem.cpp
+++ b/mission/system/ComSubsystem.cpp
@@ -1 +1,5 @@
 #include "ComSubsystem.h"
+
+ComSubsystem::ComSubsystem(object_id_t setObjectId, object_id_t parent,
+                           uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables)
+    : Subsystem(setObjectId, parent, maxNumberOfSequences, maxNumberOfTables) {}
diff --git a/mission/system/ComSubsystem.h b/mission/system/ComSubsystem.h
index a850c228..fc35438c 100644
--- a/mission/system/ComSubsystem.h
+++ b/mission/system/ComSubsystem.h
@@ -1,4 +1,14 @@
 #ifndef MISSION_SYSTEM_COMSUBSYSTEM_H_
 #define MISSION_SYSTEM_COMSUBSYSTEM_H_
 
+#include <fsfw/subsystem/Subsystem.h>
+
+class ComSubsystem : public Subsystem {
+ public:
+  ComSubsystem(object_id_t setObjectId, object_id_t parent, uint32_t maxNumberOfSequences,
+               uint32_t maxNumberOfTables);
+
+ private:
+};
+
 #endif /* MISSION_SYSTEM_COMSUBSYSTEM_H_ */
diff --git a/mission/system/EiveSystem.cpp b/mission/system/EiveSystem.cpp
index 1fcd9b0f..1be0152a 100644
--- a/mission/system/EiveSystem.cpp
+++ b/mission/system/EiveSystem.cpp
@@ -1 +1,5 @@
 #include "EiveSystem.h"
+
+EiveSystem::EiveSystem(object_id_t setObjectId, object_id_t parent, uint32_t maxNumberOfSequences,
+                       uint32_t maxNumberOfTables)
+    : Subsystem(setObjectId, parent, maxNumberOfSequences, maxNumberOfTables) {}
diff --git a/mission/system/EiveSystem.h b/mission/system/EiveSystem.h
index d4957787..671d47b6 100644
--- a/mission/system/EiveSystem.h
+++ b/mission/system/EiveSystem.h
@@ -1,4 +1,14 @@
 #ifndef MISSION_SYSTEM_EIVESYSTEM_H_
 #define MISSION_SYSTEM_EIVESYSTEM_H_
 
+#include <fsfw/subsystem/Subsystem.h>
+
+class EiveSystem : public Subsystem {
+ public:
+  EiveSystem(object_id_t setObjectId, object_id_t parent, uint32_t maxNumberOfSequences,
+             uint32_t maxNumberOfTables);
+
+ private:
+};
+
 #endif /* MISSION_SYSTEM_EIVESYSTEM_H_ */
diff --git a/mission/system/PayloadSubsystem.cpp b/mission/system/PayloadSubsystem.cpp
index a1f277e9..97008c2f 100644
--- a/mission/system/PayloadSubsystem.cpp
+++ b/mission/system/PayloadSubsystem.cpp
@@ -1 +1,5 @@
 #include "PayloadSubsystem.h"
+
+PayloadSubsystem::PayloadSubsystem(object_id_t setObjectId, object_id_t parent,
+                                   uint32_t maxNumberOfSequences, uint32_t maxNumberOfTables)
+    : Subsystem(setObjectId, parent, maxNumberOfSequences, maxNumberOfTables) {}
diff --git a/mission/system/PayloadSubsystem.h b/mission/system/PayloadSubsystem.h
index 6725c02f..b25454f7 100644
--- a/mission/system/PayloadSubsystem.h
+++ b/mission/system/PayloadSubsystem.h
@@ -1,4 +1,14 @@
 #ifndef MISSION_SYSTEM_PAYLOADSUBSYSTEM_H_
 #define MISSION_SYSTEM_PAYLOADSUBSYSTEM_H_
 
+#include <fsfw/subsystem/Subsystem.h>
+
+class PayloadSubsystem : public Subsystem {
+ public:
+  PayloadSubsystem(object_id_t setObjectId, object_id_t parent, uint32_t maxNumberOfSequences,
+                   uint32_t maxNumberOfTables);
+
+ private:
+};
+
 #endif /* MISSION_SYSTEM_PAYLOADSUBSYSTEM_H_ */