diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
index aa7335f..5d7e366 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/out/jada_gyro_rtapp.marte
@@ -1596,10 +1596,7 @@
           Type = float32
         }
         FHPS_RU = {
-          Type = float32
-        }
-        CCPS_IN_OPERATION = {
-          Type = uint32
+          Type = uint8
         }
         PCF_STATE = {
           Type = uint32
@@ -1820,6 +1817,7 @@
     }
     +DDB6 = {
       Class = GAMDataSource
+      AllowNoProducer = 1
       Signals = {
         CCPS_REF = {
           Type = float32
@@ -1845,7 +1843,7 @@
       Class = TimingDataSource
     }
     +EPICSCAInput = {
-      Class = EPICSCAInput
+      Class = "EPICSCA::EPICSCAInput"
       Signals = {
         TRIGGER_DAN = {
           PVName = "EC-GN-P01:DAN_ENABLED"
@@ -2078,7 +2076,7 @@
         }
         BEAM_ON_STAT = {
           PVName = "EC-GN-P01-GAFP:FMC4310-YSTA-GAOP"
-          Type = uint32
+          Type = uint8
         }
         MHVPS_STOP = {
           PVName = "EC-GN-P01-PMF:PSU0000-COFF"
@@ -2094,15 +2092,15 @@
         }
         HVARMED = {
           PVName = "EC-GN-P01-GPF:PCF4210-YTS-GA1"
-          Type = uint32
+          Type = uint8
         }
         HVINJECTION = {
           PVName = "EC-GN-P01-GPF:PCF4210-YTS-GA2"
-          Type = uint32
+          Type = uint8
         }
         RFON = {
           PVName = "EC-GN-P01-GPF:PCF4210-YTS-GA3"
-          Type = uint32
+          Type = uint8
         }
         MHVPS_PREP_WF = {
           PVName = "EC-GN-P01-PMF:STAT-PREP-WF"
@@ -2142,7 +2140,7 @@
         }
         PREP_TIME_WF = {
           PVName = "EC-GN-P01-GAF:STAT-PREP-TIME-WF"
-          Type = int32
+          Type = uint32
           NumberOfElements = 8000
           NumberOfDimensions = 1
         }
@@ -2303,7 +2301,7 @@
           PVName = "EC-GN-P01-GAFP:FMC4310-YTRP2"
         }
         PXI_6259_STATE = {
-          Type = uint8
+          Type = uint32
           PVName = "EC-GN-P01-HWCF:6259-0-STATUS"
         }
         PXI_6683_STATE = {
@@ -2319,7 +2317,7 @@
           PVName = "EC-GN-P01-HWCF:6683-0-SYNCLOST"
         }
         PXI_6528_STATE = {
-          Type = uint8
+          Type = uint32
           PVName = "EC-GN-P01-HWCF:6528-0-STATUS"
         }
       }
@@ -2398,7 +2396,7 @@
       }
     }
     +SDNCommands = {
-      Class = SDNSubscriber
+      Class = "SDN::SDNSubscriber"
       Topic = "ECPC2SCUJA"
       Interface = "enp35s0f1"
       CPUs = 0x200
@@ -2441,7 +2439,7 @@
       }
     }
     +SDNReply = {
-      Class = SDNPublisher
+      Class = "SDN::SDNPublisher"
       Topic = "SCUJA2ECPC"
       Interface = "enp35s0f1"
       CPUs = 0x200
@@ -2612,7 +2610,7 @@
       }
     }
     +FastADC = {
-      Class = NI6368ADC
+      Class = "NI6368::NI6368ADC"
       SamplingFrequency = 1000000
       DeviceName = "/dev/pxie-6368"
       IsMultiplexed = 0
@@ -2741,7 +2739,7 @@
       }
     }
     +FastAnalogDAN = {
-      Class = DANSource
+      Class = "DAN::DANSource"
       NumberOfBuffers = 10
       CPUMask = 0x8
       StackSize = 10000000
@@ -2763,57 +2761,67 @@
         GY_APS_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_APS_V_MEAS"
         }
         GY_APS_I_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_APS_I_MEAS"
         }
         GY_BPS_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_BPS_V_MEAS"
         }
         GY_BPS_I_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_BPS_I_MEAS"
         }
         GY_MHV_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_MHV_V_MEAS"
         }
         GY_MHV_I_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_MHV_I_MEAS"
         }
         GY_ARC1_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_ARC1_V_MEAS"
         }
         GY_ARC2_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_ARC2_V_MEAS"
         }
         GY_ARC3_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_ARC3_V_MEAS"
         }
         GY_RF_V_MEAS = {
           Type = float32
           NumberOfElements = 1000
+          SamplingFrequency = 1000000
           NodeName = "EC-GN-P01:GY_RF_V_MEAS"
         }
       }
     }
     +AnalogEpicsOutput = {
-      Class = EPICSCAOutput
+      Class = "EPICSCA::EPICSCAOutput"
       CPUMask = 0x8
       StackSize = 10000000
       NumberOfBuffers = 2
@@ -2904,7 +2912,7 @@
       }
     }
     +DANDIODataSource = {
-      Class = DANSource
+      Class = "DAN::DANSource"
       NumberOfBuffers = 10
       CPUMask = 15
       StackSize = 10000000
@@ -3325,7 +3333,7 @@
         PLC_OP_SELECTED = {
           DataSource = DDB1
         }
-        CCPS_IN_OPERATION = {
+        PLC_CC_OP_SELECTED = {
           DataSource = DDB1
         }
         PLC_SYNCMODE = {
@@ -3439,15 +3447,12 @@
         }
         HVARMED = {
           DataSource = EPICSCAOutput
-          Type = uint32
         }
         HVINJECTION = {
           DataSource = EPICSCAOutput
-          Type = uint32
         }
         RFON = {
           DataSource = EPICSCAOutput
-          Type = uint32
         }
         MHVPS_REF = {
           DataSource = EPICSCAOutput
@@ -4042,8 +4047,8 @@
         }
         FHPS_RU = {
           DataSource = DDB1
-          Type = float32
           Comparator = "EQUALS"
+          Type = uint8
           Value = 1
         }
         GY_FHPS_MEAS_ACV = {
@@ -4063,9 +4068,8 @@
       Class = JAMessageGAM
       Operation = "AND"
       InputSignals = {
-        CCPS_IN_OPERATION = {
+        PLC_CC_OP_SELECTED = {
           DataSource = DDB1
-          Type = uint32
           Comparator = "EQUALS"
           Value = 1
         }
@@ -4306,6 +4310,7 @@
       Class = IOGAM
       InputSignals = {
         PXI6259_Status = {
+          DataSource = SynchThread
           Samples = 20
           Frequency = 1
         }
@@ -5182,7 +5187,7 @@
       }
     }
     +NI6528_0_ReaderGAM = {
-      Class = ExtractBitGAM
+      Class = "IOExt::ExtractBitGAM"
       InputSignals = {
         DI0 = {
           DataSource = NI6528_0_DIO
@@ -5268,7 +5273,7 @@
       }
     }
     +NI6528_0_WriterGAM = {
-      Class = CompactBitGAM
+      Class = "IOExt::CompactBitGAM"
       InputSignals = {
         APS_HVON = {
           DataSource = DDB3
@@ -6218,6 +6223,7 @@
         FHPS_REF_OUT = {
           Alias = FHPS_REF
           DataSource = NI6259_AO
+          Trigger = 1
         }
         FHPS_AUTO_STAT = {
           DataSource = WGAsyncBridge