diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte
index 97884b2..39c2b4e 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte
@@ -14,153 +14,185 @@
     NumberOfPreTriggers = 0
     NumberOfPostTriggers = 0
     Signals = {
-      Trigger_DAN = {
-        Type = uint8
+      DI_Time = {
+        Type = uint64
+        TimeSignal = 1
+        AbsoluteTime = 1
+        TimeSignalMultiplier = 1e-9
       }
-      PXI6528_Status_SAMPLES = {
+      PXI6528_Status = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint32
+        NodeName = @rfid .. ":PXI6528_Status"
       }
-      GYA_APS_READY_SAMPLES = {
+      GYA_APS_READY = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint32
+        NodeName = @rfid .. ":GYA_APS_READY"
       }
-      GYA_APS_FLT_SAMPLES = {
+      GYA_APS_FLT = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":GYA_APS_FLT"
       }
-      GYA_BPS_READY_SAMPLES = {
+      GYA_BPS_READY = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":GYA_BPS_READY"
       }
-      GYA_BPS_FLT_SAMPLES = {
+      GYA_BPS_FLT = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":GYA_BPS_FLT"
       }
-      MHVPS_OV_SAMPLES = {
+      MHVPS_OV = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":MHVPS_OV"
       }
-      MHVPS_OC_SAMPLES = {
+      MHVPS_OC = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":MHVPS_OC"
       }
-      MHVPS_FLT_SAMPLES = {
+      MHVPS_FLT = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":MHVPS_FLT"
       }
-      MHVPS_READY_SAMPLES = {
+      MHVPS_READY = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":MHVPS_READY"
       }
-      ECPC_MOD_SAMPLES = {
+      ECPC_MOD = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":ECPC_MOD"
       }
-      FAST_TRIP_SAMPLES = {
+      FAST_TRIP = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":FAST_TRIP"
       }
-      CRIO_RV1_SAMPLES = {
+      CRIO_RV1 = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":CRIO_RV1"
       }
-      CRIO_RV2_SAMPLES = {
+      CRIO_RV2 = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":CRIO_RV2"
       }
-      CRIO_RV3_SAMPLES = {
+      CRIO_RV3 = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":CRIO_RV3"
       }
-      PLC_ITL_SAMPLES = {
+      PLC_ITL = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_ITL"
       }
-      PLC_STANDBY_SAMPLES = {
+      PLC_STANDBY = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_STANDBY"
       }
-      PLC_READY_SAMPLES = {
+      PLC_READY = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_READY"
       }
-      PLC_ON_SAMPLES = {
+      PLC_ON = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_ON"
       }
-      PLC_PERMIT_SAMPLES = {
+      PLC_PERMIT = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_PERMIT"
       }
-      PLC_OP_SELECTED_SAMPLES = {
+      PLC_OP_SELECTED = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_OP_SELECTED"
       }
-      PLC_CC_OP_SELECTED_SAMPLES = {
+      PLC_CC_OP_SELECTED = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_CC_OP_SELECTED"
       }
-      PLC_SYNCMODE_SAMPLES = {
+      PLC_SYNCMODE = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":PLC_SYNCMODE"
       }
-      TRIGGER_SAMPLES = {
+      TRIGGER = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":TRIGGER"
       }
-      BEAM_ON_STAT_SAMPLES = {
+      BEAM_ON_STAT = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":BEAM_ON_STAT"
       }
-      HVARMED_SAMPLES = {
+      HVARMED = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":HVARMED"
       }
-      HVINJECTION_SAMPLES = {
+      HVINJECTION = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint8
+        NodeName = @rfid .. ":HVINJECTION"
       }
-      RFON_SAMPLES = {
+      RFON = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
+        NodeName = @rfid .. ":RFON"
         Type = uint8
       }
-      BEAM_ON_TIME_SAMPLES = {
-        SamplingFrequency = @fast_clock
-        NumberOfElements = @dan_ratio
-        Type = uint32
-      }
-      RFON_TIME_SAMPLES = {
+      BEAM_ON_TIME = {
+        SamplingFrequency = @fast_clock
+        NumberOfElements = @dan_ratio
+        NodeName = @rfid .. ":BEAM_ON_TIME"
+        Type = uint32
+      }
+      RFON_TIME = {
         SamplingFrequency = @fast_clock
         NumberOfElements = @dan_ratio
         Type = uint32
+        NodeName = @rfid .. ":RFON_TIME"
       }
     }
   }
@@ -170,13 +202,14 @@
   +DANDIOPublisherGAM = {
     Class = IOGAM
     InputSignals = {
-      TRIGGER_DAN = {
-        DataSource = EPICSCAInput
+      Time = {
+        DataSource = SynchThread
+        Samples = @dan_ratio
+        Frequency = 1
       }
       PXI6528_Status = {
         DataSource = SynchThread
         Samples = @dan_ratio
-        Frequency = 1
       }
       GYA_APS_READY = {
         DataSource = SynchThread
@@ -292,94 +325,94 @@
       }
     }
     OutputSignals = {
-      Trigger_DAN = {
+      DI_Time = {
         DataSource = DANDIODataSource
       }
-      PXI6528_Status_SAMPLES = {
+      PXI6528_Status = {
         DataSource = DANDIODataSource
       }
-      GYA_APS_READY_SAMPLES = {
+      GYA_APS_READY = {
         DataSource = DANDIODataSource
       }
-      GYA_APS_FLT_SAMPLES = {
+      GYA_APS_FLT = {
         DataSource = DANDIODataSource
       }
-      GYA_BPS_READY_SAMPLES = {
+      GYA_BPS_READY = {
         DataSource = DANDIODataSource
       }
-      GYA_BPS_FLT_SAMPLES = {
+      GYA_BPS_FLT = {
         DataSource = DANDIODataSource
       }
-      MHVPS_OV_SAMPLES = {
+      MHVPS_OV = {
         DataSource = DANDIODataSource
       }
-      MHVPS_OC_SAMPLES = {
+      MHVPS_OC = {
         DataSource = DANDIODataSource
       }
-      MHVPS_FLT_SAMPLES = {
+      MHVPS_FLT = {
         DataSource = DANDIODataSource
       }
-      MHVPS_READY_SAMPLES = {
+      MHVPS_READY = {
         DataSource = DANDIODataSource
       }
-      ECPC_MOD_SAMPLES = {
+      ECPC_MOD = {
         DataSource = DANDIODataSource
       }
-      FAST_TRIP_SAMPLES = {
+      FAST_TRIP = {
         DataSource = DANDIODataSource
       }
-      CRIO_RV1_SAMPLES = {
+      CRIO_RV1 = {
         DataSource = DANDIODataSource
       }      
-      CRIO_RV2_SAMPLES = {
+      CRIO_RV2 = {
         DataSource = DANDIODataSource
       }      
-      CRIO_RV3_SAMPLES = {
+      CRIO_RV3 = {
         DataSource = DANDIODataSource
       }      
-      PLC_ITL_SAMPLES = {
+      PLC_ITL = {
         DataSource = DANDIODataSource
       }
-      PLC_STANDBY_SAMPLES = {
+      PLC_STANDBY = {
         DataSource = DANDIODataSource
       }
-      PLC_READY_SAMPLES = {
+      PLC_READY = {
         DataSource = DANDIODataSource
       }
-      PLC_ON_SAMPLES = {
+      PLC_ON = {
         DataSource = DANDIODataSource
       }
-      PLC_PERMIT_SAMPLES = {
+      PLC_PERMIT = {
         DataSource = DANDIODataSource
       }
-      PLC_OP_SELECTED_SAMPLES = {
+      PLC_OP_SELECTED = {
         DataSource = DANDIODataSource
       }
-      PLC_CC_OP_SELECTED_SAMPLES = {
+      PLC_CC_OP_SELECTED = {
         DataSource = DANDIODataSource
       }
-      PLC_SYNCMODE_SAMPLES = {
+      PLC_SYNCMODE = {
         DataSource = DANDIODataSource
       }
-      TRIGGER_SAMPLES = {
+      TRIGGER = {
         DataSource = DANDIODataSource
       }
-      BEAM_ON_STAT_SAMPLES = {
+      BEAM_ON_STAT = {
         DataSource = DANDIODataSource
       }
-      HVARMED_SAMPLES = {
+      HVARMED = {
         DataSource = DANDIODataSource
       }
-      HVINJECTION_SAMPLES = {
+      HVINJECTION = {
         DataSource = DANDIODataSource
       }
-      RFON_SAMPLES = {
+      RFON = {
         DataSource = DANDIODataSource
       }
-      BEAM_ON_TIME_SAMPLES = {
+      BEAM_ON_TIME = {
         DataSource = DANDIODataSource
       }
-      RFON_TIME_SAMPLES = {
+      RFON_TIME = {
         DataSource = DANDIODataSource
       }
     }