diff --git a/pus/Service1TelecommandVerification.cpp b/pus/Service1TelecommandVerification.cpp
index 9b17eba5..6d081fe2 100644
--- a/pus/Service1TelecommandVerification.cpp
+++ b/pus/Service1TelecommandVerification.cpp
@@ -8,13 +8,12 @@
 #include "../tmtcservices/AcceptsTelemetryIF.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
 
-
 Service1TelecommandVerification::Service1TelecommandVerification(
         object_id_t objectId, uint16_t apid, uint8_t serviceId,
-        object_id_t targetDestination):
+        object_id_t targetDestination, uint16_t messageQueueDepth):
         SystemObject(objectId), apid(apid), serviceId(serviceId),
         targetDestination(targetDestination) {
-	tmQueue = QueueFactory::instance()->createMessageQueue();
+	tmQueue = QueueFactory::instance()->createMessageQueue(messageQueueDepth);
 }
 
 Service1TelecommandVerification::~Service1TelecommandVerification() {}
diff --git a/pus/Service1TelecommandVerification.h b/pus/Service1TelecommandVerification.h
index 37562d1c..6fff0332 100644
--- a/pus/Service1TelecommandVerification.h
+++ b/pus/Service1TelecommandVerification.h
@@ -44,7 +44,8 @@ public:
 	static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PUS_SERVICE_1;
 
 	Service1TelecommandVerification(object_id_t objectId,
-	        uint16_t apid, uint8_t serviceId, object_id_t targetDestination);
+	        uint16_t apid, uint8_t serviceId, object_id_t targetDestination,
+			uint16_t messageQueueDepth);
 	virtual ~Service1TelecommandVerification();
 
 	/**
diff --git a/returnvalues/FwClassIds.h b/returnvalues/FwClassIds.h
index c8c0a3ad..120d1e2e 100644
--- a/returnvalues/FwClassIds.h
+++ b/returnvalues/FwClassIds.h
@@ -66,8 +66,8 @@ enum {
 	HOUSEKEEPING_MANAGER, //HKM 60
 	DLE_ENCODER, //DLEE 61
 	SERIAL_ANALYZER, //SERA 62
-	PUS_SERVICE_9, // PUS9 63
-	FILE_SYSTEM, // FLSY 64
+	PUS_SERVICE_9, //PUS9 63
+	FILE_SYSTEM, //FLSY 64
 	FW_CLASS_ID_COUNT //is actually count + 1 !
 
 };
diff --git a/tmtcservices/CommandingServiceBase.h b/tmtcservices/CommandingServiceBase.h
index 252b6943..9f1d4c4f 100644
--- a/tmtcservices/CommandingServiceBase.h
+++ b/tmtcservices/CommandingServiceBase.h
@@ -13,6 +13,8 @@
 #include "../container/FIFO.h"
 #include "../serialize/SerializeIF.h"
 
+#include <FSFWConfig.h>
+
 class TcPacketStored;
 
 namespace Factory{
@@ -40,7 +42,7 @@ class CommandingServiceBase: public SystemObject,
 	friend void (Factory::setStaticFrameworkObjectIds)();
 public:
 	// We could make this configurable via preprocessor and the FSFWConfig file.
-	static constexpr uint8_t COMMAND_INFO_FIFO_DEPTH = 3;
+	static constexpr uint8_t COMMAND_INFO_FIFO_DEPTH = FSFW_CSB_FIFO_DEPTH;
 
 	static const uint8_t INTERFACE_ID = CLASS_ID::COMMAND_SERVICE_BASE;