diff --git a/src/runtime2/communication.rs b/src/runtime2/communication.rs
index b73cb11df5390e31ee5582c529b6f21a8494dba3..50bd8692519941c659dcfbaff9bb0e3287631a12 100644
--- a/src/runtime2/communication.rs
+++ b/src/runtime2/communication.rs
@@ -46,16 +46,19 @@ pub struct Channel {
     pub getter_id: PortId,
 }
 
+#[derive(Debug)]
 pub struct DataMessage {
     pub data_header: MessageDataHeader,
     pub sync_header: MessageSyncHeader,
     pub content: ValueGroup,
 }
 
+#[derive(Debug)]
 pub struct MessageSyncHeader {
     pub sync_round: u32,
 }
 
+#[derive(Debug)]
 pub struct MessageDataHeader {
     pub expected_mapping: Vec<(PortId, u32)>,
     pub new_mapping: u32,
@@ -63,6 +66,7 @@ pub struct MessageDataHeader {
     pub target_port: PortId,
 }
 
+#[derive(Debug)]
 pub struct ControlMessage {
     pub(crate) id: ControlId,
     pub sender_comp_id: CompId,
@@ -70,7 +74,7 @@ pub struct ControlMessage {
     pub content: ControlMessageContent,
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 pub enum ControlMessageContent {
     Ack,
     BlockPort(PortId),
@@ -80,6 +84,7 @@ pub enum ControlMessageContent {
     PortPeerChangedUnblock(PortId, CompId),
 }
 
+#[derive(Debug)]
 pub enum Message {
     Data(DataMessage),
     Control(ControlMessage),