diff --git a/fsfw b/fsfw
index 141dcb1f..2fa76d36 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 141dcb1f149b824b5bd6e5d3339ecb712835751e
+Subproject commit 2fa76d366325372e92a2188f71f143a485e652fc
diff --git a/linux/devices/startracker/StarTrackerHandler.cpp b/linux/devices/startracker/StarTrackerHandler.cpp
index 47312934..a4cd432c 100644
--- a/linux/devices/startracker/StarTrackerHandler.cpp
+++ b/linux/devices/startracker/StarTrackerHandler.cpp
@@ -1830,7 +1830,7 @@ ReturnValue_t StarTrackerHandler::handleChecksumReply() {
   }
   PoolReadGuard rg(&checksumSet);
   checksumSet.checksum = checksumReply.getChecksum();
-  handleDeviceTm(util::DataWrapper(checksumSet), startracker::CHECKSUM);
+  handleDeviceTm(checksumSet, startracker::CHECKSUM);
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1
   checksumReply.printChecksum();
 #endif /* OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_STARTRACKER == 1 */
diff --git a/mission/devices/ACUHandler.cpp b/mission/devices/ACUHandler.cpp
index 727b4ae5..2a8ffe8b 100644
--- a/mission/devices/ACUHandler.cpp
+++ b/mission/devices/ACUHandler.cpp
@@ -43,7 +43,7 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
 }
 
 void ACUHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
-  handleDeviceTm(util::DataWrapper(packet, ACU::CONFIG_TABLE_SIZE), id);
+  handleDeviceTm(packet, ACU::CONFIG_TABLE_SIZE, id);
 }
 
 LocalPoolDataSetBase *ACUHandler::getDataSetHandle(sid_t sid) {
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index 9278ed77..5acd209e 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -177,9 +177,7 @@ ReturnValue_t GomspaceDeviceHandler::interpretDeviceReply(DeviceCommandId_t id,
   switch (id) {
     case (GOMSPACE::PING): {
       SerializeElement<uint32_t> replyTime = *packet;
-      util::DataWrapper wrapper;
-      wrapper.setSerializable(replyTime);
-      handleDeviceTm(wrapper, id, true);
+      handleDeviceTm(replyTime, true);
       break;
     }
     case (GOMSPACE::PARAM_GET): {
@@ -206,7 +204,7 @@ ReturnValue_t GomspaceDeviceHandler::interpretDeviceReply(DeviceCommandId_t id,
       uint16_t address = cspGetParamReply.getAddress();
       /* Pack relevant information into a tm packet */
       ParamReply paramReply(action, tableId, address, payloadLength, tempPayloadBuffer);
-      handleDeviceTm(util::DataWrapper(paramReply), id, true);
+      handleDeviceTm(paramReply, id, true);
       break;
     }
     case (GOMSPACE::PARAM_SET): {
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index 574efd81..8c768847 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -268,5 +268,5 @@ void P60DockHandler::printHkTableLatchups() {
 void P60DockHandler::setDebugMode(bool enable) { this->debugMode = enable; }
 
 void P60DockHandler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
-  handleDeviceTm(util::DataWrapper(packet, P60Dock::CONFIG_TABLE_SIZE), id);
+  handleDeviceTm(packet, P60Dock::CONFIG_TABLE_SIZE, id);
 }
diff --git a/mission/devices/PDU1Handler.cpp b/mission/devices/PDU1Handler.cpp
index e7a077ba..9a44da5e 100644
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@@ -80,9 +80,7 @@ ReturnValue_t PDU1Handler::setParamCallback(SetParamMessageUnpacker &unpacker,
 }
 
 void PDU1Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
-  util::DataWrapper wrapper;
-  wrapper.setRawData({packet, PDU::CONFIG_TABLE_SIZE});
-  handleDeviceTm(wrapper, id);
+  handleDeviceTm(packet, PDU::CONFIG_TABLE_SIZE, id);
 }
 
 void PDU1Handler::parseHkTableReply(const uint8_t *packet) {
diff --git a/mission/devices/PDU2Handler.cpp b/mission/devices/PDU2Handler.cpp
index 9fb0fffe..4db6999f 100644
--- a/mission/devices/PDU2Handler.cpp
+++ b/mission/devices/PDU2Handler.cpp
@@ -25,9 +25,7 @@ void PDU2Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pac
 }
 
 void PDU2Handler::letChildHandleConfigReply(DeviceCommandId_t id, const uint8_t *packet) {
-  util::DataWrapper wrapper;
-  wrapper.setRawData({packet, PDU::CONFIG_TABLE_SIZE});
-  handleDeviceTm(wrapper, id);
+  handleDeviceTm(packet, PDU::CONFIG_TABLE_SIZE, id);
 }
 
 void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, void *args) {