From 5fbf84fef140bab394c7bddff7c2019a2cbf5a39 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Thu, 23 May 2024 17:37:13 +0000
Subject: [PATCH] Update fermi_lattice.json

---
 fermi_lattice.json | 532 +++++++++++++++++++++++++--------------------
 1 file changed, 293 insertions(+), 239 deletions(-)

diff --git a/fermi_lattice.json b/fermi_lattice.json
index 14fc50f..24d6d82 100644
--- a/fermi_lattice.json
+++ b/fermi_lattice.json
@@ -623,8 +623,10 @@
 					{"type": "correctorfermi", "position": 2472, "name": "CV_DBD.01"},
 					{"type": "quadrupolefermi", "position": 3208, "name": "Q_DBD.04"},
 					{"type": "blm", "position": 3208, "name": "BLM_Q_DBD.04"},
-					{"type": "vlv", "position": 4400, "name": "VLV_DBD.01"},
-					{"type": "quadrupolefermi", "position": 5706, "name": "Q_DBD.05"},
+					{"type": "sip", "position": 3900, "name": "SIP75_DBD.01","name2": "SIP75_DBD.02","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+     				{"type": "vlv", "position": 4400, "name": "VLV_DBD.01"},
+					{"type": "sip", "position": 5000, "name": "SIP150_DBD.01","offset2d": [30, -40], "labelReverse": [90, -470, 200]},
+     				{"type": "quadrupolefermi", "position": 5706, "name": "Q_DBD.05"},
 					{"type": "blm", "position": 5706, "name": "BLM_Q_DBD.05"},
 					{"type": "cm", "position": 6476, "name": "CM_DBD.01"},
 					{"type": "flsc", "position": 6872, "name": "MSCR_DBD.02"},
@@ -669,8 +671,9 @@
 					{"type": "quadrupolefermi", "position": 3114, "name": "Q_TLS.07"},
 					{"type": "bst", "position": 3414, "name": "BST_TLS.01"},
 					{"type": "sip", "position": 3714, "name": "SIP75_TLS.01","offset2d": [30, -40]},
-  					{"type": "vlv", "position": 4100, "name": "VLV_SCL.01"},
-					{"type": "quadrupolefermi", "position": 10100, "name": "Q_SCL.01", "labelReverse": [90, 1300, 250]}
+  					{"type": "vlv", "position": 6100, "name": "VLV_SCL.01"},
+					{"type": "sip", "position": 9700, "name": "SIP55_SCL.01","offset2d": [30, -40]},
+  					{"type": "quadrupolefermi", "position": 10100, "name": "Q_SCL.01", "labelReverse": [90, 1300, 250]}
 					
 				]
 			},
@@ -683,12 +686,14 @@
 					{"type": "correctorfermi", "position": 449, "ps": ["PSCH_SCL.01","PSCV_SCL.01"], "name": "CHV_SCL.01", "labelReverse": [90, 1550, 250]},
 					{"type": "quadrupolefermi", "position": 799, "name": "Q_SCL.02", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 799, "name": "BLM_Q_SCL.02"},
-					{"type": "quadrupolefermi", "position": 1749, "name": "Q_SCL.03", "labelReverse": [90, 1300, 250]},
+					{"type": "sip", "position": 1349, "name": "SIP300_SCL.01","offset2d": [30, -40], "labelReverse": [90, 1750, 200]},
+  					{"type": "quadrupolefermi", "position": 1749, "name": "Q_SCL.03", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 1749, "name": "BLM_Q_SCL.03"},
 					{"type": "bpm", "position": 2019, "name": "RTBPM_SCL.01", "labelReverse": [90, 1850, 250]},
 					{"type": "ECOL", "position": 2644, "name": "ECOL_SCL.01"},
 					{"type": "blm", "position": 2644, "name": "BLM_ECOL_SCL.01"},
-					{"type": "quadrupolefermi", "position": 2899, "name": "Q_SCL.04", "labelReverse": [90, 1300, 250]},
+					{"type": "sip", "position": 2399, "name": "SIP55_SCL.02","offset2d": [30, -40], "labelReverse": [90, 1650, 200]},
+  					{"type": "quadrupolefermi", "position": 2799, "name": "Q_SCL.04", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 2899, "name": "BLM_Q_SCL.04"},
 					{"type": "flsc", "position": 3119, "name": "MSCR_SCL.01", "labelReverse": [90, 1750, 250]},
 					{"type": "blm", "position": 3119, "name": "BLM_MSCR_SCL.01"},
@@ -709,6 +714,7 @@
 					{"type": "blm", "position": 800, "name": "BLM_Q_SCL.06", "labelReverse": [90, 1300, 250]},
 					{"type": "quadrupolefermi", "position": 1750, "name": "Q_SCL.07", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 1750, "name": "BLM_Q_SCL.07"},
+					{"type": "sip", "position": 2550, "name": "SIP55_SCL.03","offset2d": [30, -40], "labelReverse": [90, 1650, 200]},
 					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SCL.08", "labelReverse": [90, 1300, 250]},
 					{"type": "blm", "position": 3300, "name": "BLM_Q_SCL.08"},
 					{"type": "correctorfermi", "position": 3680, "ps": ["PSCH_SCL.03","PSCV_SCL.03"], "name": "CHV_SCL.03", "labelReverse": [90, 1550, 250]},
@@ -719,11 +725,14 @@
 					{"type": "SFEL01", "position": 4640, "name": "SFEL01"},
 					{"type": "quadrupolefermi", "position": 6015, "name": "Q_SFEL01.01", "labelReverse": [90, 1600, 250]},
 					{"type": "blm", "position": 6015, "name": "BLM_Q_SFEL01.01"},
