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 17f9cb3..2ef21bf 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
@@ -252,11 +252,11 @@
     }
     PCF_FLT = {
       PVName = (@rfid .. "-GPF:PCF4210-CTRP")
-      Type = uint32
+      Type = uint8
     }
     PXI_FLT = {
       PVName = (@rfid .. "-GPS:PLC4110-RV2")
-      Type = uint32
+      Type = uint8
     }
     HVARMED = {
       PVName = (@rfid .. "-GPF:PCF4210-YTS-GA1")
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 e8bcb4e..ca0aaa6 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
@@ -87,6 +87,12 @@
     FHPS_RU = {
       Type = uint8
     }
+    PXI_FAULT = {
+      Type = uint8
+    }
+    PCF_FAULT = {
+      Type = uint8
+    }    
   }
 }
 
@@ -110,7 +116,10 @@
       Type = float32
     }
     PXI_FAULT = {
-      Type = uint32
+      Type = uint8
+    }
+    PCF_FAULT = {
+      Type = uint8
     }
   }
 }
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 8c8dba8..160f5e6 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
@@ -20,6 +20,7 @@
       Type = uint32
       Value = 0
     }
+    
     BPS_OUT = {
       DataSource = DDB1
     }
@@ -107,11 +108,18 @@
     // MARTe Internal PCF_FLT 
     PCF_FAULT = {
       DataSource = DDB1
-      Type = uint32
+    }
+    PCF_FAULT_Sync = {
+      Alias = PCF_FAULT
+      DataSource = DDB1
     }
     PXI_FAULT = {
       DataSource = DDB1
     }
+    PXI_FAULT_Sync = {
+      Alias = PXI_FAULT
+      DataSource = DDB1
+    }
     BEAM_ON_STAT = {
       DataSource = DDB1
       Type = uint8
@@ -323,9 +331,17 @@
     PCF_FLT = {
       DataSource = EPICSCAOutput
     }
+    PCF_FAULT_Sync = {
+      Alias = PCF_FAULT
+      DataSource = Th1Bridge
+    }    
     PXI_FLT = {
       DataSource = EPICSCAOutput
     }
+    PXI_FAULT_Sync = {
+      Alias = PXI_FAULT
+      DataSource = Th1Bridge
+    }    
     BEAM_ON_STAT = {
       DataSource = EPICSCAOutput
     }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte
index c8f176e..cd3ec08 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread1/pxi_error_management.marte
@@ -35,7 +35,7 @@
   OutputSignals = {
     PXI_FAULT = {
       DataSource = DDB1
-      Type = uint32
+      Type = uint8
       DefaultValue = 0
       Value = 1
     }
diff --git a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
index 7f55cd9..a50fd22 100644
--- a/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
+++ b/EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/timers.marte
@@ -117,6 +117,12 @@
         DataSource = FastTimer
         Frequency = @fast_clock
       }
+      PCF_FAULT = {
+        DataSource = Th1Bridge
+      }         
+      PXI_FAULT = {
+        DataSource = Th1Bridge
+      }         
     }
     OutputSignals = {
       Time = {
@@ -125,6 +131,12 @@
       Counter = {
         DataSource = DDB3
       }
+      PCF_FAULT = {
+        DataSource = DDB3
+      }         
+      PXI_FAULT = {
+        DataSource = DDB3
+      }         
     }
   }
   +WGTimerGAM = {