diff --git a/documentation/services/facs.yml b/documentation/services/facs.yml
index 41fe92e..db69d44 100644
--- a/documentation/services/facs.yml
+++ b/documentation/services/facs.yml
@@ -240,7 +240,7 @@ facs-as-pu-conv:
   - TS-04:PU-InjSeptG-1:Kick
   - TS-04:PU-InjSeptG-2:Kick
 
-facs-as-ti_general:
+facs-as-ti_as-general:
   as-ti-trig:
   - AS-Fam:TI-BPM-MonitClk
   - AS-Fam:TI-Scrn-TBBO
@@ -250,19 +250,8 @@ facs-as-ti_general:
   - AS-Glob:TI-Osc-InjBO
   - AS-Glob:TI-Osc-InjSI
   - AS-Glob:TI-Osc-InjSI2
-  ba-ti-trig:
-  - BA-CAXB:TI-DVF
-  bo-ti-trig:
-  - BO-01D:TI-InjKckr
-  - BO-35D:TI-DCCT
-  - BO-48D:TI-EjeKckr
-  - BO-50U:TI-VLightCam
-  - BO-RaPSE05:TI-Osc
-  - BO-Glob:TI-LLRF-Gen
-  - BO-Glob:TI-LLRF-PsMtm
-  - BO-Glob:TI-LLRF-Rmp
-  - BO-Glob:TI-Mags-Fams
-  - BO-Glob:TI-TuneProc
+
+facs-as-ti_li-general:
   li-ti-trig:
   - LI-01:TI-EGun-MultBun
   - LI-01:TI-EGun-MultBunPre
@@ -281,6 +270,40 @@ facs-as-ti_general:
   - LI-Glob:TI-SSAmp-Kly1
   - LI-Glob:TI-SSAmp-Kly2
   - LI-Glob:TI-SSAmp-SHB
+
+facs-as-ti_tb-general:
+  tb-ti-trig:
+  - TB-04:TI-InjSept
+  - TB-Fam:TI-ICT-Digit
+  - TB-Fam:TI-ICT-Integ
+  - TB-Glob:TI-Mags
+
+facs-as-ti_bo-general:
+  bo-ti-trig:
+  - BO-01D:TI-InjKckr
+  - BO-35D:TI-DCCT
+  - BO-48D:TI-EjeKckr
+  - BO-50U:TI-VLightCam
+  - BO-RaPSE05:TI-Osc
+  - BO-Glob:TI-LLRF-Gen
+  - BO-Glob:TI-LLRF-PsMtm
+  - BO-Glob:TI-LLRF-Rmp
+  - BO-Glob:TI-Mags-Fams
+  - BO-Glob:TI-TuneProc
+
+facs-as-ti_ts-general:
+  ts-ti-trig:
+  - TS-01:TI-EjeSeptF
+  - TS-01:TI-EjeSeptG
+  - TS-04:TI-InjSeptF
+  - TS-04:TI-InjSeptG-1
+  - TS-04:TI-InjSeptG-2
+  - TS-Fam:TI-ICT-Digit
+  - TS-Fam:TI-ICT-Integ
+  - TS-Fam:TI-Scrn
+  - TS-Glob:TI-Mags
+
+facs-as-ti_si-general:
   si-ti-trig:
   - SI-01SA:TI-InjDpKckr
   - SI-01SA:TI-InjNLKckr
@@ -293,6 +316,7 @@ facs-as-ti_general:
   - SI-Fam:TI-BPM-PsMtm
   - SI-Fam:TI-BPM-OrbIntlk
   - SI-Fam:TI-FOFB
+  - SI-Fam:TI-OrbIntlkRedundancy
   - SI-Glob:TI-BbBProcH-Fid
   - SI-Glob:TI-BbBProcH-Trig1
   - SI-Glob:TI-BbBProcH-Trig2
@@ -308,21 +332,11 @@ facs-as-ti_general:
   - SI-Glob:TI-Mags-Bends
   - SI-Glob:TI-Mags-Quads
   - SI-Glob:TI-Mags-Sexts
-  tb-ti-trig:
-  - TB-04:TI-InjSept
-  - TB-Fam:TI-ICT-Digit
-  - TB-Fam:TI-ICT-Integ
-  - TB-Glob:TI-Mags
-  ts-ti-trig:
-  - TS-01:TI-EjeSeptF
-  - TS-01:TI-EjeSeptG
-  - TS-04:TI-InjSeptF
-  - TS-04:TI-InjSeptG-1
-  - TS-04:TI-InjSeptG-2
-  - TS-Fam:TI-ICT-Digit
-  - TS-Fam:TI-ICT-Integ
-  - TS-Fam:TI-Scrn
-  - TS-Glob:TI-Mags
+
+facs-as-ti_ba-general:
+  ba-ti-trig:
+  - BA-CAXB:TI-DVF
+  - BA-IMBA:TI-StrkCam
 
 facs-as-ti_bo-bpms-corrs:
   bo-ti-trig-bpms: