diff --git a/mission/tmtc/Service15TmStorage.cpp b/mission/tmtc/Service15TmStorage.cpp
index c44f226c..d752bf00 100644
--- a/mission/tmtc/Service15TmStorage.cpp
+++ b/mission/tmtc/Service15TmStorage.cpp
@@ -4,6 +4,7 @@
 #include <fsfw/tmstorage/TmStoreFrontendSimpleIF.h>
 
 #include "eive/objects.h"
+#include "fsfw/tmstorage/TmStoreMessage.h"
 
 using namespace returnvalue;
 
@@ -48,7 +49,29 @@ ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice,
 ReturnValue_t Service15TmStorage::prepareCommand(CommandMessage *message, uint8_t subservice,
                                                  const uint8_t *tcData, size_t tcDataLen,
                                                  uint32_t *state, object_id_t objectId) {
-
+  if (subservice == Subservices::START_BY_TIME_RANGE_RETRIEVAL) {
+    if (tcDataLen != 12) {
+      return INVALID_TC;
+    }
+    store_address_t storeId;
+    ReturnValue_t result = ipcStore->addData(&storeId, tcData, tcDataLen);
+    if (result != OK) {
+      return result;
+    }
+    // Store timestamps
+    TmStoreMessage::setDownlinkContentTimeMessage(message, storeId);
+  } else if (subservice == Subservices::DELETE_UP_TO) {
+    if (tcDataLen != 8) {
+      return INVALID_TC;
+    }
+    store_address_t storeId;
+    ReturnValue_t result = ipcStore->addData(&storeId, tcData, tcDataLen);
+    if (result != OK) {
+      return result;
+    }
+    // Store timestamps
+    TmStoreMessage::setDeleteContentTimeMessage(message, storeId);
+  }
   return OK;
 }