diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
index 75ee724..97dadf9 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/epics.marte
@@ -10,7 +10,7 @@
     }
     CSV_LOAD = {
       PVName = (@rfid .. "-GAF:STAT-CSV-LOAD")
-      Type = int32
+      Type = uint32
     }
     CSV_NAME = {
       PVName = (@rfid .. "-GAF:STAT-CSV-NAME")
@@ -309,7 +309,7 @@
     }
     PREP_TIME_WF = {
       PVName = (@rfid .. "-GAF:STAT-PREP-TIME-WF")
-      Type = uint32
+      Type = int32
       NumberOfElements = 8000
       NumberOfDimensions = 1
     }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
index e55564f..e8bcb4e 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/data.marte
@@ -7,7 +7,7 @@
       Type = uint32
     }
     PREP_TIME_WF = {
-      Type = uint32
+      Type = int32
       NumberOfElements = 8000
       NumberOfDimensions = 1
     }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte
index ea6e8a0..8c8dba8 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/epics.marte
@@ -57,7 +57,6 @@
     }
     RFON = {
       DataSource = DDB1
-      Type = uint8
     }
     MHVPS_OUT = {
       DataSource = DDB1
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
index 55bee1e..5ad497b 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/preprogrammed_waveform.marte
@@ -7,9 +7,8 @@
   InputSignals = {
     CSV_LOAD = {
       DataSource = EPICSCAInput
-      Type = int32
-    }
-    Filename = {
+   }
+   Filename = {
       Alias = CSV_NAME
       DataSource = EPICSCAInput
     }
@@ -45,7 +44,6 @@
   InputSignals = {
     CSV_LOAD = {
       DataSource = EPICSCAInput
-      Type = int32
     }
     Filename = {
       Alias = CSV_NAME
@@ -58,7 +56,6 @@
     }
     RFON = {
       DataSource = DDB1
-      Type = uint8
     }
   }
   OutputSignals = {