diff --git a/.gitmodules b/.gitmodules
index 4a973500..6f538287 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "fsfw_hal"]
 	path = fsfw_hal
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw_hal.git
+[submodule "generators/modgen"]
+	path = generators/modgen
+	url = https://git.ksat-stuttgart.de/source/modgen.git
diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 4d1a413e..297f8167 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -537,7 +537,7 @@ void ObjectFactory::produce(){
     (void) rtdIc17;
     (void) rtdIc18;
 
-#endif /* Q7S_ADD_RTS_DEVICES == 1 */
+#endif /* Q7S_ADD_RTD_DEVICES == 1 */
 
     I2cCookie* imtqI2cCookie = new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE,
             std::string("/dev/i2c-0"));
diff --git a/generators/modgen b/generators/modgen
new file mode 160000
index 00000000..5ed4a2ae
--- /dev/null
+++ b/generators/modgen
@@ -0,0 +1 @@
+Subproject commit 5ed4a2ae59e90c3763616bdaf41eb3317e849100
diff --git a/thirdparty/etl b/thirdparty/etl
index c308dc42..0efecca7 160000
--- a/thirdparty/etl
+++ b/thirdparty/etl
@@ -1 +1 @@
-Subproject commit c308dc427b7a34e54f33860fb2e244564b2740b4
+Subproject commit 0efecca700c6d0847f91b5540638571ba298c793
diff --git a/tmtc b/tmtc
index 06750809..574a3e92 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 06750809cb52044392e0683896538a652f11a512
+Subproject commit 574a3e92074d9d4d0335dad3ddc5962e1369f5d5