diff --git a/bsp_hosted/core/ObjectFactory.cpp b/bsp_hosted/core/ObjectFactory.cpp
index b61fda1..1d3da3c 100644
--- a/bsp_hosted/core/ObjectFactory.cpp
+++ b/bsp_hosted/core/ObjectFactory.cpp
@@ -12,7 +12,7 @@
 #include <fsfw/monitoring/MonitoringMessageContent.h>
 #include <fsfw/storagemanager/PoolManager.h>
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
-#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
+#include <fsfw/tmtcpacket/pus/tm.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 
diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h.in b/bsp_hosted/fsfwconfig/FSFWConfig.h.in
index 5bae107..2c7a05d 100644
--- a/bsp_hosted/fsfwconfig/FSFWConfig.h.in
+++ b/bsp_hosted/fsfwconfig/FSFWConfig.h.in
@@ -67,6 +67,8 @@ static constexpr uint8_t FSFW_CSB_FIFO_DEPTH = 6;
 
 static constexpr size_t FSFW_PRINT_BUFFER_SIZE = 124;
 
+static constexpr size_t FSFW_MAX_TM_PACKET_SIZE = 2048;
+
 }
 
 #endif /* CONFIG_FSFWCONFIG_H_ */
diff --git a/example_common b/example_common
index 6493528..edaccc0 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 64935286e10d01760c6b21b2aa2e1f44ae6c1083
+Subproject commit edaccc0dbdad5d1072aa890b532b5e177ad4e8b1
diff --git a/fsfw b/fsfw
index 1e380fe..47af526 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1e380fe562540e8254b29f3f382c52e9f43142ca
+Subproject commit 47af5260a2341249bc00cdba095f96efa5a509dc