+					{"type": "sip", "position": 8800, "name": "SIP55_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1850, 200]},
 					{"type": "vlv", "position": 9300, "name": "VLV_SFEL01.01", "labelReverse": [90, 1750, 150]},
+					{"type": "sip", "position": 9600, "name": "SIP55_SFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1850, 200]},
 					{"type": "correctorfermi", "position": 10015, "ps": ["PSCH_SFEL01.01","PSCV_SFEL01.01"], "name": "CHV_SFEL01.01", "labelReverse": [90, 1800, 250]},
 					{"type": "bpm", "position": 10290, "name": "RTBPM_SFEL01.01", "labelReverse": [90, 2100, 250]},
 					{"type": "quadrupolefermi", "position": 10815, "name": "Q_SFEL01.02", "labelReverse": [90, 1550, 250]},
 					{"type": "blm", "position": 10815, "name": "BLM_Q_SFEL01.02"},
+					{"type": "sip", "position": 11815, "name": "SIP300_SFEL01.01","offset2d": [30, -40], "labelReverse": [90, 1990, 200]},
 					{"type": "quadrupolefermi", "position": 12815, "name": "Q_SFEL01.03", "labelReverse": [90, 1600, 250]},
 					{"type": "blm", "position": 12815, "name": "BLM_Q_SFEL01.03"},
 					{"type": "plc", "position": 12815, "name": "SPIN-UH.02", "offset3d": [0, -300, 0], "offset2d": [0, 300], "labelReverse": [185,50,80]},
@@ -746,6 +755,7 @@
 					{"type": "blm", "position": 1787, "name": "BLM_Q_SFEL01.05"},
 					{"type": "bpm", "position": 2056, "name": "RTBPM_SFEL01.03", "labelReverse": [90, 2150, 250]},
 					{"type": "ECOL", "position": 2682, "name": "ECOL_SFEL01.01"},
+					{"type": "sip", "position": 2750, "name": "SIP55_SFEL01.04","offset2d": [30, -40], "labelReverse": [90, 2000, 200]},
 					{"type": "quadrupolefermi", "position": 3337, "name": "Q_SFEL01.06", "labelReverse": [90, 1600, 250]},
 					{"type": "flsc", "position": 3657, "name": "MSCR_SFEL01.01", "labelReverse": [90, 2000, 250]},
 					{"type": "quadrupolefermi", "position": 4052, "name": "Q_SFEL01.07", "labelReverse": [90, 1600, 250]},
@@ -759,6 +769,7 @@
 				"components": [
 					{"type": "plc", "position": 0, "name": "SPIN-UH.03", "offset3d": [0, -300, 0], "offset2d": [-200, 350], "labelReverse": [180,1500,80]},
 					{"type": "blm", "position": 100, "name": "BLM_B_SFEL01.02"},
+					{"type": "sip", "position": 420, "name": "SIP55_SFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1950, 200]},
 					{"type": "correctorfermi", "position": 800, "ps": ["PSCH_SFEL01.04","PSCV_SFEL01.04"], "name": "CHV_SFEL01.04", "labelReverse": [90, 1850, 250]},
 					{"type": "blm", "position": 800, "name": "BLM_CHV_SFEL01.04"},
 					{"type": "quadrupolefermi", "position": 1200, "name": "Q_SFEL01.08", "labelReverse": [90, 1600, 250]},
@@ -773,7 +784,8 @@
 					{"type": "blm", "position": 4050, "name": "BLM_Q_SFEL01.11"},
 					{"type": "bpm", "position": 4525, "name": "CBPM_SFEL01.01", "labelReverse": [90, 2050, 250]},
 					{"type": "cm", "position": 4750, "name": "CM_SFEL01.01", "labelReverse": [90, 1790, 250]},
-					{"type": "flsc", "position": 5000, "name": "MSCR_SFEL01.02", "labelReverse": [90, 2050, 250]},
+					{"type": "sip", "position": 5000, "name": "SIP150_SFEL01.01","name2": "SIP55_SFEL01.06","offset2d": [30, -40], "labelReverse": [90, 2080, 200]},
+					{"type": "flsc", "position": 5300, "name": "MSCR_SFEL01.02", "labelReverse": [90, 2050, 250]},
 					{"type": "BAM", "position": 5006, "name": "BAM_SFEL01.01"},
 					{"type": "bpm", "position": 5550, "name": "CBPM_SFEL01.02", "labelReverse": [90, 2050, 250]},
 					{"type": "EOS", "position": 6935, "name": "EOS_SFEL01.01"},
@@ -782,10 +794,11 @@
 					{"type": "SFEL01", "position": 8675, "name": "SFEL01"},
 					{"type": "UND", "position": 8675, "name": "UND_F01"},
 					{"type": "undulator", "position": 10285, "name": "ID_FEL01.01 (MOD01.01)", "labelReverse": [90, 2650, 250]},
-					{"type": "bpm", "position": 11819, "name": "CBPM_FEL01.01", "labelReverse": [90, 1950, 250]},
-					{"type": "quadrupolefermi", "position": 12050, "name": "Q_FEL01.01", "labelReverse": [90, 1500, 250]},
-					{"type": "correctorfermi", "position": 12350, "ps": ["PSCH_FEL01.01","PSCV_FEL01.01"], "name": "CHV_FEL01.01", "labelReverse": [90, 1780, 250]},
-					{"type": "flsc", "position": 12602, "name": "MSCR_FEL01.01", "labelReverse": [90, 1950, 250]}
+					{"type": "bpm", "position": 11719, "name": "CBPM_FEL01.01", "labelReverse": [90, 1950, 250]},
+					{"type": "quadrupolefermi", "position": 11950, "name": "Q_FEL01.01", "labelReverse": [90, 1500, 250]},
+					{"type": "sip", "position": 12250, "name": "SIP55_FEL01.01","offset2d": [30, -40], "labelReverse": [90, 1860, 150]},
+					{"type": "correctorfermi", "position": 12400, "ps": ["PSCH_FEL01.01","PSCV_FEL01.01"], "name": "CHV_FEL01.01", "labelReverse": [90, 1780, 250]},
+					{"type": "flsc", "position": 12602, "name": "MSCR_FEL01.01", "labelReverse": [90, 1950, 350]}
 				]
 			},
 			{
@@ -816,7 +829,8 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "bpm", "position": 424, "name": "CBPM_FEL01.02"},
-					{"type": "quadrupolefermi", "position": 835, "name": "Q_FEL01.02"},
+					{"type": "quadrupolefermi", "position": 685, "name": "Q_FEL01.02"},
+					{"type": "sip", "position": 995, "name": "SIP55_FEL01.02","offset2d": [30, -40], "labelReverse": [90, 1760, 200]},
 					{"type": "correctorfermi", "position": 1195, "ps": ["PSCH_FEL01.02","PSCV_FEL01.02"], "name": "CHV_FEL01.02"},
 					{"type": "flsc", "position": 1437, "name": "MSCR_FEL01.02"},
 					{"type": "blm", "position": 1437, "name": "BLM_MSCR_FEL01.02"},
@@ -825,12 +839,14 @@
 					{"type": "W", "position": 3455, "name": "W_FEL01.01"},
 					{"type": "bpm", "position": 3721, "name": "CBPM_IUFEL01.02"},
 					{"type": "quadrupolefermi", "position": 4431, "name": "Q_IUFEL01.02"},
+					{"type": "sip", "position": 4731, "name": "SIP55_IUFEL01.02","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
 					{"type": "correctorfermi", "position": 4991, "ps": ["PSCH_IUFEL01.02","PSCV_IUFEL01.02"], "name": "CHV_IUFEL01.02"},
 					{"type": "flsc", "position": 5523, "name": "MSCR_IUFEL01.02"},
 					{"type": "undulator", "position": 6340, "name": "ID_FEL01.04  (RAD01.03)"},
 					{"type": "PHSH", "position": 7688, "name": "PHSH_IUFEL01.03"},
 					{"type": "bpm", "position": 7936, "name": "CBPM_IUFEL01.03"},
 					{"type": "quadrupolefermi", "position": 8446, "name": "Q_IUFEL01.03"},
+					{"type": "sip", "position": 8806, "name": "SIP55_IUFEL01.03","name2": "SIP55_IUFEL01.04","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
 					{"type": "correctorfermi", "position": 9006, "ps": ["PSCH_IUFEL01.03","PSCV_IUFEL01.03"], "name": "CHV_IUFEL01.03"},
 					{"type": "flsc", "position": 9338, "name": "MSCR_IUFEL01.03"},
 					{"type": "undulator", "position": 10055, "name": "ID_FEL01.05  (RAD01.04)"},
@@ -844,47 +860,58 @@
 					{"type": "PHSH", "position": 15118, "name": "PHSH_IUFEL01.05"},
 					{"type": "bpm", "position": 15365, "name": "CBPM_IUFEL01.05"},
 					{"type": "quadrupolefermi", "position": 15851, "name": "Q_IUFEL01.05"},
+					{"type": "sip", "position": 16205, "name": "SIP55_IUFEL01.05","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
 					{"type": "correctorfermi", "position": 16405, "ps": ["PSCH_IUFEL01.05","PSCV_IUFEL01.05"], "name": "CHV_IUFEL01.05"},
 					{"type": "flsc", "position": 16768, "name": "MSCR_IUFEL01.05"},
 					{"type": "undulator", "position": 17484, "name": "ID_FEL01.07  (RAD01.06)"},
 					{"type": "PHSH", "position": 18832, "name": "PHSH_IUFEL01.06"},
 					{"type": "bpm", "position": 19080, "name": "CBPM_IUFEL01.06"},
-					{"type": "quadrupolefermi", "position": 19591, "name": "Q_IUFEL01.06"},
+					{"type": "quadrupolefermi", "position": 19491, "name": "Q_IUFEL01.06"},
+					{"type": "sip", "position": 19851, "name": "SIP55_IUFEL01.06","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
 					{"type": "correctorfermi", "position": 20060, "ps": ["PSCH_IUFEL01.06","PSCV_IUFEL01.06"], "name": "CHV_IUFEL01.06"},
 					{"type": "flsc", "position": 20383, "name": "MSCR_IUFEL01.06"},
 					{"type": "undulator", "position": 21189, "name": "ID_FEL01.08  (RAD01.07)"},
 					{"type": "PHSH", "position": 22547, "name": "PHSH_IUFEL01.07"},
 					{"type": "bpm", "position": 22795, "name": "CBPM_IUFEL01.07"},
 					{"type": "quadrupolefermi", "position": 23206, "name": "Q_IUFEL01.07"},
-					{"type": "correctorfermi", "position": 23665, "ps": ["PSCH_IUFEL01.07","PSCV_IUFEL01.07"], "name": "CHV_IUFEL01.07"},
+					{"type": "sip", "position": 23606, "name": "SIP55_IUFEL01.07","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
+					{"type": "correctorfermi", "position": 23865, "ps": ["PSCH_IUFEL01.07","PSCV_IUFEL01.07"], "name": "CHV_IUFEL01.07"},
 					{"type": "flsc", "position": 24198, "name": "MSCR_IUFEL01.07"},
 					{"type": "undulator", "position": 24904, "name": "ID_FEL01.09  (RAD01.08)"},
 					{"type": "blm", "position": 24904, "name": "BLM_ID_FEL01.09"},
 					{"type": "bpm", "position": 26532, "name": "CBPM_IUFEL01.08"},
 					{"type": "quadrupolefermi", "position": 27021, "name": "Q_IUFEL01.08"},
-					{"type": "correctorfermi", "position": 27490, "ps": ["PSCH_IUFEL01.08","PSCV_IUFEL01.08"], "name": "CHV_IUFEL01.08"},
+					{"type": "sip", "position": 27381, "name": "SIP55_IUFEL01.08","offset2d": [30, -40], "labelReverse": [90, 1960, 210]},
+					{"type": "correctorfermi", "position": 27590, "ps": ["PSCH_IUFEL01.08","PSCV_IUFEL01.08"], "name": "CHV_IUFEL01.08"},
 					{"type": "flsc", "position": 27899, "name": "MSCR_IUFEL01.08"},
 					{"type": "LINE", "position": 27949, "name": "LINE_IUFEL"},
 					{"type": "BD", "position": 27949, "name": "BD_MBD_FEL01"},
 					{"type": "vlv", "position": 28530, "name": "VLV_MBD_FEL01.01"},
 					{"type": "cm", "position": 28935, "name": "CM_MBD_FEL01.01"},
 					{"type": "correctorfermi", "position": 29335, "ps": ["PSCH_MBD_FEL01.01","PSCV_MBD_FEL01.01"], "name": "CHV_MBD_FEL01.01"},
-					{"type": "flsc", "position": 29800, "name": "MBSCR_FEL01.01"},
+					{"type": "sip", "position": 29700, "name": "SIP75_MBDFEL01.01","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+					{"type": "flsc", "position": 30000, "name": "MBSCR_MBD_FEL01.01"},
+					{"type": "sip", "position": 30400, "name": "SIP75_MBDFEL01.02","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
 					{"type": "quadrupolefermi", "position": 30728, "name": "Q_MBD_FEL01.01"},
 					{"type": "vlv", "position": 31530, "name": "FVLV_MBD_FEL01.01"},
 					{"type": "quadrupolefermi", "position": 32348, "name": "Q_MBD_FEL01.02"},
 					{"type": "correctorfermi", "position": 32965, "ps": ["PSCH_MBD_FEL01.02","PSCV_MBD_FEL01.02"], "name": "CHV_MBD_FEL01.02"},
+					{"type": "sip", "position": 33411, "name": "SIP75_MBDFEL01.02","name2": "SIP75_MBDFEL01.03","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
 					{"type": "bpm", "position": 33761, "name": "BPM_MBD_FEL01.01"},
 					{"type": "flsc", "position": 35803, "name": "MSCR_MBD_FEL01.01"},
+					{"type": "sip", "position": 36886, "name": "SIP55_MBDFEL01.05","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
 					{"type": "bpm", "position": 37886, "name": "BPM_MBD_FEL01.02"},
 					{"type": "correctorfermi", "position": 38466, "ps": ["PSCH_MBD_FEL01.03","PSCV_MBD_FEL01.03"], "name": "CHV_MBD_FEL01.03"},
 					{"type": "blm", "position": 38466, "name": "BLM_CHV_MBD_FEL01.03"},
 					{"type": "quadrupolefermi", "position": 39076, "name": "Q_MBD_FEL01.03"},
 					{"type": "blm", "position": 39076, "name": "BLM_Q_MBD_FEL01.03"},
+					{"type": "sip", "position": 39776, "name": "SIP55_MBDFEL01.06","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
 					{"type": "quadrupolefermi", "position": 40296, "name": "Q_MBD_FEL01.04"},
 					{"type": "blm", "position": 40296, "name": "BLM_Q_MBD_FEL01.04_L"},
 					{"type": "blm", "position": 40296, "name": "BLM_Q_MBD_FEL01.04_R"},
-					{"type": "plc", "position": 45296, "name": "SPIN-FE.01", "offset3d": [0, -300, 0], "offset2d": [0, -200]}
+					{"type": "sip", "position": 42396, "name": "SIP55_MBD_FEL01.06","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+     				{"type": "sip", "position": 45000, "name": "SIP55_MBDFEL01.07","offset2d": [30, -40], "labelReverse": [90, 2200, 210]},
+     				{"type": "plc", "position": 45296, "name": "SPIN-FE.01", "offset3d": [0, -300, 0], "offset2d": [0, -200]}
 				]
 			},
 			{
@@ -917,15 +944,17 @@
 				"components": [
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD.01_L"},
 					{"type": "blm", "position": 100, "name": "BLM_B_MBD.01_R"},
-					{"type": "bpm", "position": 1543, "name": "RTBPM_MBD.02"},
+					{"type": "sip", "position": 500, "name": "SIP55_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
+     				{"type": "bpm", "position": 1543, "name": "RTBPM_MBD.02"},
 					{"type": "blm", "position": 1543, "name": "BLM_BPM_MBD.02_DN"},
 					{"type": "blm", "position": 1543, "name": "BLM_BPM_MBD.02_UP"},
 					{"type": "correctorfermi", "position": 1822, "ps": ["PSCH_MBD.02","PSCV_MBD.02"], "name": "CHV_MBD.02"},
-					{"type": "quadrupolefermi", "position": 2289, "name": "Q_MBD.02"},
-					{"type": "blm", "position": 2289, "name": "BLM_Q_MBD.02_L"},
-					{"type": "blm", "position": 2289, "name": "BLM_Q_MBD.02_R"},
-					{"type": "vlv", "position": 2800, "name": "VLV_MBD.01"},
-					{"type": "quadrupolefermi", "position": 3191, "name": "Q_MBD.03"},
+					{"type": "quadrupolefermi", "position": 2189, "name": "Q_MBD.02"},
+					{"type": "blm", "position": 2189, "name": "BLM_Q_MBD.02_L"},
+					{"type": "blm", "position": 2189, "name": "BLM_Q_MBD.02_R"},
+					{"type": "vlv", "position": 2600, "name": "VLV_MBD.01"},
+					{"type": "sip", "position": 2970, "name": "SIP150_MBD.01","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
+     				{"type": "quadrupolefermi", "position": 3191, "name": "Q_MBD.03"},
 					{"type": "plc", "position": 3191, "name": "SPIN-UH.06", "offset3d": [0, -300, 0], "offset2d": [-200, 350], "labelReverse": true},
 					{"type": "blm", "position": 3191, "name": "BLM_Q_MBD.03_L"},
 					{"type": "blm", "position": 3191, "name": "BLM_Q_MBD.03_R"},
@@ -933,10 +962,11 @@
 					{"type": "correctorfermi", "position": 3793, "ps": ["PSCH_MBD.03","PSCV_MBD.03"], "name": "CHV_MBD.03"},
 					{"type": "blm", "position": 3793, "name": "BLM_CHV_MBD.03_L"},
 					{"type": "blm", "position": 3793, "name": "BLM_CHV_MBD.03_R"},
-					{"type": "cm", "position": 4245, "name": "CM_MBD.01"},
-					{"type": "SC", "position": 4391, "name": "SC_THZ_MBD.01"},
-					{"type": "blm", "position": 4391, "name": "BLM_SC_THZ_MBD.01_L"},
-					{"type": "blm", "position": 4391, "name": "BLM_SC_THZ_MBD.01_R"},
+					{"type": "sip", "position": 4245, "name": "SIP150_MBD.02","offset2d": [30, -40], "labelReverse": [90, 1650, 210]},
+     				{"type": "cm", "position": 4445, "name": "CM_MBD.01"},
+					{"type": "SC", "position": 4591, "name": "SC_THZ_MBD.01"},
+					{"type": "blm", "position": 4591, "name": "BLM_SC_THZ_MBD.01_L"},
+					{"type": "blm", "position": 4591, "name": "BLM_SC_THZ_MBD.01_R"},
 					{"type": "flsc", "position": 5588, "name": "MSCR_MBD.01"},
 					{"type": "blm", "position": 5588, "name": "BLM_MSCR_MBD.01_L"},
 					{"type": "blm", "position": 5588, "name": "BLM_MSCR_MBD.01_R"},
@@ -981,6 +1011,7 @@
 					{"type": "blm", "position": 1750, "name": "BLM_Q_SFEL02.02", "labelReverse": true},
 					{"type": "bpm", "position": 2019, "name": "RTBPM_SFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "ECOL", "position": 2645, "name": "ECOL_SFEL02.01", "labelReverse": true},
+					{"type": "sip", "position": 2645, "name": "SIP300_SFEL02.01","name2": "SIP55_SFEL02.01","offset2d": [30, -40], "labelReverse": [90, -250, 250]},
 					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.03", "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 3300, "name": "BLM_Q_SFEL02.03", "labelReverse": true},
 					{"type": "flsc", "position": 3620, "name": "MSCR_SFEL02.01", "labelReverse": [90, -450, 250]},
@@ -998,18 +1029,21 @@
 					{"type": "quadrupolefermi", "position": 800, "name": "Q_SFEL02.05", "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 800, "name": "BLM_Q_SFEL02.05", "labelReverse": [90, -250, 250]},
 					{"type": "correctorfermi", "position": 1200, "ps": ["PSCH_SFEL02.01","PSCV_SFEL02.01"], "name": "CHV_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "vlv", "position": 1480, "name": "VLV_SFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 1850, "name": "Q_SFEL02.06", "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 1850, "name": "BLM_Q_SFEL02.06", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 2275, "ps": ["PSCH_SFEL02.02","PSCV_SFEL02.02"], "name": "CHV_SFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 3000, "name": "Q_SFEL02.07", "labelReverse": [90, -250, 250]},
-					{"type": "blm", "position": 3000, "name": "BLM_Q_SFEL02.07", "labelReverse": [90, -250, 250]},
+					{"type": "vlv", "position": 1480, "name": "VLV_SFEL02.01", "labelReverse": [90, -250, 200]},
+					{"type": "sip", "position": 1780, "name": "SIP55_SFEL02.02","offset2d": [30, -40], "labelReverse": [90, -310, 200]},
+					{"type": "quadrupolefermi", "position": 2150, "name": "Q_SFEL02.06", "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 2150, "name": "BLM_Q_SFEL02.06", "labelReverse": [90, -250, 250]},
+					{"type": "correctorfermi", "position": 2675, "ps": ["PSCH_SFEL02.02","PSCV_SFEL02.02"], "name": "CHV_SFEL02.02", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 3000, "name": "SIP55_SFEL02.03","offset2d": [30, -40], "labelReverse": [90, -310, 200]},
+					{"type": "quadrupolefermi", "position": 3300, "name": "Q_SFEL02.07", "labelReverse": [90, -250, 250]},
+					{"type": "blm", "position": 3300, "name": "BLM_Q_SFEL02.07", "labelReverse": [90, -250, 250]},
 					{"type": "correctorfermi", "position": 3650, "ps": ["PSCH_SFEL02.03","PSCV_SFEL02.03"], "name": "CHV_SFEL02.03", "labelReverse": [90, -250, 250]},
 					{"type": "quadrupolefermi", "position": 4050, "name": "Q_SFEL02.08", "labelReverse": [90, -250, 250]},
 					{"type": "blm", "position": 4050, "name": "BLM_Q_SFEL02.08", "labelReverse": [90, -250, 250]},
 					{"type": "correctorfermi", "position": 4400, "ps": ["PSCH_SFEL02.04","PSCV_SFEL02.04"], "name": "CHV_SFEL02.04", "labelReverse": [90, -250, 250]},
 					{"type": "bpm", "position": 4629, "name": "CBPM_SFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "cm", "position": 4935, "name": "CM_SFEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 5250, "name": "SIP150_SFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "BAM", "position": 5300, "name": "BAM_SFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "bpm", "position": 5500, "name": "CBPM_SFEL02.02", "labelReverse": [90, -250, 250]},
 					{"type": "flsc", "position": 5921, "name": "MSCR_SFEL02.02", "labelReverse": [90, -550, 250]},
@@ -1021,20 +1055,24 @@
 					{"type": "UND", "position": 8675, "name": "UND_F02", "labelReverse": [90, -250, 250]},
 					{"type": "undulator", "position": 10285, "name": "ID_FEL02.01  (MOD02.01)", "labelReverse": [90, -250, 250]},
 					{"type": "W", "position": 12443, "name": "W_FEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 11808, "name": "SIP55_FEL02.01","name2": "SIP55_FEL02.02","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "bpm", "position": 12068, "name": "CBPM_FEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "quadrupolefermi", "position": 12579, "name": "Q_FEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 13048, "ps": ["PSCH_FEL02.01","PSCV_FEL02.01"], "name": "CHV_FEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 12979, "name": "SIP55_FEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 13200, "ps": ["PSCH_FEL02.01","PSCV_FEL02.01"], "name": "CHV_FEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "flsc", "position": 13556, "name": "MSCR_FEL02.01", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 15103, "name": "ID_FEL02.02  (RAD02.01)", "labelReverse": [90, -250, 250]},
 					{"type": "PHSH", "position": 16454, "name": "PHSH_IUFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "bpm", "position": 16708, "name": "CBPM_IUFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "quadrupolefermi", "position": 17219, "name": "Q_IUFEL02.01", "labelReverse": [90, -250, 250]},
-					{"type": "correctorfermi", "position": 17688, "ps": ["PSCH_IUFEL02.01","PSCV_IUFEL02.01"], "name": "CHV_IUFEL02.01", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 17559, "name": "SIP55_IUFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 17788, "ps": ["PSCH_IUFEL02.01","PSCV_IUFEL02.01"], "name": "CHV_IUFEL02.01", "labelReverse": [90, -250, 250]},
 					{"type": "flsc", "position": 18096, "name": "MSCR_IUFEL02.01", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 18818, "name": "ID_FEL02.03  (RAD02.02)", "labelReverse": [90, -250, 250]},
 					{"type": "PHSH", "position": 20169, "name": "PHSH_IUFEL02.02", "labelReverse": [90, -250, 250]},
 					{"type": "bpm", "position": 20423, "name": "CBPM_IUFEL02.02", "labelReverse": [90, -250, 250]},
-					{"type": "quadrupolefermi", "position": 20934, "name": "Q_IUFEL02.02", "labelReverse": [90, -250, 250]},
+					{"type": "quadrupolefermi", "position": 20834, "name": "Q_IUFEL02.02", "labelReverse": [90, -250, 250]},
+					{"type": "sip", "position": 21193, "name": "SIP55_IUFEL02.02","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "correctorfermi", "position": 21393, "ps": ["PSCH_IUFEL02.02","PSCV_IUFEL02.02"], "name": "CHV_IUFEL02.02", "labelReverse": [90, -250, 250]},
 					{"type": "flsc", "position": 21711, "name": "MSCR_IUFEL02.02", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 22533, "name": "ID_FEL02.04  (RAD02.03)", "labelReverse": [90, -250, 250]},
@@ -1070,60 +1108,70 @@
 				"chamber": {"type": "chamber"},
 				"components": [
 					{"type": "bpm", "position": 356, "name": "CBPM_FEL02.03", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 866, "name": "Q_FEL02.03", "labelReverse": true},
-					{"type": "correctorfermi", "position": 1266, "ps": ["PSCH_FEL02.03","PSCV_FEL02.03"], "name": "CHV_FEL02.03", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 766, "name": "Q_FEL02.03", "labelReverse": true},
+					{"type": "sip", "position": 1066, "name": "SIP55_FEL02.03","name2": "SIP55_FEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 1366, "ps": ["PSCH_FEL02.03","PSCV_FEL02.03"], "name": "CHV_FEL02.03", "labelReverse": true},
 					{"type": "flsc", "position": 1643, "name": "MSCR_FEL02.02", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 2472, "name": "ID_FEL02.05  (MOD02.02)", "labelReverse": true},
 					{"type": "W", "position": 4248, "name": "W_FEL02.02", "labelReverse": true},
-					{"type": "vlv", "position": 4600, "name": "VLV_FEL02.01", "labelReverse": true},
+					{"type": "vlv", "position": 4400, "name": "VLV_FEL02.01", "labelReverse": true},
+					{"type": "sip", "position": 4600, "name": "SIP55_FEL02.05","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "bpm", "position": 4873, "name": "CBPM_FEL02.04", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 5284, "name": "Q_FEL02.04", "labelReverse": true},
-					{"type": "correctorfermi", "position": 5693, "ps": ["PSCH_FEL02.04","PSCV_FEL02.04"], "name": "CHV_FEL02.04", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 5184, "name": "Q_FEL02.04", "labelReverse": true},
+					{"type": "sip", "position": 5504, "name": "SIP55_FEL02.06","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 5793, "ps": ["PSCH_FEL02.04","PSCV_FEL02.04"], "name": "CHV_FEL02.04", "labelReverse": true},
 					{"type": "flsc", "position": 6061, "name": "MSCR_FEL02.03", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 6886, "name": "ID_FEL02.06  (RAD02.04)", "labelReverse": true},
 					{"type": "PHSH", "position": 8251, "name": "PHSH_IUFEL02.03", "labelReverse": true},
 					{"type": "bpm", "position": 8492, "name": "CBPM_IUFEL02.03", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 8902, "name": "Q_IUFEL02.03", "labelReverse": true},
-					{"type": "correctorfermi", "position": 9362, "ps": ["PSCH_IUFEL02.03","PSCV_IUFEL02.03"], "name": "CHV_IUFEL02.03", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 8802, "name": "Q_IUFEL02.03", "labelReverse": true},
+					{"type": "sip", "position": 9162, "name": "SIP55_IUFEL02.03","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 9462, "ps": ["PSCH_IUFEL02.03","PSCV_IUFEL02.03"], "name": "CHV_IUFEL02.03", "labelReverse": true},
 					{"type": "flsc", "position": 9780, "name": "MSCR_IUFEL02.03", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 10602, "name": "ID_FEL02.07  (RAD02.05)", "labelReverse": true},
 					{"type": "blm", "position": 10602, "name": "BLM_ID_FEL02.07", "labelReverse": true},
 					{"type": "PHSH", "position": 11966, "name": "PHSH_IUFEL02.04", "labelReverse": true},
 					{"type": "bpm", "position": 12207, "name": "CBPM_IUFEL02.04", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 12718, "name": "Q_IUFEL02.04", "labelReverse": true},
-					{"type": "correctorfermi", "position": 13177, "ps": ["PSCH_IUFEL02.04","PSCV_IUFEL02.04"], "name": "CHV_IUFEL02.04", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 12618, "name": "Q_IUFEL02.04", "labelReverse": true},
+					{"type": "sip", "position": 12977, "name": "SIP55_IUFEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 13277, "ps": ["PSCH_IUFEL02.04","PSCV_IUFEL02.04"], "name": "CHV_IUFEL02.04", "labelReverse": true},
 					{"type": "flsc", "position": 13596, "name": "MSCR_IUFEL02.04", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 14317, "name": "ID_FEL02.08  (RAD02.06)", "labelReverse": true},
 					{"type": "PHSH", "position": 15681, "name": "PHSH_IUFEL02.05", "labelReverse": true},
 					{"type": "bpm", "position": 15922, "name": "CBPM_IUFEL02.05", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 16433, "name": "Q_IUFEL02.05", "labelReverse": true},
-					{"type": "correctorfermi", "position": 16842, "ps": ["PSCH_IUFEL02.05","PSCV_IUFEL02.05"], "name": "CHV_IUFEL02.05", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 16333, "name": "Q_IUFEL02.05", "labelReverse": true},
+					{"type": "sip", "position": 16633, "name": "SIP55_IUFEL02.05","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 16942, "ps": ["PSCH_IUFEL02.05","PSCV_IUFEL02.05"], "name": "CHV_IUFEL02.05", "labelReverse": true},
 					{"type": "flsc", "position": 17211, "name": "MSCR_IUFEL02.05", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 18032, "name": "ID_FEL02.09  (RAD02.07)", "labelReverse": true},
 					{"type": "PHSH", "position": 19396, "name": "PHSH_IUFEL02.06", "labelReverse": true},
 					{"type": "bpm", "position": 19637, "name": "CBPM_IUFEL02.06", "labelReverse": true},
 					{"type": "quadrupolefermi", "position": 19948, "name": "Q_IUFEL02.06", "labelReverse": true},
 					{"type": "correctorfermi", "position": 20259, "ps": ["PSCH_IUFEL02.06","PSCV_IUFEL02.06"], "name": "CHV_IUFEL02.06", "labelReverse": true},
-					{"type": "vlv", "position": 20700, "name": "VLV_IUFEL02.01", "labelReverse": true},
+					{"type": "vlv", "position": 20550, "name": "VLV_IUFEL02.01", "labelReverse": true},
+					{"type": "sip", "position": 20730, "name": "SIP55_IUFEL02.06","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "flsc", "position": 20926, "name": "MSCR_IUFEL02.06", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 21747, "name": "ID_FEL02.10  (RAD02.08)", "labelReverse": true},
 					{"type": "PHSH", "position": 23111, "name": "PHSH_IUFEL02.07", "labelReverse": true},
 					{"type": "bpm", "position": 23352, "name": "CBPM_IUFEL02.07", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 23863, "name": "Q_IUFEL02.07", "labelReverse": true},
-					{"type": "correctorfermi", "position": 24292, "ps": ["PSCH_IUFEL02.07","PSCV_IUFEL02.07"], "name": "CHV_IUFEL02.07", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 23763, "name": "Q_IUFEL02.07", "labelReverse": true},
+					{"type": "sip", "position": 24092, "name": "SIP55_IUFEL02.07","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 24392, "ps": ["PSCH_IUFEL02.07","PSCV_IUFEL02.07"], "name": "CHV_IUFEL02.07", "labelReverse": true},
 					{"type": "flsc", "position": 24641, "name": "MSCR_IUFEL02.07", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 25462, "name": "ID_FEL02.11  (RAD02.09)", "labelReverse": true},
 					{"type": "blm", "position": 25462, "name": "BLM_ID_FEL02.11", "labelReverse": true},
 					{"type": "PHSH", "position": 26829, "name": "PHSH_IUFEL02.08", "labelReverse": true},
 					{"type": "bpm", "position": 27067, "name": "CBPM_IUFEL02.08", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 27578, "name": "Q_IUFEL02.08", "labelReverse": true},
-					{"type": "correctorfermi", "position": 28037, "ps": ["PSCH_IUFEL02.08","PSCV_IUFEL02.08"], "name": "CHV_IUFEL02.08", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 27478, "name": "Q_IUFEL02.08", "labelReverse": true},
+					{"type": "sip", "position": 27778, "name": "SIP55_IUFEL02.08","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 28137, "ps": ["PSCH_IUFEL02.08","PSCV_IUFEL02.08"], "name": "CHV_IUFEL02.08", "labelReverse": true},
 					{"type": "flsc", "position": 28356, "name": "MSCR_IUFEL02.08", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 29177, "name": "ID_FEL02.12  (RAD02.10)", "labelReverse": true},
 					{"type": "PHSH", "position": 30491, "name": "PHSH_IUFEL02.09", "labelReverse": true},
 					{"type": "bpm", "position": 30681, "name": "RTBPM_IUFEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 31193, "name": "Q_IUFEL02.09", "labelReverse": true},
-					{"type": "correctorfermi", "position": 31663, "ps": ["PSCH_IUFEL02.09","PSCV_IUFEL02.09"], "name": "CHV_IUFEL02.09", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 31093, "name": "Q_IUFEL02.09", "labelReverse": true},
+					{"type": "sip", "position": 31493, "name": "SIP55_IUFEL02.09","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "correctorfermi", "position": 31763, "ps": ["PSCH_IUFEL02.09","PSCV_IUFEL02.09"], "name": "CHV_IUFEL02.09", "labelReverse": true},
 					{"type": "flsc", "position": 32024, "name": "MSCR_IUFEL02.09", "labelReverse": [90, -450, 250]},
 					{"type": "undulator", "position": 32931, "name": "ID_FEL02.13  (RAD02.11)", "labelReverse": true},
 					{"type": "bpm", "position": 34507, "name": "CBPM_IUFEL02.10", "labelReverse": true},
@@ -1133,26 +1181,31 @@
 					{"type": "FEL02", "position": 35579, "name": "FEL02", "labelReverse": true},
 					{"type": "MBD", "position": 35579, "name": "MBD_FEL02", "labelReverse": true},
 					{"type": "cm", "position": 35629, "name": "CM_MBD_FEL02.01", "labelReverse": true},
-					{"type": "vlv", "position": 36000, "name": "VLV_MBD_FEL02.01", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 36359, "name": "Q_MBD_FEL02.01", "labelReverse": true},
+					{"type": "vlv", "position": 35900, "name": "VLV_MBD_FEL02.01", "labelReverse": true},
+					{"type": "sip", "position": 36150, "name": "SIP55_MBDFEL02.01","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "quadrupolefermi", "position": 36459, "name": "Q_MBD_FEL02.01", "labelReverse": true},
 					{"type": "blm", "position": 36259, "name": "BLM_Q_MBD_FEL02.01", "labelReverse": true},
 					{"type": "vlv", "position": 36850, "name": "FVLV_MBD_FEL02.01", "labelReverse": true},
 					{"type": "quadrupolefermi", "position": 37244, "name": "Q_MBD_FEL02.02", "labelReverse": true},
 					{"type": "blm", "position": 37244, "name": "BLM_Q_MBD_FEL02.02", "labelReverse": true},
 					{"type": "FBMSCR", "position": 37348, "name": "FBMSCR_FEL02.01", "labelReverse": true},
 					{"type": "correctorfermi", "position": 37658, "ps": ["PSCH_MBD_FEL02.01","PSCV_MBD_FEL02.01"], "name": "CHV_MBD_FEL02.01", "labelReverse": true},
-					{"type": "bpm", "position": 37983, "name": "RTBPM_MBD_FEL02.01", "labelReverse": true},
+					{"type": "sip", "position": 37958, "name": "SIP55_MBDFEL02.02","name2": "SIP55_MBDFEL02.03","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
+					{"type": "bpm", "position": 38303, "name": "RTBPM_MBD_FEL02.01", "labelReverse": true},
 					{"type": "flsc", "position": 40033, "name": "MBSCR_MBD_FEL02.01", "labelReverse": [90, -450, 250]},
 					{"type": "flsc", "position": 40633, "name": "MSCR_MBD_FEL02.01", "labelReverse": [90, -450, 250]},
 					{"type": "bpm", "position": 42039, "name": "RTBPM_MBD_FEL02.02", "labelReverse": true},
 					{"type": "correctorfermi", "position": 42808, "ps": ["PSCH_MBD_FEL02.02","PSCV_MBD_FEL02.02"], "name": "CHV_MBD_FEL02.02", "labelReverse": true},
 					{"type": "blm", "position": 42808, "name": "BLM_CHV_MBD_FEL02.02", "labelReverse": true},
-					{"type": "quadrupolefermi", "position": 43408, "name": "Q_MBD_FEL02.03", "labelReverse": true},
-					{"type": "blm", "position": 43408, "name": "BLM_Q_MBD_FEL02.03", "labelReverse": true},
-					{"type": "vlv", "position": 43799, "name": "VLV_MBD_FEL02.02", "labelReverse": true},
+					{"type": "quadrupolefermi", "position": 43108, "name": "Q_MBD_FEL02.03", "labelReverse": true},
+					{"type": "blm", "position": 43108, "name": "BLM_Q_MBD_FEL02.03", "labelReverse": true},
+					{"type": "vlv", "position": 43499, "name": "VLV_MBD_FEL02.02", "labelReverse": true},
+					{"type": "sip", "position": 43799, "name": "SIP55_MBDFEL02.04","offset2d": [30, -40], "labelReverse": [90, -290, 200]},
 					{"type": "quadrupolefermi", "position": 44128, "name": "Q_MBD_FEL02.04", "labelReverse": true},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_L", "labelReverse": true},
 					{"type": "blm", "position": 44128, "name": "BLM_Q_MBD_FEL02.04_R", "labelReverse": true},
+					{"type": "sip", "position": 45228, "name": "SIP55_MBDFEL02.05","offset2d": [30, 0], "labelReverse": [90, -290, 200]},
+					
 					{"type": "plc", "position": 47915, "name": "SPIN-FEUH.02", "offset3d": [0, -700, 0], "offset2d": [0, -200], "labelReverse": [180, 1800, 50]}
 				]
 			},
@@ -1531,24 +1584,24 @@
 			{
 				"start": {"x": -185400, "y": 4000, "z": -8811},
 				"components": [
-					{"type": "fug", "position": 0, "name": "HVPS_KGSP.01", "devices":["FUG_KS"]},
-					{"type": "rar2", "position": 1400, "name": "RAR2_KGSP.01", "devices":["EC-MOD-KGSP-01","PSFOC_KS"]},
-					{"type": "rar1", "position": 2200, "name": "RAR1_KGSP.01", "devices":["PST_KS","PSK_KS"]},
+					{"type": "fug", "position": 0, "name": "HVPS_KGSP.01", "embedded":["FUG_KS"]},
+					{"type": "rar2", "position": 1400, "name": "RAR2_KGSP.01", "embedded":["EC-MOD-KGSP-01","PSFOC_KS"]},
+					{"type": "rar1", "position": 2200, "name": "RAR1_KGSP.01", "embedded":["PST_KS","PSK_KS"]},
 					{"type": "camod", "position": 3000, "name": "CAMOD_KGSP.01"},
-					{"type": "klystron", "position": 4500, "name": "TKLY_KGSP.01", "devices":["KS"]},
+					{"type": "klystron", "position": 4500, "name": "TKLY_KGSP.01", "embedded":["KS"]},
 					{"type": "rllrf", "position": 5600, "name": "RLLRF_KGSP.01"},
 
-					{"type": "fug", "position": 6700, "name": "HVPS_KG01.01", "devices":["FUG_K01"]},
-					{"type": "rar2", "position": 8100, "name": "RAR2_KG01.01", "devices": ["EC-MOD-KG01-01","PSFOC_K01","SPMO_KG01.01"]},
-					{"type": "rar1", "position": 8900, "name": "RAR1_KG01.01", "devices":["PST_K01","PSK_K01"]},
+					{"type": "fug", "position": 6700, "name": "HVPS_KG01.01", "embedded":["FUG_K01"]},
+					{"type": "rar2", "position": 8100, "name": "RAR2_KG01.01", "embedded": ["EC-MOD-KG01-01","PSFOC_K01","SPMO_KG01.01"]},
+					{"type": "rar1", "position": 8900, "name": "RAR1_KG01.01", "embedded":["PST_K01","PSK_K01"]},
 					{"type": "camod", "position": 9750, "name": "CAMOD_KG01.01"},
-					{"type": "klystron", "position": 11250, "name": "TKLY_KG01.01", "devices":["K01"]},
+					{"type": "klystron", "position": 11250, "name": "TKLY_KG01.01", "embedded":["K01"]},
 					{"type": "rllrf", "position": 12350, "name": "RLLRF_KG01.01"},
 
-					{"type": "rps", "position": 12950, "name": "RPS_KG01.01", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rps", "position": 12950, "name": "RPS_KG01.01", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSCSOL_INJ.01",  "PSTRMCQ_SPINJ.01","PSTRMCQ_SPINJ.02","PSCV_INJ.01","PSCH_INJ.01","PSCV_INJ.02","PSCH_INJ.02","PSQ_SPINJ.01","PSB_SPINJ.01","PSSOL_INJ.01","PSSOL_INJ.02","PSSOL_INJ.03","PSSOL_INJ.04","SW-PS-KG01.01"
 					]},
-					{"type": "rv", "position": 13550, "name": "RG_KG01.01", "devices":[
+					{"type": "rv", "position": 13550, "name": "RG_KG01.01", "embedded":[
 						"PSSIP_CTF.01","PSSIP_CTF.03","PSSIP_CTF.04",
 						"PSSIP_CTF.02","PSSIP_CTF.05","PSSIP_CTF.06",
 						"PSSIP_CTF.03","PSSIP_CTF.01","PSSIP_CTF.02","PSSIP_CTF.07","PSSIP_CTF.08",
@@ -1559,8 +1612,8 @@
 						"TPG_CTF.02","VGPE_CTF.03","VGPI_CTF.03","VGPE_CTF.04",
 						"IMG_CTF.01","VGBA_CTF.01","VGPR_CTF.01"
 					]},
-					{"type": "rc", "position": 14350, "name": "RC_KG01.01", "devices":["PLC MASTER_IN_KG01.01","PLC MASTER_MOD_KG01.01", "CMM-PS-KG01-01"]},
-					{"type": "rv", "position": 14950, "name": "RV_KG01.01", "devices":[
+					{"type": "rc", "position": 14350, "name": "RC_KG01.01", "embedded":["PLC MASTER_IN_KG01.01","PLC MASTER_MOD_KG01.01", "CMM-PS-KG01-01"]},
+					{"type": "rv", "position": 14950, "name": "RV_KG01.01", "embedded":[
 						"PSSIP_KG01.01","GIP500_INJ.01","PSSIP75_SPINJ.01",
 						"PSSIP_KG01.02","PSSIP55_INJ.01","PSSIP75_INJ.01",
 						"PSSIP_KG01.03","PSSIP150_INJ.01","PSSIP75_INJ.02",
@@ -1571,28 +1624,28 @@
 					]},
 
 					{"type": "rllrf", "position": 16400, "name": "RLLRF_KG02.01"},
-					{"type": "klystron", "position": 17200, "name": "TKLY_KG02.01", "devices":["K02"]},
+					{"type": "klystron", "position": 17200, "name": "TKLY_KG02.01", "embedded":["K02"]},
 					{"type": "camod", "position": 18300, "name": "CAMOD_KG02.01"},
-					{"type": "rar1", "position": 19800, "name": "RAR1_KG02.01", "devices":["PSK_K02","PST_K02"]},
-					{"type": "rar2", "position": 20600, "name": "RAR2_KG02.01", "devices":["EC-MOD-KG02-01","PSFOC_K02","SPMO_KG02.01"]},
-					{"type": "fug", "position": 21300, "name": "HVPS_KG02.01", "devices":["FUG_K02"]},
+					{"type": "rar1", "position": 19800, "name": "RAR1_KG02.01", "embedded":["PSK_K02","PST_K02"]},
+					{"type": "rar2", "position": 20600, "name": "RAR2_KG02.01", "embedded":["EC-MOD-KG02-01","PSFOC_K02","SPMO_KG02.01"]},
+					{"type": "fug", "position": 21300, "name": "HVPS_KG02.01", "embedded":["FUG_K02"]},
 
 					{"type": "rd", "position": 23500, "name": "RD_KG02.02"},
-					{"type": "rd", "position": 24100, "name": "RD_KG02.01", "devices":[
+					{"type": "rd", "position": 24100, "name": "RD_KG02.01", "embedded":[
 						"EC-BPM-KG02-01","LIBERA_BPM_SPINJ.01","LIBERA_BPM_INJ.01","LIBERA_BPM_L0.01","LIBERA_BPM_LH.01","LIBERA_BPM_LH.02","LIBERA_BPM_LH.03_A","LIBERA_BPM_LH.03_B","LIBERA_BPM_LH.04","LIBERA_BPM_SPLH.01","LIBERA_BPM_LH.05","LIBERA_BPM_L01.01",
 						"YSCR_INJ.01","YSCR_INJ.02","BPM_SPINJ.01","YSCR_SPINJ.01","YSCR_INJ.03","BPM_INJ.01","BPM_L00.01","PSMSCR_L00.01","PSMSCR_LH.01","BPM_LH.01","BPM_LH.02","PSMSCR_LH.02","PSMSCR_LH.03","BPM_LH.03","BPM_LH.04","BPM_SPLH.01","PSMSCR_SPLH.01","BPM_LH.05","PSMSCR_LH.04","BPM_L01.01"
 					]},
-					{"type": "rc", "position": 25300, "name": "RC_KG02.01", "devices":["EC-PS-KG02-01","SPAC_KG02.01","CMM-PS-KG02-01"]},
-					{"type": "rps", "position": 25900, "name": "RPS_KG02.01", "devices":[
+					{"type": "rc", "position": 25300, "name": "RC_KG02.01", "embedded":["EC-PS-KG02-01","SPAC_KG02.01","CMM-PS-KG02-01"]},
+					{"type": "rps", "position": 25900, "name": "RPS_KG02.01", "embedded":[
 						"PSQ_L00.01","PSQ_L00.02","PSCV_L00.01","PSCH_L00.01","PSCV_L00.02","PSCH_L00.02","PSCV_L00.03","PSCH_L00.03","PSCV_L00.04","PSCH_L00.04","PSCV_L00.05","PSCH_L00.05","PSCV_L00.06","PSCH_L00.06"
 					]},
-					{"type": "rps", "position": 26500, "name": "RPS_KG02.02", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rps", "position": 26500, "name": "RPS_KG02.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSCID_LH.01","PSCID_LH.02","PSCID_LH.03","PSCID_LH.04","PSCV_LH.01","PSCH_LH.01","PSCV_LH.02","PSCH_LH.02","PSCV_LH.03","PSCH_LH.03","PSCV_LH.04","PSCH_LH.04", "PSTRMCB_SPLH.01","PSQ_LH.01","PSQ_LH.02","PSQ_LH.03", "PSQ_LH.04","PSQ_LH.05","PSQ_LH.06","PSQ_LH.07", "PSB_SPLH.01", "PSB_LH"
 					]},
-					{"type": "rps", "position": 27100, "name": "RPS_KG02.03", "devices":[
+					{"type": "rps", "position": 27100, "name": "RPS_KG02.03", "embedded":[
 						"PSCV_L01.01","PSCH_L01.01","PSCV_L01.02","PSCH_L01.02", "PSCV_L01.03","PSCH_L01.03","PSCV_L01.04","PSCH_L01.04", "PSQ_L01.01","PSQ_L01.02","PSQ_L01.03","PSQ_L01.04"
 					]},
-					{"type": "rv", "position": 27700, "name": "RV_KG02.01", "devices":[
+					{"type": "rv", "position": 27700, "name": "RV_KG02.01", "embedded":[
 						"PSSIP_KG02.01","PSSIP20_L00.01","PSSIP20_L00.03",
 						"PSSIP_KG02.02","PSSIP20_L00.02","PSSIP20_L00.04",
 						"PSSIP_KG02.03","PSSIP55_L00.01","PSSIP55_L00.03",
@@ -1601,7 +1654,7 @@
 						"PSSIP_KG02.06","PSSIP75_L00.03","PSSIP75_L00.04",
 						"TPG_KG02.01","VGPE_L00.01","VGPI_L00.01","VGPE_L00.02"
 					]},
-					{"type": "rv", "position": 28500, "name": "RV_KG02.02", "devices":[
+					{"type": "rv", "position": 28500, "name": "RV_KG02.02", "embedded":[
 						"PSSIP_KG02.07","PSSIP300_L01.01","PSSIP300_L01.05",
 						"PSSIP_KG02.08","PSSIP300_L01.02","PSSIP300_L01.06",
 						"PSSIP_KG02.09","PSSIP300_L01.03","PSSIP300_L01.07",
@@ -1619,8 +1672,8 @@
 						
 					]},
 					{"type": "rid", "position": 29600, "name": "RID_KG02.01"},	
-					{"type": "rc", "position": 30350, "name": "RC_KG02.02", "devices":["EC-VAC-KG02-01","EC-ID-KG02-01"]},
-					{"type": "rv", "position": 30950, "name": "RV_KG02.03", "devices":[
+					{"type": "rc", "position": 30350, "name": "RC_KG02.02", "embedded":["EC-VAC-KG02-01","EC-ID-KG02-01"]},
+					{"type": "rv", "position": 30950, "name": "RV_KG02.03", "embedded":[
 						"PSSIP_KG02.16","PSSIP20_XBL01.02","PSSIP20_XBL01.03",
 						"PSSIP_KG02.17","PSSIP40_XBL01.01","PSSIP40_XBL01.02",
 						"PSSIP_KG02.18","PSSIP20_XBL01.04","PSSIP40_XBL01.03",
@@ -1631,25 +1684,25 @@
 					]},
 
 					{"type": "rllrf", "position": 32600, "name": "RLLRF_KG03.01"},
-					{"type": "klystron", "position": 33300, "name": "TKLY_KG03.01", "devices":["K03"]},
+					{"type": "klystron", "position": 33300, "name": "TKLY_KG03.01", "embedded":["K03"]},
 					{"type": "camod", "position": 34500, "name": "CAMOD_KG03.01"},
-					{"type": "rar1", "position": 36000, "name": "RAR1_KG03.01", "devices":["PST_K03","PSK_K03"]},
-					{"type": "rar2", "position": 36800, "name": "RAR2_KG03.01", "devices": ["EC-MOD-KG01-03","PSFOC_K03"]},
+					{"type": "rar1", "position": 36000, "name": "RAR1_KG03.01", "embedded":["PST_K03","PSK_K03"]},
+					{"type": "rar2", "position": 36800, "name": "RAR2_KG03.01", "embedded": ["EC-MOD-KG01-03","PSFOC_K03"]},
 					{"type": "fug", "position": 37600, "name": "HVPS_KG03.01"},
-					{"type": "rd", "position": 39300, "name": "RD_KG03.01", "devices":[
+					{"type": "rd", "position": 39300, "name": "RD_KG03.01", "embedded":[
 						"BPM_L01.02","BPM_L01.03","BPM_L01.04","BPM_L01.05","CMM-BAM-KG03-01","LIBERA_BPM_L01.02","LIBERA_BPM_L01.03","LIBERA_BPM_L01.04","LIBERA_BPM_L01.05","EC-MSCR-KG03-01"
 					]},
-					{"type": "rd", "position": 39900, "name": "RD_KG03.02", "devices":[]},
-					{"type": "rc", "position": 40500, "name": "RC_KG03.01", "devices":["SPAC_KG03", "KG03 YAMS 01"]},  
+					{"type": "rd", "position": 39900, "name": "RD_KG03.02", "embedded":[]},
+					{"type": "rc", "position": 40500, "name": "RC_KG03.01", "embedded":["SPAC_KG03", "KG03 YAMS 01"]},  
 
-					{"type": "rar3", "position": 41800, "name": "RAR3_KG04.01", "devices":["YAMS-KG03-01"]},
+					{"type": "rar3", "position": 41800, "name": "RAR3_KG04.01", "embedded":["PSFOC_K04","YAMS-KG03-01"]},
 					{"type": "fug", "position": 42600, "name": "HVPS_KG04.01"},
 					{"type": "rllrf", "position": 44000, "name": "RLLRF_KG04.01"},
-					{"type": "klystronx", "position": 44800, "name": "TKLY_KG04.01", "devices":["K04"]},
+					{"type": "klystronx", "position": 44800, "name": "TKLY_KG04.01", "embedded":["K04"]},
 					{"type": "camod", "position": 46200, "name": "CAMOD_KG04.01"},
-					{"type": "rar1", "position": 47700, "name": "RAR1_KG04.01", "devices":["PST_K04","PSK_K04"]},
-					{"type": "rar2", "position": 48500, "name": "RAR2_KG04.01", "devices": [
-						"EC-MOD-KG01-04","PSFOC_K04",
+					{"type": "rar1", "position": 47700, "name": "RAR1_KG04.01", "embedded":["PST_K04","PSK_K04"]},
+					{"type": "rar2", "position": 48500, "name": "RAR2_KG04.01", "embedded": [
+						"EC-MOD-KG01-04",
 						"PSSIP_KG02.15","PSSIP20_XBL01.01",
 						"PSSIP_KG04.01", "PSSIP02_KG04.01",
 						"PSSIP_KG04.02", "PSSIP02_KG04.02",
@@ -1660,15 +1713,15 @@
 					{"type": "rllrf", "position": 49400, "name": "RLLRF_KG05.01"},
 					{"type": "klystron", "position": 50100, "name": "TKLY_KG05.01"},
 					{"type": "camod", "position": 51200, "name": "CAMOD_KG05.01"},
-					{"type": "rar1", "position": 52700, "name": "RAR1_KG05.01", "devices":["PST_K05","PSK_K05"]},
-					{"type": "rar2", "position": 53500, "name": "RAR2_KG05.01", "devices": ["EC-MOD-KG01-05","PSFOC_K05"]},
+					{"type": "rar1", "position": 52700, "name": "RAR1_KG05.01", "embedded":["PST_K05","PSK_K05"]},
+					{"type": "rar2", "position": 53500, "name": "RAR2_KG05.01", "embedded": ["EC-MOD-KG01-05","PSFOC_K05"]},
 					{"type": "fug", "position": 54300, "name": "HVPS_KG05.01"},
 
 					{"type": "rllrf", "position": 55800, "name": "RLLRF_KGXS.01"},
 					{"type": "klystronx", "position": 56600, "name": "TKLY_KGXS.01"},
 					{"type": "camod", "position": 58000, "name": "CAMOD_KGXS.01"},
 					{"type": "rar1", "position": 59500, "name": "RAR1_KGXS.01"},
-					{"type": "rar2", "position": 60300, "name": "RAR2_KGXS.01", "name2": "RAR2_KG05.02", "devices": [
+					{"type": "rar2", "position": 60300, "name": "RAR2_KGXS.01", "name2": "RAR2_KG05.02", "embedded": [
 						"PSSIP_KXS.01", "PSSIP_KXS.10",
 						"PSSIP_KXS.02", "PSSIP_KXS.11",
 						"PSSIP_KXS.03", "PSSIP_KXS.12",
@@ -1676,17 +1729,17 @@
 					]},
 					{"type": "fug", "position": 61100, "name": "HVPS_KGXS.01"},
 
-					{"type": "rd", "position": 69500, "name": "RD_KG05.02", "devices": ["EC-BPM-KG05-01","BPM_BC01.01","BPM_BC01.02","BPM_BC01.03","BPM_BC01.04","BPM_SPBC01.01","BPM_BC01.05","LIBERA_BPM_BC01.01","LIBERA_BPM_BC01.02","LIBERA_BPM_BC01.03","LIBERA_BPM_BC01.04","LIBERA_BPM_SPBC01.01","LIBERA_BPM_BC01.05"
+					{"type": "rd", "position": 69500, "name": "RD_KG05.02", "embedded": ["EC-BPM-KG05-01","BPM_BC01.01","BPM_BC01.02","BPM_BC01.03","BPM_BC01.04","BPM_SPBC01.01","BPM_BC01.05","LIBERA_BPM_BC01.01","LIBERA_BPM_BC01.02","LIBERA_BPM_BC01.03","LIBERA_BPM_BC01.04","LIBERA_BPM_SPBC01.01","LIBERA_BPM_BC01.05"
 					]},
-					{"type": "rc", "position": 70700, "name": "RC_KG05.02", "devices":["EC-PS-KG05-02","SPIN_KG05.02"]},
-					{"type": "rps", "position": 71300, "name": "RPS_KG05.03", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rc", "position": 70700, "name": "RC_KG05.02", "embedded":["EC-PS-KG05-02","SPIN_KG05.02"]},
+					{"type": "rps", "position": 71300, "name": "RPS_KG05.03", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSQ_BC01.08","PSQ_BC01.09","PSQ_BC01.10","PSQ_BC01.11", "PSTRMCB_SPBC.01", "PSQ_SPBC1.01", "PSQ_SPBC1.02", "PSB_SPBC1"
 					]},
-					{"type": "rps", "position": 71900, "name": "RPS_KG05.04", "devices":[
+					{"type": "rps", "position": 71900, "name": "RPS_KG05.04", "embedded":[
 						"PSCV_L02.01","PSCH_L02.01","PSCV_L02.02","PSCH_L02.02", "PSCV_L02.03","PSCH_L02.03","PSCV_L02.04","PSCH_L02.04", "PSQ_L02.01","PSQ_L02.02","PSQ_L02.03","PSQ_L02.04"
 					]},
 					{"type": "rllrf", "position": 73000, "name": "RLLRF_KGST.01"},
-					{"type": "klystron", "position": 73700, "name": "TKLY_KGST.01", "devices":["KGST"]},
+					{"type": "klystron", "position": 73700, "name": "TKLY_KGST.01", "embedded":["KGST"]},
 					{"type": "camod", "position": 74800, "name": "RPST6_KG05.03"},
 					{"type": "rc", "position": 76300, "name": "RC_KG05.03"},
 					{"type": "rar1", "position": 76900, "name": "RAR1_KG05.03"},
@@ -1694,26 +1747,26 @@
 					{"type": "fug", "position": 78500, "name": "HVPS_KGST.03"},
 
 					{"type": "rllrf", "position": 80300, "name": "RLLRF_KG06.01"},
-					{"type": "klystron", "position": 81100, "name": "TKLY_KG06.01", "devices":["K06"]},
+					{"type": "klystron", "position": 81100, "name": "TKLY_KG06.01", "embedded":["K06"]},
 					{"type": "camod", "position": 82200, "name": "CAMOD_KG06.01"},
-					{"type": "rar1", "position": 83700, "name": "RAR1_KG06.01", "devices":["PST_K06","PSK_K06","SPMO_KG06.01"]},
-					{"type": "rar2", "position": 84500, "name": "RAR2_KG06.01", "devices":["EC-MOD-KG06-01","PSFOC_K06"]},
-					{"type": "fug", "position": 85300, "name": "HVPS_KG06.01", "devices":["FUG_K06"]},
-					{"type": "rc", "position": 87000, "name": "RC_KG06.01", "devices":[
+					{"type": "rar1", "position": 83700, "name": "RAR1_KG06.01", "embedded":["PST_K06","PSK_K06","SPMO_KG06.01"]},
+					{"type": "rar2", "position": 84500, "name": "RAR2_KG06.01", "embedded":["EC-MOD-KG06-01","PSFOC_K06"]},
+					{"type": "fug", "position": 85300, "name": "HVPS_KG06.01", "embedded":["FUG_K06"]},
+					{"type": "rc", "position": 87000, "name": "RC_KG06.01", "embedded":[
 						"SW-C-KG06-01","EC-CM-KG06-01","PSCM_SPLH.01","PSCM_SPBC1.01","PSCM_BC01.01","PSBPM_L02.01","PSBPM_L02.02","PSBPM_L02.03","PSBPM_L02.04","PSBPM_L03.01","PSBPM_L03.02","PSCM_BC02.01","PSCM_DBD.01","PSCM_TLS.01","LIBERA_BPM_L02.01","LIBERA_BPM_L02.02","LIBERA_BPM_L02.03","LIBERA_BPM_L02.04","LIBERA_BPM_L03.01","LIBERA_BPM_L03.02"
 					]},
 
 					{"type": "rllrf", "position": 90000, "name": "RLLRF_KG07.01"},
-					{"type": "klystron", "position": 90800, "name": "TKLY_KG07.01", "devices":["K07"]},
+					{"type": "klystron", "position": 90800, "name": "TKLY_KG07.01", "embedded":["K07"]},
 					{"type": "camod", "position": 91900, "name": "CAMOD_KG07.01"},
-					{"type": "rar1", "position": 93400, "name": "RAR1_KG07.01", "devices":["PSK_K07","PST_K07","SPMO_KG07.01"]},
-					{"type": "rar2", "position": 94200, "name": "RAR2_KG07.01", "devices":["EC-MOD-KG07-01","PSFOC_K07"] },
-					{"type": "fug", "position": 95000, "name": "HVPS_KG07.01", "devices":["FUG_K07"]},
-					{"type": "rd", "position": 98700, "name": "RD_KG07.01", "devices":[
+					{"type": "rar1", "position": 93400, "name": "RAR1_KG07.01", "embedded":["PSK_K07","PST_K07","SPMO_KG07.01"]},
+					{"type": "rar2", "position": 94200, "name": "RAR2_KG07.01", "embedded":["EC-MOD-KG07-01","PSFOC_K07"] },
+					{"type": "fug", "position": 95000, "name": "HVPS_KG07.01", "embedded":["FUG_K07"]},
+					{"type": "rd", "position": 98700, "name": "RD_KG07.01", "embedded":[
 						"BPM_BC02.01","BPM_BC02.02","LIBERA_BPM_BC02.01","LIBERA_BPM_BC02.02","EC-BPM-KG-01"
 					]},
-					{"type": "rc", "position": 99900, "name": "RC_KG07.01", "devices":["SPAC_K07"]},
-					{"type": "rv", "position": 100500, "name": "RV_KG07.01", "devices":[
+					{"type": "rc", "position": 99900, "name": "RC_KG07.01", "embedded":["SPAC_K07"]},
+					{"type": "rv", "position": 100500, "name": "RV_KG07.01", "embedded":[
 						"PSSIP_KG07.01","PSSIP300_L02.01","PSSIP300_L02.05",
 						"PSSIP_KG07.02","PSSIP300_L02.02","PSSIP300_L02.06",
 						"PSSIP_KG07.03","PSSIP300_L02.03","PSSIP300_L02.07",
@@ -1726,7 +1779,7 @@
 						"TPG_KG07.02","VGPE_L02.03","VGPI_L02.03","VGPE_L02.04",
 						"SPIN_KG07.01"
 					]},
-					{"type": "rv", "position": 101300, "name": "RV_KG07.02", "devices":[
+					{"type": "rv", "position": 101300, "name": "RV_KG07.02", "embedded":[
 						"PSSIP_KG07.09","PSSIP300_L03.01","PSSIP300_L03.03",
 						"PSSIP_KG07.10","PSSIP300_L03.02","PSSIP300_L03.04",
 						"PSSIP_KG07.11","PSSIP75_L03.01","PSSIP75_L03.02",
@@ -1738,40 +1791,40 @@
 						"TPG_KG07.03","VGPE_L03.01","VGPI_L03.01","VGPE_L03.02","VGPI_L03.02",
 						"TPG_KG07.04","VGPE_BC02.01","VGPI_BC02.01","VGPE_L02.04"
 					]},
-					{"type": "rc", "position": 102100, "name": "RC_KG07.02", "devices":["EC-PS-KG-01"]},
-					{"type": "rps", "position": 102700, "name": "RPS_KG07.01", "devices":[
+					{"type": "rc", "position": 102100, "name": "RC_KG07.02", "embedded":["EC-PS-KG-01"]},
+					{"type": "rps", "position": 102700, "name": "RPS_KG07.01", "embedded":[
 						"PSCV_L03.01", "PSCH_L03.01", "PSCV_L03.02", "PSCH_L03.02", "PSQ_L03.01", "PSQ_L03.02"
 					]},
 
 					{"type": "rllrf", "position": 104400, "name": "RLLRF_KG08.01"},
-					{"type": "klystron", "position": 105100, "name": "TKLY_KG08.01", "devices":["K08"]},
+					{"type": "klystron", "position": 105100, "name": "TKLY_KG08.01", "embedded":["K08"]},
 					{"type": "camod", "position": 106200, "name": "CAMOD_KG08.01"},
-					{"type": "rar1", "position": 107700, "name": "RAR1_KG08.01", "devices":["PST_K08","PSK_K08"]},
-					{"type": "rar2", "position": 108500, "name": "RAR2_KG08.01", "devices":["EC-MOD-KG08-01","PSFOC_K08"]},
-					{"type": "fug", "position": 109300, "name": "HVPS_KG08.01", "devices":["FUG_K08"]  },
+					{"type": "rar1", "position": 107700, "name": "RAR1_KG08.01", "embedded":["PST_K08","PSK_K08"]},
+					{"type": "rar2", "position": 108500, "name": "RAR2_KG08.01", "embedded":["EC-MOD-KG08-01","PSFOC_K08"]},
+					{"type": "fug", "position": 109300, "name": "HVPS_KG08.01", "embedded":["FUG_K08"]  },
 
 					{"type": "rllrf", "position": 111400, "name": "RLLRF_KG09.01"},
-					{"type": "klystron", "position": 112100, "name": "TKLY_KG09.01", "devices":["K09"]},
+					{"type": "klystron", "position": 112100, "name": "TKLY_KG09.01", "embedded":["K09"]},
 					{"type": "camod", "position": 113200, "name": "CAMOD_KG09.01"},
-					{"type": "rar1", "position": 114700, "name": "RAR1_KG09.01", "devices":["PST_K09","PSK_K09"]},
-					{"type": "rar2", "position": 115500, "name": "RAR2_KG09.01", "devices":["EC-MOD-KG09-01","PSFOC_K09"]},
+					{"type": "rar1", "position": 114700, "name": "RAR1_KG09.01", "embedded":["PST_K09","PSK_K09"]},
+					{"type": "rar2", "position": 115500, "name": "RAR2_KG09.01", "embedded":["EC-MOD-KG09-01","PSFOC_K09"]},
 					{"type": "fug", "position": 116300, "name": "HVPS_KG09.01"},
 
-					{"type": "rd", "position": 118100, "name": "RD_KG09.01", "devices":[
+					{"type": "rd", "position": 118100, "name": "RD_KG09.01", "embedded":[
 						"PSMSCR_L03.01","PSMSCR_BC02.01","BPM_L04.01","PSMSCR_L04.01","BPM_L04.02","BPM_L04.03","BPM_L04.04","LIBERA_BPM_L04.01","LIBERA_BPM_L04.02","LIBERA_BPM_L04.03","LIBERA_BPM_L04.04","EC-CBLM-KG09-01"
 					]},
 					{"type": "rd", "position": 118700, "name": "RD_KG09.02"},
-					{"type": "rc", "position": 119900, "name": "RC_KG09.01", "devices":["EC-PS-KG09-01", "SPIN_K09.01"]},
-					{"type": "rps", "position": 120500, "name": "RPS_KG09.01", "devices":[
+					{"type": "rc", "position": 119900, "name": "RC_KG09.01", "embedded":["EC-PS-KG09-01", "SPIN_K09.01"]},
+					{"type": "rps", "position": 120500, "name": "RPS_KG09.01", "embedded":[
 						"PSTRMCB_BC02.01", "PSTRMCB_BC02.02", "PSTRMCB_BC02.03", "PSTRMCB_BC02.04", "PSQ_BC02.01", "PSQ_BC02.02", "PSCV_BC02.01", "PSCH_BC02.01", "SPARE", "PSQ_BC02.03", "PSB_BC02"
 					]},
-					{"type": "rps", "position": 121100, "name": "RPS_KG09.02", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rps", "position": 121100, "name": "RPS_KG09.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSCV_L04.01", "PSCH_L04.01", "PSCV_L04.02", "PSCH_L04.02", "PSCV_L04.03", "PSCH_L04.03", "PSCV_L04.04", "PSCH_L04.04", "PSCV_L04.05", "PSCH_L04.05"
 					]},
-					{"type": "rps", "position": 121700, "name": "RPS_KG09.03", "devices":[
+					{"type": "rps", "position": 121700, "name": "RPS_KG09.03", "embedded":[
 						"PSCV_L04.06", "PSCH_L04.06", "PSCV_L04.07", "PSCH_L04.07", "PSQ_L04.01", "PSQ_L04.02", "PSQ_L04.06", "PSQ_L04.07", "PSQ_L04.03", "PSQ_L04.04", "PSQ_L04.05"
 					]},
-					{"type": "rv", "position": 122300, "name": "RV_KG09.01", "devices":[
+					{"type": "rv", "position": 122300, "name": "RV_KG09.01", "embedded":[
 						"PSSIP_KG09.01","PSSIP300_L04.01","PSSIP300_L04.06",
 						"PSSIP_KG09.02","PSSIP300_L04.02","PSSIP300_L04.07",
 						"PSSIP_KG09.03","PSSIP300_L04.03","PSSIP300_L04.08",
@@ -1782,7 +1835,7 @@
 						"PSSIP_KG09.08","PSSIP55_L04.03","PSSIP75_L04.28",
 						"PSNIP_KG09.01","GIP1000_L04.01"
 					]},
-					{"type": "rv", "position": 123100, "name": "RV_KG09.02", "devices":[
+					{"type": "rv", "position": 123100, "name": "RV_KG09.02", "embedded":[
 						"PSSIP_KG09.09","PSSIP75_L04.01","PSSIP75_L04.02",
 						"PSSIP_KG09.10","PSSIP75_L04.03","PSSIP75_L04.04",
 						"PSSIP_KG09.11","PSSIP75_L04.05","PSSIP75_L04.06",
@@ -1794,7 +1847,7 @@
 						"PSSIP_KG09.17","PSSIP75_L04.17","PSSIP75_L04.18",
 						"PSSIP_KG09.18","PSSIP75_L04.19","PSSIP75_L04.20"
 					]},
-					{"type": "rv", "position": 123900, "name": "RV_KG09.03", "devices":[
+					{"type": "rv", "position": 123900, "name": "RV_KG09.03", "embedded":[
 						"PSSIP_KG09.19","PSSIP150_L04.21","PSSIP75_L04.22",
 						"PSSIP_KG09.20","PSSIP75_L04.23","PSSIP75_L04.24",
 						"PSSIP_KG09.21","PSSIP75_L04.25","PSSIP75_L04.26",
@@ -1806,49 +1859,49 @@
 						"SPIN_KG09.02"
 					]},
 					{"type": "rrp", "position": 124400, "name": "RRP_KG09.01"},
-					{"type": "rc", "position": 125300, "name": "RC_KG09.02", "devices":["KG09 YAMS 01", "SPAC_KG09"]},
+					{"type": "rc", "position": 125300, "name": "RC_KG09.02", "embedded":["KG09 YAMS 01", "SPAC_KG09"]},
 					{"type": "camod", "position": 126000, "name": "RPST5_KG09.01"},
 
 					{"type": "rllrf", "position": 133600, "name": "RLLRF_KG10.01"},
-					{"type": "klystron", "position": 134300, "name": "TKLY_KG10.01", "devices":["K10"]},
+					{"type": "klystron", "position": 134300, "name": "TKLY_KG10.01", "embedded":["K10"]},
 					{"type": "camod", "position": 135400, "name": "CAMOD_KG10.01"},
-					{"type": "rar1", "position": 136900, "name": "RAR1_KG10.01", "devices":["PST_K10","PSK_K10"]},
-					{"type": "rar2", "position": 137700, "name": "RAR2_KG10.01", "devices":["EC-MOD-KG10-01","PSFOC_K10"]},
+					{"type": "rar1", "position": 136900, "name": "RAR1_KG10.01", "embedded":["PST_K10","PSK_K10"]},
+					{"type": "rar2", "position": 137700, "name": "RAR2_KG10.01", "embedded":["EC-MOD-KG10-01","PSFOC_K10"]},
 					{"type": "fug", "position": 138500, "name": "HVPS_KG10.01"},
 
 					{"type": "rllrf", "position": 140600, "name": "RLLRF_KG11.01"},
-					{"type": "klystron", "position": 141300, "name": "TKLY_KG11.01", "devices":["K11"]},
+					{"type": "klystron", "position": 141300, "name": "TKLY_KG11.01", "embedded":["K11"]},
 					{"type": "camod", "position": 142300, "name": "CAMOD_KG11.01"},
-					{"type": "rar1", "position": 143800, "name": "RAR1_KG11.01", "devices":["PST_K11","PSK_K11"]},
-					{"type": "rar2", "position": 144600, "name": "RAR2_KG11.01", "devices":["EC-MOD-KG11-01","PSFOC_K11"]},
+					{"type": "rar1", "position": 143800, "name": "RAR1_KG11.01", "embedded":["PST_K11","PSK_K11"]},
+					{"type": "rar2", "position": 144600, "name": "RAR2_KG11.01", "embedded":["EC-MOD-KG11-01","PSFOC_K11"]},
 					{"type": "fug", "position": 145400, "name": "HVPS_KG11.01"},
 
 					{"type": "rllrf", "position": 147600, "name": "RLLRF_KG12.01"},
-					{"type": "klystron", "position": 148300, "name": "TKLY_KG12.01", "devices":["K12"]},
+					{"type": "klystron", "position": 148300, "name": "TKLY_KG12.01", "embedded":["K12"]},
 					{"type": "camod", "position": 149400, "name": "CAMOD_KG12.01"},
-					{"type": "rar1", "position": 150900, "name": "RAR1_KG12.01", "devices":["PST_K12","PSK_K12"]},
-					{"type": "rar2", "position": 151600, "name": "RAR2_KG12.01", "devices":["EC-MOD-KG12-01","PSFOC_K12"]},
+					{"type": "rar1", "position": 150900, "name": "RAR1_KG12.01", "embedded":["PST_K12","PSK_K12"]},
+					{"type": "rar2", "position": 151600, "name": "RAR2_KG12.01", "embedded":["EC-MOD-KG12-01","PSFOC_K12"]},
 					{"type": "fug", "position": 152400, "name": "HVPS_KG12.01"},
 
 					{"type": "rllrf", "position": 154700, "name": "RLLRF_KG13.01"},
-					{"type": "klystron", "position": 155400, "name": "TKLY_KG13.01", "devices":["K13"]},
+					{"type": "klystron", "position": 155400, "name": "TKLY_KG13.01", "embedded":["K13"]},
 					{"type": "camod", "position": 156500, "name": "CAMOD_KG13.01"},
-					{"type": "rar1", "position": 158000, "name": "RAR1_KG13.01", "devices":["PST_K13","PSK_K13"]},
-					{"type": "rar2", "position": 158800, "name": "RAR2_KG13.01", "devices":["EC-MOD-KG13-01","PSFOC_K13"]},
+					{"type": "rar1", "position": 158000, "name": "RAR1_KG13.01", "embedded":["PST_K13","PSK_K13"]},
+					{"type": "rar2", "position": 158800, "name": "RAR2_KG13.01", "embedded":["EC-MOD-KG13-01","PSFOC_K13"]},
 					{"type": "fug", "position": 159600, "name": "HVPS_KG13.01"},
 
 					{"type": "rllrf", "position": 161800, "name": "RLLRF_KG14.01"},
-					{"type": "klystron", "position": 162500, "name": "TKLY_KG14.01", "devices":["K14"]},
+					{"type": "klystron", "position": 162500, "name": "TKLY_KG14.01", "embedded":["K14"]},
 					{"type": "camod", "position": 163600, "name": "CAMOD_KG14.01"},
-					{"type": "rar1", "position": 165100, "name": "RAR1_KG14.01", "devices":["PST_K14","PSK_K14"]},
-					{"type": "rar2", "position": 165900, "name": "RAR2_KG14.01", "devices":["EC-MOD-KG14-01","PSFOC_K14"]},
+					{"type": "rar1", "position": 165100, "name": "RAR1_KG14.01", "embedded":["PST_K14","PSK_K14"]},
+					{"type": "rar2", "position": 165900, "name": "RAR2_KG14.01", "embedded":["EC-MOD-KG14-01","PSFOC_K14"]},
 					{"type": "fug", "position": 166700, "name": "HVPS_KG14.01"},
 
 					{"type": "rllrf", "position": 169000, "name": "RLLRF_KG15.01"},
-					{"type": "klystron", "position": 169700, "name": "TKLY_KG15.01", "devices":["K15"]},
+					{"type": "klystron", "position": 169700, "name": "TKLY_KG15.01", "embedded":["K15"]},
 					{"type": "camod", "position": 170700, "name": "CAMOD_KG15.01"},
-					{"type": "rar1", "position": 172200, "name": "RAR1_KG15.01", "devices":["PST_K15","PSK_K15"]},
-					{"type": "rar2", "position": 173000, "name": "RAR2_KG15.01", "devices":["EC-MOD-KG15-01","PSFOC_K15"]},
+					{"type": "rar1", "position": 172200, "name": "RAR1_KG15.01", "embedded":["PST_K15","PSK_K15"]},
+					{"type": "rar2", "position": 173000, "name": "RAR2_KG15.01", "embedded":["EC-MOD-KG15-01","PSFOC_K15"]},
 					{"type": "fug", "position": 173800, "name": "HVPS_KG15.01"}
 				]
 			},
@@ -2021,14 +2074,14 @@
 				"start": {"x": -157929, "y": 4000, "z": -1811},
 				"components": [
 
-					{"type": "rd", "position": 0, "name": "RD_KG05.01", "devices": ["SCRPH_BC01.01, EC-CBLM-KG05-01"]},
-					{"type": "rps", "position": 600, "name": "RPS_KG05.01", "devices":[
+					{"type": "rd", "position": 0, "name": "RD_KG05.01", "embedded": ["SCRPH_BC01.01, EC-CBLM-KG05-01"]},
+					{"type": "rps", "position": 600, "name": "RPS_KG05.01", "embedded":[
 						"PSCV_BC01.01","PSCH_BC01.01","PSCV_BC01.02","PSCH_BC01.02", "PSCV_BC01.03","PSCH_BC01.03","PSCV_BC01.04","PSCH_BC01.04", "PSCV_BC01.05","PSCH_BC01.05","PSCV_BC01.06","PSCH_BC01.06", "PSTRMCB_BC01.01","PSTRMCB_BC01.02","PSTRMCB_BC01.03","PSTRMCB_BC01.04", "PSQ_BC01.01","PSQ_BC01.02","PSQ_BC01.03","PSQ_BC01.06"
 					]},
-					{"type": "rps", "position": 1200, "name": "RPS_KG05.02", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rps", "position": 1200, "name": "RPS_KG05.02", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PSQ_BC01.04","PSQ_BC01.05","PSQ_BC01.07", "PSB_BC01"
 					]},
-					{"type": "rv", "position": 1800, "name": "RV_KG05.01", "devices":[
+					{"type": "rv", "position": 1800, "name": "RV_KG05.01", "embedded":[
 						"PSSIP_KG05.01","PSSIP150_BC01.01","PSSIP300_BC01.01",
 						"PSSIP_KG05.02","PSSIP150_BC01.02","PSSIP55_BC01.03",
 						"PSSIP_KG05.03","PSSIP55_BC01.01","PSSIP55_BC01.04",
@@ -2044,7 +2097,7 @@
 						"TPG_KG05.05","VGPE_BC01.07","VGPI_BC01.03","VGPE_BC01.08","VGPI_BC01.04",
 						"SPIN_05.01"
 					]},
-					{"type": "rc", "position": 2600, "name": "RC_KG05.01", "devices":[
+					{"type": "rc", "position": 2600, "name": "RC_KG05.01", "embedded":[
 						"EC-PS-KG05-01", "PDU-RC-KG05-01", "KG05/YAMS/01", "SPMO_KG05.02", "SPAC_KG05"
 					]}
 
@@ -2058,9 +2111,10 @@
 			},
 		
 			{
-				"start": {"x": -11200, "y": 4000, "z": -11600},
+				"start": {"x": -11400, "y": 4000, "z": -11600},
 				"components": [
-					{"type": "rv", "position": 400, "name": "RV_KG15.01", "width": 800, "height": 2000, "depth": 600, "devices":[
+					{"type": "rar2", "position": 0, "name": "RAR2_KG15.02", "embedded":["slave-mod-k16-01"]},
+					{"type": "rv", "position": 800, "name": "RV_KG15.01", "width": 800, "height": 2000, "depth": 600, "embedded":[
 						"PSSIP_KG15.01","PSSIP300_TLS.01","PSSIP300_TLS.02", 
 						"PSSIP_KG15.02","PSSIP55_TLS.01","PSSIP75_TLS.01",
 						"PSSIP_KG15.03","PSSIP75_DBD.01","PSSIP150_DBD.01",
@@ -2069,17 +2123,17 @@
 						"TPG_KG15.03","VGPE_DBD.01","VGPI_DBD.01","VGPE_TLS.02",
 						"SPIN_KG15.01"
 					]},
-					{"type": "rc", "position": 1400, "name": "RC_KG15.01", "devices":["EC-PS-KG15-01", "SPAC_KG15.02", "SPAC_KG15.01"]},
-					{"type": "rd", "position": 2000, "name": "RD_KG15.01", "devices":[
+					{"type": "rc", "position": 1600, "name": "RC_KG15.01", "embedded":["EC-PS-KG15-01", "SPAC_KG15.02", "SPAC_KG15.01"]},
+					{"type": "rd", "position": 2200, "name": "RD_KG15.01", "embedded":[
 						"BPM_L04.05","BPM_L04.06","BPM_L04.07","BPM_TLS.01","PSMSCR_TLS.01","BPM_DBD.01","PSMSCR_DBD.01","BPM_DBD.02","PSMSCR_DBD.02","PSMSCR_TLS.02","BPM_TLS.02","PSMSCR_TLS.03","BPM_TLS.03","EC-BPM-KG15-01","LIBERA_BPM_L04.05","LIBERA_BPM_L04.06","LIBERA_BPM_L04.07","LIBERA_BPM_TLS.01","LIBERA_BPM_DBD.01","LIBERA_BPM_DBD.02","LIBERA_BPM_TLS.02","LIBERA_BPM_TLS.03"
 					]},
-					{"type": "rps", "position": 3200, "name": "RPS_KG15.01", "devices":[
+					{"type": "rps", "position": 2800, "name": "RPS_KG15.01", "embedded":[
 						"PSQ_TLS.01", "PSQ_TLS.02", "PSQ_TLS.03", "PSQ_TLS.04", "PSQ_TLS.05", "PSQ_TLS.06", "PSQ_TLS.07", "PSCV_TLS.01", "PSCH_TLS.01", "PSCV_TLS.02", "PSCH_TLS.02", "PSCV_TLS.03", "PSCH_TLS.03", "PSCV_DBD.01", "PSCH_DBD.01"
 					]},
-					{"type": "rps", "position": 3800, "name": "RPS_KG15.02", "devices":[
+					{"type": "rps", "position": 3400, "name": "RPS_KG15.02", "embedded":[
 						"PSQ_DBD.01", "PSQ_DBD.02", "PSQ_DBD.03", "PSQ_DBD.04", "PSQ_DBD.05"
 					]},
-					{"type": "rpsb", "position": 5300, "name": "RPSB_KG15.03", "width": 1000, "height": 2100, "depth": 1000, "devices":["PSB_DBD"]}
+					{"type": "rpsb", "position": 4000, "name": "RPSB_KG15.03", "width": 1000, "height": 2100, "depth": 1000, "embedded":["PSB_DBD"]}
 				]
 			},
 			{
@@ -2091,7 +2145,7 @@
 			{
 				"start": {"x": -10600, "y": 4000, "z": -8611},
 				"components": [
-					{"type": "rllrf", "position": 800, "name": "RLLRF_KG16", "labelReverse": [90, 1500, 350]},
+					{"type": "rllrf", "position": 800, "name": "RLLRF_KG16", "labelReverse": [90, -1100, 350]},
 					{"type": "klystron", "position": 1400, "name": "TKLY_KG16", "labelReverse": [90, -1100, 350]}
 				]
 			},
@@ -2101,24 +2155,24 @@
 				]
 			},
 			{
-				"start": {"x": -9000, "y": 4000, "z": -9011},
+				"start": {"x": -8100, "y": 4000, "z": -9011},
 				"components": [
-					{"type": "rar1", "position": 1500, "name": "RAR1_KG16", "labelReverse": [90, -1100, 100]}
+					{"type": "rack2", "position": 0, "name": "RAR1_KG15.02", "labelReverse": [90, -1100, 100]}
 				]
 			},
 			{
-				"start": {"x": -9000, "y": 4000, "z": -8411},
+				"start": {"x": -8100, "y": 4000, "z": -7111},
 				"components": [
 				]
 			},
 			{
-				"start": {"x": -9400, "y": 4000, "z": -8411},
+				"start": {"x": -8400, "y": 4000, "z": -8411},
 				"components": [
-					{"type": "rack2", "position": 0, "name": "HVPS_KG16", "labelReverse": [-90, 2500, -200]}
+					{"type": "rack2", "position": 0, "name": "HVPS_KG16.02", "labelReverse": [-90, 2500, -200]}
 				]
 			},
 			{
-				"start": {"x": -9400, "y": 4000, "z": -9011},
+				"start": {"x": -8400, "y": 4000, "z": -9011},
 				"components": [
 				]
 			},
@@ -2127,19 +2181,19 @@
 			{
 				"start": {"x": 4000, "y": 4000, "z": -7600},
 				"components": [
-					{"type": "rps", "position": 300, "name": "RPS_SSA.01", "labelReverse": [90, -1200, 300], "devices":[
+					{"type": "rps", "position": 300, "name": "RPS_SSA.01", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSCV_SFEL01.01","PSCH_SFEL01.01","PSCV_SFEL01.02","PSCH_SFEL01.02", "PSCV_SFEL01.03","PSCH_SFEL01.03","PSCV_SFEL01.04","PSCH_SFEL01.04", "PSB_SCL-FEL1 ", "PSB_SFEL2"
 					]},
-					{"type": "rps", "position": 900, "name": "RPS_SSA.02", "labelReverse": [90, -1200, 300], "devices":[
+					{"type": "rps", "position": 900, "name": "RPS_SSA.02", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSCV_SFEL01.05","PSCH_SFEL01.05","PSCV_SFEL01.06","PSCH_SFEL01.06", "PSQ_SFEL01.01", "PSQ_SFEL01.07", "PSQ_SFEL02.01", "PSQ_SFEL02.02", "PSQ_SFEL02.04"
 					]},
-					{"type": "rps", "position": 1500, "name": "RPS_SSA.03", "labelReverse": [90, -1200, 300], "devices":[
+					{"type": "rps", "position": 1500, "name": "RPS_SSA.03", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSCV_SCL.01","PSCH_SCL.01","PSCV_SCL.02","PSCH_SCL.02", "PSCV_SCL.03","PSCH_SCL.03","SPARE","PSQ_SCL.01", "PSQ_SCL.02","PSQ_SCL.03","PSQ_SCL.04","PSQ_SCL.05", "PSQ_SCL.06","PSQ_SCL.07","PSQ_SCL.08","PSQ_SCL.09"
 					]},
-					{"type": "rps", "position": 2100, "name": "RPS_SSA.04", "labelReverse": [90, -1200, 300], "devices":[
+					{"type": "rps", "position": 2100, "name": "RPS_SSA.04", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSQ_SFEL01.02", "PSQ_SFEL01.03","PSQ_SFEL01.04","PSQ_SFEL01.05","PSQ_SFEL01.06", "PSQ_SFEL01.08","PSQ_SFEL01.09","PSQ_SFEL01.10","PSQ_SFEL01.11"
 					]},
-					{"type": "rps", "position": 2700, "name": "RPS_SSA.05", "labelReverse": [90, -1200, 300], "devices":[
+					{"type": "rps", "position": 2700, "name": "RPS_SSA.05", "labelReverse": [90, -1200, 300], "embedded":[
 						"PSCV_SFEL02.02","PSCH_SFEL02.02","PSCV_SFEL02.04","PSCH_SFEL02.04", "PSCV_SFEL02.01","PSCH_SFEL02.01","PSCV_SFEL02.03","PSCH_SFEL02.03", "PSTRMCB_SFEL02.01","SPARE","SPARE","PSQ_SFEL02.03", "PSQ_SFEL02.05","PSQ_SFEL02.06","PSQ_SFEL02.07","PSQ_SFEL02.08"
 					]}
 				]
@@ -2153,7 +2207,7 @@
 			{
 				"start": {"x": 6000, "y": 4000, "z": -7600},
 				"components": [
-					{"type": "rd", "position": -300, "name": "RD_SSA.01", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rd", "position": -300, "name": "RD_SSA.01", "labelReverse": [90, 950, 300], "embedded":[
 						"BPM_SCL.01","BPM_SCL.02","BPM_SFEL01.01","BPM_SFEL01.02","BPM_SFEL01.03","BPM_SFEL01.04","BPM_SFEL02.01","BPM_SFEL02.02","EC-BPM-SSA-01","LIBERA_BPM_SCL.01","LIBERA_BPM_SCL.02","LIBERA_BPM_SFEL01.01","LIBERA_BPM_SFEL01.02","LIBERA_BPM_SFEL01.03","LIBERA_BPM_SFEL01.04","LIBERA_BPM_SFEL02.01"
 					]},
 					{"type": "rd", "position": 300, "name": "RD_SSA.02", "labelReverse": [90, 950, 300]},
@@ -2171,13 +2225,13 @@
 			{
 				"start": {"x": 8000, "y": 4000, "z": -7600},
 				"components": [
-					{"type": "rd", "position": -300, "name": "RD_SSA.03", "devices":[
+					{"type": "rd", "position": -300, "name": "RD_SSA.03", "embedded":[
 						"PSMSCR_SCL.01","PSMSCR_SFEL01.01","CBPM_SFEL01.01","PSMSCR_SFEL01.02","CBPM_SFEL01.02","CBPM_SFEL01.03","PSMSCR_SFEL02.01","PSMSCR_SFEL02.02","EC-MSCR-SSA-01"
 					]},
-					{"type": "rd", "position": 300, "name": "RD_SSA.04", "devices":[
+					{"type": "rd", "position": 300, "name": "RD_SSA.04", "embedded":[
 						"CBPM_SFEL02.01","CBPM_SFEL02.02","CBPM_SFEL02.03","EC-CBPM-SSA-01"
 					]},
-					{"type": "rv", "position": 900, "name": "RV_SSA.01", "devices":[
+					{"type": "rv", "position": 900, "name": "RV_SSA.01", "embedded":[
 						"PSSIP_SSA.01","PSSIP55_SCL.01","PSSIP55_SCL.02",
 						"PSSIP_SSA.02","PSSIP300_SCL.01","PSSIP55_SCL.03",
 						"PSSIP_SSA.03","PSSIP55_SFEL01.01","PSSIP55_SFEL01.04",
@@ -2189,14 +2243,14 @@
 						"TPG_SSA.03","VGPE_SFEL01.03",
 						"sds-vac-ssa-01"
 					]},
-					{"type": "rv", "position": 1700, "name": "RV_SSA.02", "width": 800, "height": 2000, "depth": 600, "devices":[
+					{"type": "rv", "position": 1700, "name": "RV_SSA.02", "width": 800, "height": 2000, "depth": 600, "embedded":[
 						"PSSIP_SSA.07","PSSIP300_SFEL02.01","PSSIP55_SFEL02.04",
 						"PSSIP_SSA.08","PSSIP55_SFEL02.01","PSSIP150_SFEL02.01",
 						"PSSIP_SSA.09","PSSIP55_SFEL02.02",
 						"TPG_SSA.04","VGPE_SFEL02.01","VGPI_SFEL02.01","VGPE_SFEL02.02",
 						"TPG_SSA.05","VGPE_SFEL02.03"
 					]},
-					{"type": "rc", "position": 3100, "name": "RC_SSA.02", "devices":["EC-PS-SSA-01","SSA YAMS 01", "SPIN_SSA_01"]}
+					{"type": "rc", "position": 3100, "name": "RC_SSA.02", "embedded":["EC-PS-SSA-01","SSA YAMS 01", "SPIN_SSA_01"]}
 				]
 			},
 			{
@@ -2208,22 +2262,22 @@
 			{
 				"start": {"x": 63500, "y": 4000, "z": -7000},
 				"components": [
-					{"type": "rps", "position": 30300, "name": "RPS_USA.01", "devices":[
+					{"type": "rps", "position": 30300, "name": "RPS_USA.01", "embedded":[
 						"PSTRMCW_FEL01.01","PSTRMCW_FEL01.02","PSCV_FEL01.01","PSCH_FEL01.01", "PSQ_FEL01.01","PSCID_FEL01.01","PSCID_FEL01.02","PSCID_FEL01.03","PSCID_FEL01.04", "PSCID_FEL01.05","PSCID_FEL01.06","PSCID_FEL01.07","PSCID_FEL01.08", "PSCID_FEL01.09","PSCID_FEL01.10","PSCID_FEL01.11","PSCID_FEL01.12","PSBDS_FEL01.01"
 					]},
-					{"type": "rps", "position": 29700, "name": "RPS_USA.02", "devices":[
+					{"type": "rps", "position": 29700, "name": "RPS_USA.02", "embedded":[
 						"PSTRMCB_FEL01.01","PSTRMCB_FEL01.02","PSTRMCB_FEL01.03","PSTRMCB_FEL01.04","PSCID_FEL01.13","PSCID_FEL01.14","PSCID_FEL01.15","PSCID_FEL01.16", "PSCID_FEL01.17","PSCID_FEL01.18","PSCID_FEL01.19","PSCID_FEL01.20", "PSCID_FEL01.21","PSCID_FEL01.22","PSCID_FEL01.23","PSCID_FEL01.24", "PSCID_FEL01.25","PSCID_FEL01.26","PSCID_FEL01.27","PSCID_FEL01.28","PSBDS_FEL01.02"
 					]},
-					{"type": "rps", "position": 29100, "name": "RPS_USA.03", "devices":[
+					{"type": "rps", "position": 29100, "name": "RPS_USA.03", "embedded":[
 						"PSCV_IUFEL01.01","PSCH_IUFEL01.01","PSCV_IUFEL01.02","PSCH_IUFEL01.02", "PSCV_IUFEL01.03","PSCH_IUFEL01.03","PSCV_IUFEL01.04","PSCH_IUFEL01.04", "PSQ_IUFEL01.01","PSQ_IUFEL01.02","PSQ_IUFEL01.03","PSQ_IUFEL01.04", "PSQ_IUFEL01.05","PSQ_IUFEL01.06","PSQ_IUFEL01.07","PSQ_IUFEL01.08", "PSQ_FEL02.01","PSQ_FEL02.02","PSQ_FEL02.03","PSQ_FEL02.04"
 					]},
-					{"type": "rps", "position": 28500, "name": "RPS_USA.04", "devices":[
+					{"type": "rps", "position": 28500, "name": "RPS_USA.04", "embedded":[
 						"PSCV_IUFEL01.05","PSCH_IUFEL01.05","PSCV_IUFEL01.06","PSCH_IUFEL01.06", "PSCV_IUFEL01.07","PSCH_IUFEL01.07","PSCV_IUFEL01.08","PSCH_IUFEL01.08", "PSTRMCB_FEL02.01","PSTRMCB_FEL02.01","PSTRMCB_FEL02.03","PSTRMCB_FEL02.04", "PSTRMCW_FEL02.01","PSTRMCW_FEL02.02","PSCV_FEL02.01","PSCH_FEL02.01", "PSCV_FEL02.02","PSCH_FEL02.02","PSCV_FEL02.03","PSCH_FEL02.03"
 					]},
-					{"type": "rps", "position": 27900, "name": "RPS_USA.05", "devices":[
+					{"type": "rps", "position": 27900, "name": "RPS_USA.05", "embedded":[
 						"PSCV_FEL02.04","PSCH_FEL02.04","PSTRMCW_FEL02.03","PSTRMCW_FEL02.04", "PSCID_FEL02.01","PSCID_FEL02.02","PSCID_FEL02.03","PSCID_FEL02.04","PSCID_FEL02.05","PSCID_FEL02.06","PSCID_FEL02.07","PSCID_FEL02.08"
 					]},
-					{"type": "rv", "position": 27100, "name": "RV_USA.01", "devices":[
+					{"type": "rv", "position": 27100, "name": "RV_USA.01", "embedded":[
 						"PSSIP_USA.01","PSSIP55_FEL01.01","PSSIP55_IUFEL01.02","PSSIP55_IUFEL01.05","PSSIP55_IUFEL01.08",
 						"PSSIP_USA.02","GIP500_FEL01.01","PSSIP55_IUFEL01.03","PSSIP55_IUFEL01.06",
 						"PSSIP_USA.03","PSSIP55_FEL01.02","PSSIP55_IUFEL01.04","PSSIP55_IUFEL01.07",
@@ -2231,29 +2285,29 @@
 						"TPG_USA.02","VGPE_IUFEL01.02","VGPI_IUFEL01.02","VGPE_IUFEL01.03"
 				
 					]},
-					{"type": "rc", "position": 26500, "name": "RC_USA.01", "devices":["EC-PS-USA-01","USA YAMS 02","USA YAMS 07","SPIN_USA_01"]},
+					{"type": "rc", "position": 26500, "name": "RC_USA.01", "embedded":["EC-PS-USA-01","USA YAMS 02","USA YAMS 07","SPIN_USA_01"]},
 					
-					{"type": "rid", "position": 25900, "name": "RID_USA.01", "devices":["ID_FEL02.01"]},
-					{"type": "rid", "position": 25300, "name": "RID_USA.02", "devices":["ID_FEL02.02"]},
-					{"type": "rid", "position": 24700, "name": "RID_USA.03", "devices":["ID_FEL02.03"]},
-					{"type": "rid", "position": 24100, "name": "RID_USA.04", "devices":["ID_FEL01.01"]},
-					{"type": "rid", "position": 23500, "name": "RID_USA.05", "devices":["ID_FEL02.04"]},
+					{"type": "rid", "position": 25900, "name": "RID_USA.01", "embedded":["ID_FEL02.01"]},
+					{"type": "rid", "position": 25300, "name": "RID_USA.02", "embedded":["ID_FEL02.02"]},
+					{"type": "rid", "position": 24700, "name": "RID_USA.03", "embedded":["ID_FEL02.03"]},
+					{"type": "rid", "position": 24100, "name": "RID_USA.04", "embedded":["ID_FEL01.01"]},
+					{"type": "rid", "position": 23500, "name": "RID_USA.05", "embedded":["ID_FEL02.04"]},
 						
 
 					{"type": "rc", "position": 21500, "name": "RPHOM_USA.01"}, 
-					{"type": "rid", "position": 20900, "name": "RID_USA.07", "devices":["ID_FEL02.05"]},
-					{"type": "rid", "position": 20300, "name": "RID_USA.08", "devices":["ID_FEL01.03"]},
-					{"type": "rid", "position": 19700, "name": "RID_USA.09", "devices":["ID_FEL02.06"]},
-					{"type": "rid", "position": 19100, "name": "RID_USA.10", "devices":["ID_FEL01.04"]},
-					{"type": "rid", "position": 18500, "name": "RID_USA.11", "devices":["ID_FEL02.07"]},
-					{"type": "rid", "position": 17900, "name": "RID_USA.12", "devices":["ID_FEL01.05"]},
-					{"type": "rid", "position": 17300, "name": "RID_USA.13", "devices":["ID_FEL02.08"]},
-					{"type": "rid", "position": 16700, "name": "RID_USA.14", "devices":["ID_FEL01.06"]},
-					{"type": "rd", "position": 16100, "name": "RD_USA.01", "devices":[
+					{"type": "rid", "position": 20900, "name": "RID_USA.07", "embedded":["ID_FEL02.05"]},
+					{"type": "rid", "position": 20300, "name": "RID_USA.08", "embedded":["ID_FEL01.03"]},
+					{"type": "rid", "position": 19700, "name": "RID_USA.09", "embedded":["ID_FEL02.06"]},
+					{"type": "rid", "position": 19100, "name": "RID_USA.10", "embedded":["ID_FEL01.04"]},
+					{"type": "rid", "position": 18500, "name": "RID_USA.11", "embedded":["ID_FEL02.07"]},
+					{"type": "rid", "position": 17900, "name": "RID_USA.12", "embedded":["ID_FEL01.05"]},
+					{"type": "rid", "position": 17300, "name": "RID_USA.13", "embedded":["ID_FEL02.08"]},
+					{"type": "rid", "position": 16700, "name": "RID_USA.14", "embedded":["ID_FEL01.06"]},
+					{"type": "rd", "position": 16100, "name": "RD_USA.01", "embedded":[
 						"BAM_SFEL01.01","CBPM_FEL01.01","CBPM_FEL01.02","CBPM_IUFEL01.02","EC-CBPM-USA-01"
 					]},
-					{"type": "rc", "position": 15500, "name": "RC_USA.02", "devices":["EC-MPS-USA-01","MAST MPS_USA_01"]},
-					{"type": "rv", "position": 14700, "name": "RV_USA.02", "devices":[
+					{"type": "rc", "position": 15500, "name": "RC_USA.02", "embedded":["EC-MPS-USA-01","MAST MPS_USA_01"]},
+					{"type": "rv", "position": 14700, "name": "RV_USA.02", "embedded":[
 						"PSSIP_USA.04","PSSIP55_FEL02.01","PSSIP55_IUFEL02.01","PSSIP55_FEL02.03","PSSIP55_FEL02.05",
 						"PSSIP_USA.05","PSSIP55_FEL02.02","PSSIP55_IUFEL02.02","PSSIP55_FEL02.04","PSSIP55_FEL02.06",
 						"PSSIP_USA.06","PSSIP55_IUFEL02.03","PSSIP55_IUFEL02.05","PSSIP55_IUFEL02.07","PSSIP55_IUFEL02.09",
@@ -2264,16 +2318,16 @@
 						"sds-vac-usa-02"
 					]},
 
-					{"type": "rid", "position": 12700, "name": "RID_USA.15", "devices":["ID_FEL02.09"]},
-					{"type": "rid", "position": 12100, "name": "RID_USA.16", "devices":["ID_FEL01.07"]},
-					{"type": "rid", "position": 11500, "name": "RID_USA.17", "devices":["ID_FEL02.10"]},
+					{"type": "rid", "position": 12700, "name": "RID_USA.15", "embedded":["ID_FEL02.09"]},
+					{"type": "rid", "position": 12100, "name": "RID_USA.16", "embedded":["ID_FEL01.07"]},
+					{"type": "rid", "position": 11500, "name": "RID_USA.17", "embedded":["ID_FEL02.10"]},
 					
-					{"type": "rid", "position": 10300, "name": "RID_USA.19", "devices":["ID_FEL02.11"]},
+					{"type": "rid", "position": 10300, "name": "RID_USA.19", "embedded":["ID_FEL02.11"]},
 					{"type": "rc", "position": 9700, "name": "RPHOM_USA. 02"},
-					{"type": "rd", "position": 9100, "name": "RD_USA.02", "devices":[
+					{"type": "rd", "position": 9100, "name": "RD_USA.02", "embedded":[
 						"CBPM_IUFEL01.03","CBPM_IUFEL01.04","CBPM_IUFEL01.05","EC-IUFEL-USA-02"]},
-					{"type": "rc", "position": 8500, "name": "RC_USA.03", "devices":["EC-ID-USA-01","MASTIN_USA.01"]},
-					{"type": "rv", "position": 7700, "name": "RV_USA.03", "devices":[
+					{"type": "rc", "position": 8500, "name": "RC_USA.03", "embedded":["EC-ID-USA-01","MASTIN_USA.01"]},
+					{"type": "rv", "position": 7700, "name": "RV_USA.03", "embedded":[
 						"PSSIP_USA.14","PSSIP75_MBD_FEL01.01","PSSIP55_MBD_FEL01.05",
 						"PSSIP_USA.15","PSSIP55_MBD_FEL01.02","PSSIP55_MBD_FEL01.06",
 						"PSSIP_USA.16","PSSIP55_MBD_FEL01.03","PSSIP55_MBD_FEL01.07",
@@ -2288,27 +2342,27 @@
 						"MASTIN_USA.01" 
 					]},
 					
-					{"type": "rid", "position": 6500, "name": "RID_USA.21", "devices":["ID_FEL01.08"]},
-					{"type": "rid", "position": 5900, "name": "RID_USA.22", "devices":["ID_FEL01.09"]},
+					{"type": "rid", "position": 6500, "name": "RID_USA.21", "embedded":["ID_FEL01.08"]},
+					{"type": "rid", "position": 5900, "name": "RID_USA.22", "embedded":["ID_FEL01.09"]},
 
-					{"type": "rd", "position": 4300, "name": "RD_USA.03", "devices":[
+					{"type": "rd", "position": 4300, "name": "RD_USA.03", "embedded":[
 						"PSMSCR_FEL01.01","PSMSCR_EEHG_FEL01.01","PSMSCR_FEL01.02","PSMSCR_IUFEL01.02","PSMSCR_IUFEL01.03","PSMSCR_IUFEL01.04","PSMSCR_IUFEL01.06","PSMSCR_IUFEL01.08","PSMSCR_FEL02.01","PSMSCR_IUFEL02.02","PSMSCR_FEL02.02","PSMSCR_FEL02.03","PSMSCR_IUFEL02.03","PSMSCR_IUFEL02.05","PSMSCR_IUFEL02.07","PSMSCR_IUFEL02.08","PSMSCR_IUFEL02.09","EC-SE-USA-01","CMM-IUFEL-USA-01"
 					]},
-					{"type": "rc", "position": 3700, "name": "RC_USA.04", "devices":["EC-PS-USA-02","PDU-RC-USA-04"]},
-					{"type": "rps", "position": 3100, "name": "RPS_USA.06", "devices":[
+					{"type": "rc", "position": 3700, "name": "RC_USA.04", "embedded":["EC-PS-USA-02","PDU-RC-USA-04"]},
+					{"type": "rps", "position": 3100, "name": "RPS_USA.06", "embedded":[
 						"PSCID_FEL02.13","PSCID_FEL02.14","PSCID_FEL02.15","PSCID_FEL02.16", "PSCID_FEL02.17","PSCID_FEL02.18","PSCID_FEL02.19","PSCID_FEL02.20", "PSCID_FEL02.21","PSCID_FEL02.22","PSCID_FEL02.23","PSCID_FEL02.24", "PSCID_FEL02.25","PSCID_FEL02.26","PSCID_FEL02.27","PSCID_FEL02.28", "PSCID_FEL02.29","PSCID_FEL02.30","PSCID_FEL02.31","PSCID_FEL02.32", "PSCID_FEL02.33","PSCID_FEL02.34","PSCID_FEL02.35","PSCID_FEL02.36"
 					]},
-					{"type": "rps", "position": 2500, "name": "RPS_USA.07", "devices":[
+					{"type": "rps", "position": 2500, "name": "RPS_USA.07", "embedded":[
 						"PSCID_FEL02.37","PSCID_FEL02.38","PSCID_FEL02.39","PSCID_FEL02.40", "PSCID_FEL02.41","PSCID_FEL02.42","PSCID_FEL02.43","PSCID_FEL02.44", "PSCV_IUFEL02.01","PSCH_IUFEL02.01","PSCV_IUFEL02.02","PSCH_IUFEL02.02", "PSCV_IUFEL02.03","PSCH_IUFEL02.03","PSCV_IUFEL02.04","PSCH_IUFEL02.04"
 					]},
-					{"type": "rps", "position": 1900, "name": "RPS_USA.08", "devices":[
+					{"type": "rps", "position": 1900, "name": "RPS_USA.08", "embedded":[
 						"PSCV_IUFEL02.05","PSCH_IUFEL02.05","PSCV_IUFEL02.06","PSCH_IUFEL02.06", "PSCV_IUFEL02.07","PSCH_IUFEL02.07","PSCV_IUFEL02.08","PSCH_IUFEL02.08", "PSCV_IUFEL02.09","PSCH_IUFEL02.09","PSCV_IUFEL02.10","PSCH_IUFEL02.10", "PSQ_IUFEL02.01","PSQ_IUFEL02.02","PSQ_IUFEL02.03","PSQ_IUFEL02.04", "PSQ_IUFEL02.05","PSQ_IUFEL02.06","PSQ_IUFEL02.07","PSQ_IUFEL02.08", "PSQ_IUFEL02.09","PSQ_IUFEL02.10"
 					]},
-					{"type": "rd", "position": 1300, "name": "RD_USA.04", "devices":[
+					{"type": "rd", "position": 1300, "name": "RD_USA.04", "embedded":[
 						"CBPM_IUFEL01.06","CBPM_IUFEL01.07","CBPM_IUFEL01.08","EC-CBPM-USA-02"
 					]},
-					{"type": "rc", "position": 700, "name": "RC_USA.05", "devices":["EC-VAC-USA-01","SPIN_USA.02"]},
-					{"type": "rv", "position": -100, "name": "RV_USA.04", "devices":[
+					{"type": "rc", "position": 700, "name": "RC_USA.05", "embedded":["EC-VAC-USA-01","SPIN_USA.02"]},
+					{"type": "rv", "position": -100, "name": "RV_USA.04", "embedded":[
 						"PSSIP_USA.21","PSSIP75_MBD.01","PSSIP150_MBD.02",
 						"PSSIP_USA.22","PSSIP150_MBD.01",
 						"TPG_USA.10","VGPE_MBD.01","VGPI_MBD.01","VGPE_MBD.02",
@@ -2325,13 +2379,13 @@
 			{
 				"start": {"x": 108000, "y": 100, "z": -1600},
 				"components": [
-					{"type": "rpsb", "position": 1000, "name": "RPS_ESA.02", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rpsb", "position": 1000, "name": "RPS_ESA.02", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
 						"PSB_MBDFEL01.01"
 					]},
-					{"type": "rpsb", "position": 2000, "name": "RPS_ESA.03", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rpsb", "position": 2000, "name": "RPS_ESA.03", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
 						"PSB_MBDFEL02.01"
 					]},					
-					{"type": "rps", "position": 2300, "name": "RPS_ESA.04", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rps", "position": 2300, "name": "RPS_ESA.04", "labelReverse": [90, 950, 300], "embedded":[
 						"sw-ps-esa-01","PSQ_MBDFEL01.01","PSQ_MBDFEL01.02","PSQ_MBDFEL01.03","PSQ_MBDFEL01.04", "PSQ_MBDFEL01.05","PSQ_MBDFEL01.06", "PSQ_MBDFEL02.01","PSQ_MBDFEL02.02","PSQ_MBDFEL02.03","PSQ_MBDFEL02.04", "PSQ_MBD.01","PSQ_MBD.02","PSQ_MBD.03","PSQ_MBD.04"
 					]},
 					{"type": "rc", "position": 2900, "name": "RC_ESA.01", "labelReverse": [90, 950, 300]}
@@ -2346,13 +2400,13 @@
 			{
 				"start": {"x": 110000, "y": 100, "z": -1400},
 				"components": [
-					{"type": "rps", "position": 300, "name": "RPS_ESA.05", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rps", "position": 300, "name": "RPS_ESA.05", "labelReverse": [90, 950, 300], "embedded":[
 						"sw-ps-esa-02","PSCV_MBDFEL01.01","PSCH_MBDFEL01.01","PSCV_MBDFEL01.02","PSCH_MBDFEL01.02", "PSCV_MBDFEL01.03","PSCH_MBDFEL01.03","PSCV_MBDFEL01.04","PSCH_MBDFEL01.04", "PSCV_MBDFEL02.01","PSCH_MBDFEL02.01","PSCH_MBDFEL02.02","PSCH_MBDFEL02.02", "PSCV_MBD.02","PSCH_MBD.02"
 					]},
-					{"type": "rc", "position": 900, "name": "RC_ESA.02", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rc", "position": 900, "name": "RC_ESA.02", "labelReverse": [90, 950, 300], "embedded":[
 						"CMM-PS-ESA-01","sw-c-esa-02","ESA/YAMS/11","PDU-RC-ESA-02"
 					]},
-					{"type": "rv", "position": 1700, "name": "RV_ESA.01", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rv", "position": 1700, "name": "RV_ESA.01", "labelReverse": [90, 950, 300], "embedded":[
 						"PSSIP_ESA.05","PSSIP300_POS_F01.01","PSSIP300_POS_F01.02",
 						"PSSIP_ESA.06","PSSIP300_POS_F02.01","PSSIP300_POS_F02.02",
 						"PSSIP_ESA.07","PSSIP300_POS.01","PSSIP300_POS.03",
@@ -2362,7 +2416,7 @@
 						"MAX_ESA.07","VGFR_PFE.02","VGFR_I0_PFE.01","VGHP_G1_PFE.01","VGHP_G2_PFE.01","VGHP_G3_PFE.01","VGHP_G4_PFE.01",
 						"sds-vac-esa-01"
 					]},
-					{"type": "rv", "position": 2500, "name": "RV_ESA.02", "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rv", "position": 2500, "name": "RV_ESA.02", "labelReverse": [90, 950, 300], "embedded":[
 						"PSSIP_ESA.01","PSSIP150_PFE_F01.01","PSSIP150_PFE_F01.02",
 						"PSSIP_ESA.02","PSSIP300_PFE_F01.01","PSSIP20_PFE_F01.01",
 						"PSSIP_ESA.03","PSSIP150_PFE_F02.01","PSSIP150_PFE_F02.02",
@@ -2390,14 +2444,14 @@
 			{
 				"start": {"x": 112000, "y": 100, "z": -1400},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_ESA.03", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rc", "position": 0, "name": "RC_ESA.03", "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
 						"SPAC_ESA.01","SPAC_ESA.02", "SPW_ESA.01", "pdu-rc-esa-03"
 					]},
 					{"type": "rv", "position": 600, "name": "RV_ESA.03", "labelReverse": [90, 950, 300]},
-					{"type": "rc", "position": 1400, "name": "RC_ESA.04", "devices":["PDU-RC-ESA-04"], "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "devices":[
+					{"type": "rc", "position": 1400, "name": "RC_ESA.04", "embedded":["PDU-RC-ESA-04"], "width": 800, "height": 2000, "depth": 800, "labelReverse": [90, 950, 300], "embedded":[
 						"sw-c-esa-04", "pdu-rc-esa-04"
 					]},
-					{"type": "rd", "position": 2000, "name": "RD_ESA.01", "labelReverse": [90, 950, 300], "devices": [
+					{"type": "rd", "position": 2000, "name": "RD_ESA.01", "labelReverse": [90, 950, 300], "embedded": [
 						"sw-c-esa-05","sw-mscr-esa-01","sw-bpm-esa-01","ec-bpm-esa-01","CM_SFEL01.01", "CM_SFEL02.01", "CM_MBD_FEL01.01", "BPM_MBD_FEL01.01", "PSMSCR_MBD_FEL01.01", "BPM_MBD_FEL01.02", "BPM_MBD_FEL01.03", "CM_MBD_FEL02.01", "BPM_MBD_FEL02.01", "PSMSCR_MBD_FEL02.01", "BPM_MBD_FEL02.02", "BPM_MBD.01", "BPM_MBD.02", "BPM_MBD.03", "CM_MBD.01", "PSMSCR_MBD.01","EC-BPM-ESA-01","LIBERA_BPM_IUFEL01.01","LIBERA_BPM_MBD01.02","LIBERA_BPM_MBD02.01","LIBERA_BPM_MBD01.01","LIBERA_BPM_IUFEL02.02","LIBERA_BPM_MBD01.03","LIBERA_BPM_MBD02.02","LIBERA_BPM_MBD01","LIBERA_BPM_MBD02","LIBERA_BPM_MBD03"
 					]}
 				]
@@ -2411,13 +2465,13 @@
 			{
 				"start": {"x": 114000, "y": 100, "z": -1400},
 				"components": [
-					{"type": "rps", "position": 300, "name": "RPS_ESA_PAD.01", "labelReverse": [40, 1250, 300], "devices":[
+					{"type": "rps", "position": 300, "name": "RPS_ESA_PAD.01", "labelReverse": [40, 1250, 300], "embedded":[
 						"ESA/YAMS/01","ESA/YAMS/02","ESA/YAMS/03","ESA/YAMS/04","ESA/YAMS/05","ESA/YAMS/06","PDU-RPS-ESA-PAD-01"
 					]},
-					{"type": "rps", "position": 900, "name": "RPS_ESA_PAD.02", "labelReverse": [40, 1250, 300], "devices":[
+					{"type": "rps", "position": 900, "name": "RPS_ESA_PAD.02", "labelReverse": [40, 1250, 300], "embedded":[
 						"ESA/YAMS/TF08","ESA/YAMS/TF09","ESA/YAMS/TF10","yams-esa-10","PDU-RPS-ESA-PAD-02"
 					]},
-					{"type": "rc", "position": 1500, "name": "RC_ESA_PAD.05", "labelReverse": [40, 1250, 300], "devices":[
+					{"type": "rc", "position": 1500, "name": "RC_ESA_PAD.05", "labelReverse": [40, 1250, 300], "embedded":[
 						"CMM-PADRES-ESA-01","PDU-RC-ESA-05", "srv-ccd-padres-01"
 					]}
 				]
@@ -2431,13 +2485,13 @@
 			{
 				"start": {"x": 116000, "y": 100, "z": -1600},
 				"components": [
-					{"type": "rtf", "position": 0, "name": "RTF_ESA.01", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rtf", "position": 0, "name": "RTF_ESA.01", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"PLC TERAFERMI"
 					]},
-					{"type": "rc", "position": 900, "name": "RC_ESA_TF.02", "devices":[
+					{"type": "rc", "position": 900, "name": "RC_ESA_TF.02", "embedded":[
 						"ESA/YAMS/TF01","ESA/YAMS/TF02","ESA/YAMS/TF03","ESA/YAMS/TF04","ESA/YAMS/TF05","ESA/YAMS/TF06"
 					]},
-					{"type": "rc", "position": 1500, "name": "RC_ESA_TF.01", "width": 800, "height": 2000, "depth": 800, "devices":[
+					{"type": "rc", "position": 1500, "name": "RC_ESA_TF.01", "width": 800, "height": 2000, "depth": 800, "embedded":[
 						"CMM-TF-ESA-01","PDU-RC-TF-01", "sw-c-tf-01", "sw-tf-esa-01"
 					]}
 				]
-- 
GitLab