diff --git a/MQ/mcbm/CMakeLists.txt b/MQ/mcbm/CMakeLists.txt
index e85b810635f16c335fba82ae85724741ee427388..25e526bf5bb5640c44f2f006755722db9e9b292b 100644
--- a/MQ/mcbm/CMakeLists.txt
+++ b/MQ/mcbm/CMakeLists.txt
@@ -70,16 +70,14 @@ set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
 
-# disabled until T0 is implemented in unpackers
-#
-#set(EXE_NAME BuildRawEvents)
-#set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
-#
-#set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-#set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
-#set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
-#
-#generate_cbm_executable()
+set(EXE_NAME BuildRawEvents)
+set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
+
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
+
+generate_cbm_executable()
 
 
 set(EXE_NAME McbmEventBuilderWin)
@@ -110,16 +108,14 @@ set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
 
-# disabled until T0 is implemented in unpackers
-#
-#set(EXE_NAME BuildDigiEvents)
-#set(SRCS CbmDeviceBuildDigiEvents.cxx runBuildDigiEvents.cxx)
-#
-#set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-#set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
-#set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
-#
-#generate_cbm_executable()
+set(EXE_NAME BuildDigiEvents)
+set(SRCS CbmDeviceBuildDigiEvents.cxx runBuildDigiEvents.cxx)
+
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
+
+generate_cbm_executable()
 
 set(EXE_NAME DigiEventSink)
 set(SRCS CbmDeviceDigiEventSink.cxx runDigiEventSink.cxx)
diff --git a/MQ/mcbm/CbmDeviceBuildDigiEvents.cxx b/MQ/mcbm/CbmDeviceBuildDigiEvents.cxx
index ce20891f3322e6fe2033e32f36f1f1d86bbccfac..a6c9ce996c5ae490de871749d96cef24099a0521 100644
--- a/MQ/mcbm/CbmDeviceBuildDigiEvents.cxx
+++ b/MQ/mcbm/CbmDeviceBuildDigiEvents.cxx
@@ -336,7 +336,7 @@ try {
   /* clang-format on */
 
   /// Create input vectors
-  fvDigiT0   = new std::vector<CbmTofDigi>(1000000);
+  fvDigiT0   = new std::vector<CbmTzdDigi>(1000000);
   fvDigiSts  = new std::vector<CbmStsDigi>(1000000);
   fvDigiMuch = new std::vector<CbmMuchDigi>(1000000);
   fvDigiTrd  = new std::vector<CbmTrdDigi>(1000000);
@@ -347,7 +347,7 @@ try {
   fCbmTsEventHeader = new CbmTsEventHeader();
 
   /// Digis storage
-  fpAlgo->SetT0Digis(fvDigiT0);
+  fpAlgo->SetDigis(fvDigiT0);
   fpAlgo->SetDigis(fvDigiSts);
   fpAlgo->SetDigis(fvDigiMuch);
   fpAlgo->SetDigis(fvDigiTrd);
diff --git a/MQ/mcbm/CbmDeviceBuildDigiEvents.h b/MQ/mcbm/CbmDeviceBuildDigiEvents.h
index 42af1bcfdcf6cf50836f5046758ecacae09d437b..38b88c46c07912f11c394c7fd839520573b21b50 100644
--- a/MQ/mcbm/CbmDeviceBuildDigiEvents.h
+++ b/MQ/mcbm/CbmDeviceBuildDigiEvents.h
@@ -20,6 +20,7 @@
 #include "CbmStsDigi.h"
 #include "CbmTofDigi.h"
 #include "CbmTrdDigi.h"
+#include "CbmTzdDigi.h"
 
 /// FAIRROOT headers
 #include "FairMQDevice.h"
@@ -102,7 +103,7 @@ private:
   /// TS information in header
   CbmTsEventHeader* fCbmTsEventHeader = nullptr;
   /// Digis storage
-  std::vector<CbmTofDigi>* fvDigiT0    = nullptr;
+  std::vector<CbmTzdDigi>* fvDigiT0    = nullptr;
   std::vector<CbmStsDigi>* fvDigiSts   = nullptr;
   std::vector<CbmMuchDigi>* fvDigiMuch = nullptr;
   std::vector<CbmTrdDigi>* fvDigiTrd   = nullptr;
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
index bde389bdbb41eb7b1c41ede7af87e11c2f0127cf..6bbb1419047d3d45ca7fe7063d74781c24161216 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.cxx
@@ -268,7 +268,7 @@ try {
   /* clang-format on */
 
   /// Create input vectors
-  fvDigiT0   = new std::vector<CbmTofDigi>();
+  fvDigiT0   = new std::vector<CbmTzdDigi>();
   fvDigiSts  = new std::vector<CbmStsDigi>();
   fvDigiMuch = new std::vector<CbmMuchBeamTimeDigi>();
   fvDigiTrd  = new std::vector<CbmTrdDigi>();
@@ -281,7 +281,7 @@ try {
   fpAlgo->SetTimeSliceMetaDataArray(fTimeSliceMetaDataArray);
 
   /// Digis storage
-  fpAlgo->SetT0Digis(fvDigiT0);
+  fpAlgo->SetDigis(fvDigiT0);
   fpAlgo->SetDigis(fvDigiSts);
   fpAlgo->SetDigis(fvDigiMuch);
   fpAlgo->SetDigis(fvDigiTrd);
diff --git a/MQ/mcbm/CbmDeviceBuildRawEvents.h b/MQ/mcbm/CbmDeviceBuildRawEvents.h
index 62bac4393b4e00e2aca9120a193f556c2ac63114..b41022bc39134bc619cc76732257e6961dccf3dd 100644
--- a/MQ/mcbm/CbmDeviceBuildRawEvents.h
+++ b/MQ/mcbm/CbmDeviceBuildRawEvents.h
@@ -20,6 +20,7 @@
 #include "CbmStsDigi.h"
 #include "CbmTofDigi.h"
 #include "CbmTrdDigi.h"
+#include "CbmTzdDigi.h"
 
 /// FAIRROOT headers
 #include "FairMQDevice.h"
@@ -99,7 +100,7 @@ private:
   TClonesArray* fTimeSliceMetaDataArray = nullptr;  //!
   TimesliceMetaData* fTsMetaData        = nullptr;
   /// Digis storage
-  std::vector<CbmTofDigi>* fvDigiT0            = nullptr;
+  std::vector<CbmTzdDigi>* fvDigiT0            = nullptr;
   std::vector<CbmStsDigi>* fvDigiSts           = nullptr;
   std::vector<CbmMuchBeamTimeDigi>* fvDigiMuch = nullptr;
   std::vector<CbmTrdDigi>* fvDigiTrd           = nullptr;