diff --git a/bsp_q7s/devices/PlocMemoryDumper.cpp b/bsp_q7s/devices/PlocMemoryDumper.cpp
index c7ba58bd..1d5dce85 100644
--- a/bsp_q7s/devices/PlocMemoryDumper.cpp
+++ b/bsp_q7s/devices/PlocMemoryDumper.cpp
@@ -10,7 +10,9 @@
 
 PlocMemoryDumper::PlocMemoryDumper(object_id_t objectId)
     : SystemObject(objectId), commandActionHelper(this), actionHelper(this, nullptr) {
-  commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  commandQueue = QueueFactory::instance()->createMessageQueue(
+      QUEUE_SIZE, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 PlocMemoryDumper::~PlocMemoryDumper() {}
diff --git a/bsp_q7s/devices/PlocUpdater.cpp b/bsp_q7s/devices/PlocUpdater.cpp
index 1478fbb8..b1d7f0c9 100644
--- a/bsp_q7s/devices/PlocUpdater.cpp
+++ b/bsp_q7s/devices/PlocUpdater.cpp
@@ -8,7 +8,9 @@
 
 PlocUpdater::PlocUpdater(object_id_t objectId)
     : SystemObject(objectId), commandActionHelper(this), actionHelper(this, nullptr) {
-  commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  commandQueue = QueueFactory::instance()->createMessageQueue(
+      QUEUE_SIZE, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 PlocUpdater::~PlocUpdater() {}
diff --git a/bsp_q7s/devices/startracker/StarTrackerHandler.cpp b/bsp_q7s/devices/startracker/StarTrackerHandler.cpp
index 71df6b0b..e5601ac0 100644
--- a/bsp_q7s/devices/startracker/StarTrackerHandler.cpp
+++ b/bsp_q7s/devices/startracker/StarTrackerHandler.cpp
@@ -44,7 +44,9 @@ StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF,
   if (strHelper == nullptr) {
     sif::error << "StarTrackerHandler: Invalid str image loader" << std::endl;
   }
-  eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
+  auto mqArgs = MqArgs(this->getObjectId());
+  eventQueue = QueueFactory::instance()->createMessageQueue(
+      EventMessage::EVENT_MESSAGE_SIZE * 5, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 StarTrackerHandler::~StarTrackerHandler() {}
diff --git a/bsp_q7s/memory/FileSystemHandler.cpp b/bsp_q7s/memory/FileSystemHandler.cpp
index 8b5f85c2..7a4a791c 100644
--- a/bsp_q7s/memory/FileSystemHandler.cpp
+++ b/bsp_q7s/memory/FileSystemHandler.cpp
@@ -11,7 +11,9 @@
 
 FileSystemHandler::FileSystemHandler(object_id_t fileSystemHandler)
     : SystemObject(fileSystemHandler) {
-  mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE,
+                                                    MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 FileSystemHandler::~FileSystemHandler() { QueueFactory::instance()->deleteMessageQueue(mq); }
diff --git a/mission/devices/HeaterHandler.cpp b/mission/devices/HeaterHandler.cpp
index 572810bd..255ba6ec 100644
--- a/mission/devices/HeaterHandler.cpp
+++ b/mission/devices/HeaterHandler.cpp
@@ -16,8 +16,9 @@ HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_
       mainLineSwitcherObjectId(mainLineSwitcherObjectId_),
       mainLineSwitch(mainLineSwitch_),
       actionHelper(this, nullptr) {
+  auto mqArgs = MqArgs(setObjectId_, static_cast<void*>(this));
   commandQueue = QueueFactory::instance()->createMessageQueue(
-      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE);
+      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 HeaterHandler::~HeaterHandler() {}
diff --git a/mission/tmtc/CCSDSHandler.cpp b/mission/tmtc/CCSDSHandler.cpp
index 35978627..d6c2367b 100644
--- a/mission/tmtc/CCSDSHandler.cpp
+++ b/mission/tmtc/CCSDSHandler.cpp
@@ -23,7 +23,9 @@ CCSDSHandler::CCSDSHandler(object_id_t objectId, object_id_t ptmeId, object_id_t
       enTxClock(enTxClock),
       enTxData(enTxData) {
   commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
-  eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 2);
+  auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
+  eventQueue =
+      QueueFactory::instance()->createMessageQueue(10, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs);
 }
 
 CCSDSHandler::~CCSDSHandler() {}
diff --git a/mission/tmtc/CCSDSHandler.h b/mission/tmtc/CCSDSHandler.h
index 4f62102c..284cbcba 100644
--- a/mission/tmtc/CCSDSHandler.h
+++ b/mission/tmtc/CCSDSHandler.h
@@ -132,7 +132,7 @@ class CCSDSHandler : public SystemObject,
 
   ActionHelper actionHelper;
 
-  MessageQueueId_t tcDistributorQueueId;
+  MessageQueueId_t tcDistributorQueueId = MessageQueueIF::NO_QUEUE;
 
   PtmeConfig* ptmeConfig = nullptr;
 
diff --git a/mission/tmtc/VirtualChannel.cpp b/mission/tmtc/VirtualChannel.cpp
index 5b9387fd..9d413ca7 100644
--- a/mission/tmtc/VirtualChannel.cpp
+++ b/mission/tmtc/VirtualChannel.cpp
@@ -7,9 +7,11 @@
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 #include "fsfw/tmtcservices/TmTcMessage.h"
 
-VirtualChannel::VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth) : vcId(vcId) {
-  tmQueue = QueueFactory::instance()->createMessageQueue(tmQueueDepth,
-                                                         MessageQueueMessage::MAX_MESSAGE_SIZE);
+VirtualChannel::VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId)
+    : vcId(vcId) {
+  auto mqArgs = MqArgs(ownerId, reinterpret_cast<void*>(vcId));
+  tmQueue = QueueFactory::instance()->createMessageQueue(
+      tmQueueDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 ReturnValue_t VirtualChannel::initialize() {
diff --git a/mission/tmtc/VirtualChannel.h b/mission/tmtc/VirtualChannel.h
index 48cc74a4..c661c4c5 100644
--- a/mission/tmtc/VirtualChannel.h
+++ b/mission/tmtc/VirtualChannel.h
@@ -24,7 +24,7 @@ class VirtualChannel : public AcceptsTelemetryIF, public HasReturnvaluesIF {
    * @param vcId  The virtual channel id assigned to this object
    * @param tmQueueDepth  Queue depth of queue receiving telemetry from other objects
    */
-  VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth);
+  VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId);
 
   ReturnValue_t initialize();
   MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;
diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp
index 5577f5fa..e22eabdf 100644
--- a/mission/utility/TmFunnel.cpp
+++ b/mission/utility/TmFunnel.cpp
@@ -11,10 +11,11 @@ object_id_t TmFunnel::storageDestination = objects::NO_OBJECT;
 
 TmFunnel::TmFunnel(object_id_t objectId, uint32_t messageDepth)
     : SystemObject(objectId), messageDepth(messageDepth) {
-  tmQueue = QueueFactory::instance()->createMessageQueue(messageDepth,
-                                                         MessageQueueMessage::MAX_MESSAGE_SIZE);
+  auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
+  tmQueue = QueueFactory::instance()->createMessageQueue(
+      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
   storageQueue = QueueFactory::instance()->createMessageQueue(
-      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE);
+      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 TmFunnel::~TmFunnel() {}