diff --git a/mission/tmtc/CMakeLists.txt b/mission/tmtc/CMakeLists.txt
index 2fdccc81..d8dd4e1c 100644
--- a/mission/tmtc/CMakeLists.txt
+++ b/mission/tmtc/CMakeLists.txt
@@ -1,4 +1,9 @@
 target_sources(
-  ${LIB_EIVE_MISSION} PRIVATE CCSDSHandler.cpp VirtualChannel.cpp TmFunnel.cpp
-                              CfdpTmFunnel.cpp PusTmFunnel.cpp Service15TmStorage.cpp
-                              TmStoreBackend.cpp)
+  ${LIB_EIVE_MISSION}
+  PRIVATE CCSDSHandler.cpp
+          VirtualChannel.cpp
+          TmFunnel.cpp
+          CfdpTmFunnel.cpp
+          PusTmFunnel.cpp
+          Service15TmStorage.cpp
+          TmStoreBackend.cpp)
diff --git a/mission/tmtc/Service15TmStorage.cpp b/mission/tmtc/Service15TmStorage.cpp
index 1a441247..590b6c8e 100644
--- a/mission/tmtc/Service15TmStorage.cpp
+++ b/mission/tmtc/Service15TmStorage.cpp
@@ -1,13 +1,31 @@
 #include "Service15TmStorage.h"
 
+using namespace returnvalue;
 
-Service15TmStorage::Service15TmStorage(PsbParams params): PusServiceBase(params) {
+Service15TmStorage::Service15TmStorage(object_id_t objectId, uint16_t apid,
+                                       uint8_t numParallelCommands, uint16_t commandTimeoutSecs,
+                                       size_t queueDepth)
+    : CommandingServiceBase(objectId, apid, "PUS Service 15", 15, numParallelCommands,
+                            commandTimeoutSecs, queueDepth) {}
+
+ReturnValue_t Service15TmStorage::isValidSubservice(uint8_t subservice) { return OK; }
+
+ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice,
+                                                           const uint8_t *tcData, size_t tcDataLen,
+                                                           MessageQueueId_t *id,
+                                                           object_id_t *objectId) {
+  return OK;
 }
 
-ReturnValue_t Service15TmStorage::handleRequest(uint8_t subservice) {
-  return returnvalue::OK;
+ReturnValue_t Service15TmStorage::prepareCommand(CommandMessage *message, uint8_t subservice,
+                                                 const uint8_t *tcData, size_t tcDataLen,
+                                                 uint32_t *state, object_id_t objectId) {
+  return OK;
 }
 
-ReturnValue_t Service15TmStorage::performService() {
-  return returnvalue::OK;
+ReturnValue_t Service15TmStorage::handleReply(const CommandMessage *reply,
+                                              Command_t previousCommand, uint32_t *state,
+                                              CommandMessage *optionalNextCommand,
+                                              object_id_t objectId, bool *isStep) {
+  return OK;
 }
diff --git a/mission/tmtc/Service15TmStorage.h b/mission/tmtc/Service15TmStorage.h
index 82856bec..0243fdb3 100644
--- a/mission/tmtc/Service15TmStorage.h
+++ b/mission/tmtc/Service15TmStorage.h
@@ -1,16 +1,23 @@
 #ifndef MISSION_TMTC_SERVICE15TMSTORAGE_H_
 #define MISSION_TMTC_SERVICE15TMSTORAGE_H_
 
-#include "fsfw/tmtcservices/PusServiceBase.h"
+#include <fsfw/tmtcservices/CommandingServiceBase.h>
 
-class Service15TmStorage: public PusServiceBase {
-public:
-  explicit Service15TmStorage(PsbParams params);
-private:
-  ReturnValue_t handleRequest(uint8_t subservice) override;
-  ReturnValue_t performService() override;
+class Service15TmStorage : public CommandingServiceBase {
+ public:
+  explicit Service15TmStorage(object_id_t objectId, uint16_t apid, uint8_t numParallelCommands,
+                              uint16_t commandTimeoutSecs, size_t queueDepth);
+
+ private:
+  ReturnValue_t isValidSubservice(uint8_t subservice) override;
+  ReturnValue_t getMessageQueueAndObject(uint8_t subservice, const uint8_t* tcData,
+                                         size_t tcDataLen, MessageQueueId_t* id,
+                                         object_id_t* objectId) override;
+  ReturnValue_t prepareCommand(CommandMessage* message, uint8_t subservice, const uint8_t* tcData,
+                               size_t tcDataLen, uint32_t* state, object_id_t objectId) override;
+  ReturnValue_t handleReply(const CommandMessage* reply, Command_t previousCommand, uint32_t* state,
+                            CommandMessage* optionalNextCommand, object_id_t objectId,
+                            bool* isStep) override;
 };
 
-
-
 #endif /* MISSION_TMTC_SERVICE15TMSTORAGE_H_ */
diff --git a/mission/tmtc/TmStoreBackend.cpp b/mission/tmtc/TmStoreBackend.cpp
index 4ffaa98b..4362609d 100644
--- a/mission/tmtc/TmStoreBackend.cpp
+++ b/mission/tmtc/TmStoreBackend.cpp
@@ -1,8 +1,6 @@
 #include "TmStoreBackend.h"
 
-const char* TmStoreBackend::getName() const {
-  return "TM Store Backend";
-}
+const char* TmStoreBackend::getName() const { return "TM Store Backend"; }
 
 MessageQueueId_t TmStoreBackend::getReportReceptionQueue(uint8_t virtualChannel) const {
   return MessageQueueIF::NO_QUEUE;
diff --git a/mission/tmtc/TmStoreBackend.h b/mission/tmtc/TmStoreBackend.h
index d845d758..f53b5227 100644
--- a/mission/tmtc/TmStoreBackend.h
+++ b/mission/tmtc/TmStoreBackend.h
@@ -3,14 +3,12 @@
 
 #include <fsfw/tmtcservices/AcceptsTelemetryIF.h>
 
-class TmStoreBackend: public AcceptsTelemetryIF {
-public:
-
+class TmStoreBackend : public AcceptsTelemetryIF {
+ public:
   [[nodiscard]] const char* getName() const override;
   [[nodiscard]] MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel) const override;
-private:
+
+ private:
 };
 
-
-
 #endif /* MISSION_TMTC_TMSTOREBACKEND_H_ */