diff --git a/mission/persistentTmStoreDefs.h b/mission/persistentTmStoreDefs.h
index e84f12c1..01fe6781 100644
--- a/mission/persistentTmStoreDefs.h
+++ b/mission/persistentTmStoreDefs.h
@@ -28,15 +28,15 @@ static constexpr Event BUSY_DUMPING_EVENT = event::makeEvent(SUBSYSTEM_ID, 2, se
 //! [EXPORT] : [COMMENT] Dump was cancelled. P1: Object ID of store.
 static constexpr Event DUMP_WAS_CANCELLED = event::makeEvent(SUBSYSTEM_ID, 3, severity::LOW);
 
-//! [EXPORT] : [COMMENT] P1: Start time as UNIX seconds. P2: End time as UNIX seconds.
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets.
 static constexpr Event DUMP_OK_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 5, severity::INFO);
-//! [EXPORT] : [COMMENT] P1: Start time as UNIX seconds. P2: End time as UNIX seconds.
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets.
 static constexpr Event DUMP_NOK_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 6, severity::INFO);
-//! [EXPORT] : [COMMENT] P1: Start time as UNIX seconds. P2: End time as UNIX seconds.
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets.
 static constexpr Event DUMP_MISC_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 7, severity::INFO);
-//! [EXPORT] : [COMMENT] P1: Start time as UNIX seconds. P2: End time as UNIX seconds.
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets.
 static constexpr Event DUMP_HK_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 8, severity::INFO);
-//! [EXPORT] : [COMMENT] P1: Start time as UNIX seconds. P2: End time as UNIX seconds.
+//! [EXPORT] : [COMMENT] P1: Number of dumped packets.
 static constexpr Event DUMP_CFDP_STORE_DONE = event::makeEvent(SUBSYSTEM_ID, 9, severity::INFO);
 };  // namespace persTmStore
 
diff --git a/mission/tmtc/PersistentSingleTmStoreTask.h b/mission/tmtc/PersistentSingleTmStoreTask.h
index 2fc9ece1..08ec8b17 100644
--- a/mission/tmtc/PersistentSingleTmStoreTask.h
+++ b/mission/tmtc/PersistentSingleTmStoreTask.h
@@ -18,6 +18,7 @@ class PersistentSingleTmStoreTask : public TmStoreTaskBase, public ExecutableObj
  private:
   PersistentTmStoreWithTmQueue& storeWithQueue;
   Event eventIfDumpDone;
+  uint32_t numberOfDumpedPackets = 0;
   Countdown tcHandlingCd = Countdown(400);
 
   bool initStoresIfPossible();
diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
index 2599a42f..445eee9d 100644
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -216,6 +216,8 @@ ReturnValue_t PersistentTmStore::loadNextDumpFile() {
       sif::error << "PersistentTmStore: Could not retrieve file size: " << e.message() << std::endl;
       continue;
     }
+    sif::debug << "Path: " << dumpParams.dirEntry.path() << std::endl;
+
     // Can't even read CCSDS header.
     if (dumpParams.fileSize <= 6) {
       continue;
diff --git a/mission/tmtc/TmStoreTaskBase.cpp b/mission/tmtc/TmStoreTaskBase.cpp
index ba0197fd..5c0402fe 100644
--- a/mission/tmtc/TmStoreTaskBase.cpp
+++ b/mission/tmtc/TmStoreTaskBase.cpp
@@ -11,7 +11,8 @@ TmStoreTaskBase::TmStoreTaskBase(object_id_t objectId, StorageManagerIF& ipcStor
                                  VirtualChannel& channel, SdCardMountedIF& sdcMan)
     : SystemObject(objectId), ipcStore(ipcStore), channel(channel), sdcMan(sdcMan) {}
 
-bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event eventIfDone) {
+bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event eventIfDone,
+    uint32_t& numberOfDumpedPackets) {
   ReturnValue_t result;
   bool tmToStoreReceived = false;
   bool tcRequestReceived = false;
@@ -33,7 +34,7 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event
         uint32_t startTime;
         uint32_t endTime;
         store.getStartAndEndTimeCurrentOrLastDump(startTime, endTime);
-        triggerEvent(eventIfDone, startTime, endTime);
+        triggerEvent(eventIfDone, numberOfDumpedPackets);
         dumpsPerformed = true;
       } else if (result == returnvalue::OK) {
         dumpsPerformed = true;