diff --git a/core-buffer/include/jungfrau.hpp b/core-buffer/include/jungfrau.hpp
index a3d9ce7..117f157 100644
--- a/core-buffer/include/jungfrau.hpp
+++ b/core-buffer/include/jungfrau.hpp
@@ -46,11 +46,7 @@ struct ModuleFrame {
 #pragma pack(pop)
 
 struct ModuleFrameBuffer {
-    uint64_t pulse_id[JUNGFRAU_N_MODULES];
-    uint64_t frame_index[JUNGFRAU_N_MODULES];
-    uint64_t daq_rec[JUNGFRAU_N_MODULES];
-    uint64_t n_received_packets[JUNGFRAU_N_MODULES];
-    uint64_t module_id[JUNGFRAU_N_MODULES];
+    ModuleFrame module[JUNGFRAU_N_MODULES];
 };