From f9c8d709a9155c7e37c055bf3d85844e6d230f91 Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Wed, 18 Sep 2024 03:26:26 +0000
Subject: [PATCH] Update elettra2_lattice.json

---
 elettra2_lattice.json | 2127 +++++++++++++++++++++--------------------
 1 file changed, 1074 insertions(+), 1053 deletions(-)

diff --git a/elettra2_lattice.json b/elettra2_lattice.json
index 5850585..bd512da 100644
--- a/elettra2_lattice.json
+++ b/elettra2_lattice.json
@@ -979,34 +979,33 @@
 		"sections": [
 			{
 				"start": {"x": 41395, "z": -780},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S01.01", "devices":["TRCEB_S01.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S01.01", "embedded":["TRCEB_S01.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S01.02", "devices":["CEH_S01.03","CEV_S01.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S01.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S01.02"},
-					{"type": "sextupole_CHV", "position": 1150, "name": "SF_S01.02", "devices":["CEH_S01.04","CEV_S01.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S01.03"},
-					{"type": "bpm", "position": 1569, "name": "BPM_S01.04"},
-					{"type": "sextupole_CHV", "position": 1669, "name": "SD_S01.03", "devices":["CEH_S01.05","CEV_S01.05"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S01.02"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S01.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S01.02", "embedded":["CEH_S01.03","CEV_S01.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S01.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S01.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S01.02", "embedded":["CEH_S01.04","CEV_S01.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S01.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S01.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S01.03", "embedded":["CEH_S01.05","CEV_S01.05"]},
+					{"type": "corrector", "position": 1750, "name": "CFHV_S01.02"}
 				]
 			},
 			{
 				"start": {"x": 41311, "z": 1498},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S01.02", "devices":["TRCEB_S01.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S01.02", "embedded":["TRCEB_S01.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S01.04", "devices":["CEH_S01.06","CEV_S01.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S01.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S01.03", "devices":["CEH_S01.07","CEV_S01.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S01.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S01.01", "devices":["CEH_S01.08","CEV_S01.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S01.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S01.05", "devices":["QS_S01.01","CEV_S01.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S01.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S01.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S01.04", "embedded":["CEH_S01.06","CEV_S01.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S01.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S01.03", "embedded":["CEH_S01.07","CEV_S01.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S01.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S01.01", "embedded":["CEH_S01.08","CEV_S01.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S01.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S01.05", "embedded":["QS_S01.01","CEV_S01.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S01.03"}
+					
 				]
 			},
 			{
@@ -1014,24 +1013,28 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S01.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S01.02", "devices":["QD_S01.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S01.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S01.01", "devices":["CEH_S01.10","CEV_S01.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S01.02"},
-					{"type": "shutter_QK", "position": 1329, "name": "SH_S01.02", "devices":["QS_S01.02","CEV_S01.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S01.02"},
-					{"type": "corrector", "position": 4079, "name": "CV_S01.01"},
-					{"type": "bpm", "position": 4179, "name": "BPM_S01.07"},
-					{"type": "undulator", "position": 4279, "name": "ID_S01.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S01.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S01.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S01.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S01.03", "devices":["QS_S01.03","CEV_S01.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S01.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S01.04", "devices":["CEH_S01.13","CEV_S01.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S01.03", "devices":["QD_S01.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S01.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S01.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S01.02", "embedded":["QD_S01.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S01.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S01.01", "embedded":["CEH_S01.10","CEV_S01.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S01.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S01.02", "embedded":["QS_S01.02","CEV_S01.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S01.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S01.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S01.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S01.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S01.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S01.08"},
+					{"type": "corrector", "position": 5989, "name": "CHV_S01.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S01.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S01.03", "embedded":["QS_S01.03","CEV_S01.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S01.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S01.04", "embedded":["CEH_S01.13","CEV_S01.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S01.03", "embedded":["QD_S01.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S01.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S01.04"}
+					
 				]
 			},
 			{
@@ -1039,81 +1042,78 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S01.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S01.06", "devices":["QS_S01.04","CEV_S01.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S01.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S01.04", "devices":["CEH_S01.15","CEV_S01.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S01.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S01.04", "devices":["CEH_S01.16","CEV_S01.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S01.05"},
-					{"type": "sextupole_CHV", "position": 1761, "name": "SD_S01.07", "devices":["CEH_S01.17","CEV_S01.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S01.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S01.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S01.06", "embedded":["QS_S01.04","CEV_S01.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S01.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S01.04", "embedded":["CEH_S01.15","CEV_S01.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S01.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S01.04", "embedded":["CEH_S01.16","CEV_S01.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S01.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S01.07", "embedded":["CEH_S01.17","CEV_S01.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S01.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S01.05"}
 				]
 			},
 			{
 				"start": {"x": 38664, "z": 14627},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S01.05", "devices":["TRCEB_S01.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S01.05", "embedded":["TRCEB_S01.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S01.08", "devices":["CEH_S01.18","CEV_S01.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S01.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S01.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S01.05", "devices":["CEH_S01.19","CEV_S01.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S01.07"},
-					{"type": "bpm", "position": 1571, "name": "BPM_S01.13"},
-					{"type": "sextupole_CHV", "position": 1671, "name": "SD_S01.09", "devices":["CEH_S01.20","CEV_S01.20"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S01.06"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S01.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S01.08", "embedded":["CEH_S01.18","CEV_S01.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S01.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S01.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S01.05", "embedded":["CEH_S01.19","CEV_S01.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S01.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S01.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S01.09", "embedded":["CEH_S01.20","CEV_S01.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S01.06"}
 				]
 			},
 			{
 				"start": {"x": 37858, "z": 16760},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S01.06", "devices":["TRCEB_S01.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S01.06", "embedded":["TRCEB_S01.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S01.10", "devices":["CEH_S01.21","CEV_S01.21"]},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S01.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S01.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S01.06", "devices":["CEH_S01.22","CEV_S01.22"]},
-					{"type": "undulator", "position": 2431, "name": "SHID_S02.01"},
-					{"type": "sextupole_CHV", "position": 2531, "name": "SF_S02.01", "devices":["CEH_S02.01","CEV_S02.01"]},
-					{"type": "bpm", "position": 2681, "name": "BPM_S02.01"},
-					{"type": "quadrupole", "position": 2781, "name": "QAB_S02.01"},
-					{"type": "sextupole_CHV", "position": 3031, "name": "SD_S02.01", "devices":["CEH_S02.02","CEV_S02.02"]},
-					{"type": "corrector", "position": 3441, "name": "CFH_S02.01"},
-					{"type": "corrector", "position": 3541, "name": "CFV_S02.01"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S01.10", "embedded":["CEH_S01.21","CEV_S01.21"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S01.08"},
+					{"type": "bpm", "position": 860, "name": "BPM_S01.14"},
+					{"type": "sextupole_CHV", "position":1000, "name": "SF_S01.06", "embedded":["CEH_S01.22","CEV_S01.22"]},
+					{"type": "undulator", "position": 1280, "name": "SHID_S02.01"},
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S02.01", "embedded":["CEH_S02.01","CEV_S02.01"]},
+					{"type": "bpm", "position": 2561, "name": "BPM_S02.01"},
+					{"type": "quadrupole", "position": 2700, "name": "QAB_S02.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S02.01", "embedded":["CEH_S02.02","CEV_S02.02"]},
+					{"type": "bpm", "position": 3065, "name": "BPM_S02.02"},
+					{"type": "corrector", "position": 3161, "name": "CFH_S02.01"}
 				]
 			},
 			{
 				"start": {"x": 36239, "z": 20021},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S02.01", "devices":["TRCEB_S02.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S02.01", "embedded":["TRCEB_S02.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S02.02", "devices":["CEH_S02.03","CEV_S02.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S02.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S02.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S02.02", "devices":["CEH_S02.04","CEV_S02.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S02.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S02.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S02.03", "devices":["CEH_S02.05","CEV_S02.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S02.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S02.02"}
+					{"type": "sextupole_CHV", "position": 551, "name": "SD_S02.02", "embedded":["CEH_S02.03","CEV_S02.03"]},
+					{"type": "bpm", "position": 700, "name": "BPM_S02.03"},
+					{"type": "quadrupole", "position": 850, "name": "QAB_S02.02"},
+					{"type": "sextupole_CHV", "position": 1101, "name": "SF_S02.02", "embedded":["CEH_S02.04","CEV_S02.04"]},
+					{"type": "quadrupole", "position": 1340, "name": "QAB_S02.03"},
+					{"type": "bpm", "position": 1480, "name": "BPM_S02.04"},
+					{"type": "sextupole_CHV", "position": 1630, "name": "SD_S02.03", "embedded":["CEH_S02.05","CEV_S02.05"]},
+					{"type": "corrector", "position": 1821, "name": "CFHV_S02.02"}
 				]
 			},
 			{
 				"start": {"x": 35027, "z": 21953},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S02.02", "devices":["TRCEB_S02.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S02.02", "embedded":["TRCEB_S02.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S02.04", "devices":["CEH_S02.06","CEV_S02.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S02.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S02.03", "devices":["CEH_S02.07","CEV_S02.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S02.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S02.01", "devices":["CEH_S02.08","CEV_S02.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S02.01"},
-					{"type": "sextupole_QK", "position": 1891, "name": "SD_S02.05", "devices":["QS_S02.01","CEV_S02.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S02.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S02.03"}
+					{"type": "sextupole_CHV", "position": 561, "name": "SD_S02.04", "embedded":["CEH_S02.06","CEV_S02.06"]},
+					{"type": "quadrupole", "position": 810, "name": "QAB_S02.04"},
+					{"type": "sextupole_CHV", "position": 1081, "name": "SF_S02.03", "embedded":["CEH_S02.07","CEV_S02.07"]},
+					{"type": "bpm", "position": 1221, "name": "BPM_S02.05"},
+					{"type": "octupole_CHV", "position": 1321, "name": "OCT_S02.01", "embedded":["CEH_S02.08","CEV_S02.08"]},
+					{"type": "quadrupole", "position": 1541, "name": "QF_S02.01"},
+					{"type": "sextupole_QK", "position": 1771, "name": "SD_S02.05", "embedded":["QS_S02.01","CEV_S02.09"]},
+					{"type": "corrector", "position": 1951, "name": "CFHV_S02.03"}
 				]
 			},
 			{
@@ -1121,24 +1121,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S02.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S02.02", "devices":["QD_S02.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S02.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S02.01", "devices":["CEH_S02.10","CEV_S02.10"]},
-					{"type": "quadrupole", "position": 1054, "name": "QF_S02.02"},
-					{"type": "shutter_QK", "position": 1330, "name": "SH_S02.02", "devices":["QS_S02.02","CEV_S02.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S02.02"},
-					{"type": "corrector", "position": 4080, "name": "CV_S02.01"},
-					{"type": "bpm", "position": 4180, "name": "BPM_S02.07"},
-					{"type": "undulator", "position": 4280, "name": "ID_S02.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S02.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S02.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S02.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S02.03", "devices":["QS_S02.03","CEV_S02.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S02.03"},
-					{"type": "shutter_CHV", "position": 7789, "name": "SH_S02.04", "devices":["CEH_S02.13","CEV_S02.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S02.03", "devices":["QD_S02.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S02.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S02.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S02.02", "embedded":["QD_S02.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S02.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S02.01", "embedded":["CEH_S02.10","CEV_S02.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S02.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S02.02", "embedded":["QS_S02.02","CEV_S02.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S02.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S02.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S02.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S02.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S02.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S02.08"},
+					{"type": "corrector", "position": 5989, "name": "CVV_S02.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S02.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S02.03", "embedded":["QS_S02.03","CEV_S02.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S02.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S02.04", "embedded":["CEH_S02.13","CEV_S02.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S02.03", "embedded":["QD_S02.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S02.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S02.04"}
 				]
 			},
 			{
@@ -1146,81 +1149,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S02.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S02.06", "devices":["QS_S02.04","CEV_S02.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S02.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S02.04", "devices":["CEH_S02.15","CEV_S02.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S02.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S02.04", "devices":["CEH_S02.16","CEV_S02.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S02.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S02.07", "devices":["CEH_S02.17","CEV_S02.17"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S02.05"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S02.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S02.06", "embedded":["QS_S02.04","CEV_S02.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S02.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S02.04", "embedded":["CEH_S02.15","CEV_S02.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S02.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S02.04", "embedded":["CEH_S02.16","CEV_S02.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S02.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S02.07", "embedded":["CEH_S02.17","CEV_S02.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S02.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S02.05"}
 				]
 			},
 			{
 				"start": {"x": 26170, "z": 31999},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S02.05", "devices":["TRCEB_S02.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S02.05", "embedded":["TRCEB_S02.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S02.08", "devices":["CEH_S02.18","CEV_S02.18"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S02.12"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S02.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S02.05", "devices":["CEH_S02.19","CEV_S02.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S02.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S02.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S02.09", "devices":["CEH_S02.20","CEV_S02.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S02.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S02.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S02.08", "embedded":["CEH_S02.18","CEV_S02.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S02.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S02.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S02.05", "embedded":["CEH_S02.19","CEV_S02.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S02.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S02.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S02.09", "embedded":["CEH_S02.20","CEV_S02.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S02.06"}
 				]
 			},
 			{
 				"start": {"x": 24405, "z": 33444},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S02.06", "devices":["TRCEB_S02.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S02.06", "embedded":["TRCEB_S02.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S02.10", "devices":["CEH_S02.21","CEV_S02.21"]},
+					{"type": "sextupole_CHV", "position": 610, "name": "SD_S02.10", "embedded":["CEH_S02.21","CEV_S02.21"]},
 					{"type": "quadrupole", "position": 860, "name": "QAB_S02.08"},
 					{"type": "bpm", "position": 1010, "name": "BPM_S02.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S02.06", "devices":["CEH_S02.22","CEV_S02.22"]},
+					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S02.06", "embedded":["CEH_S02.22","CEV_S02.22"]},
+					
 					{"type": "cavrf", "position": 1820, "name": "CAVRF_S03.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S03.01", "devices":["CEH_S03.01","CEV_S03.01"]},
-					{"type": "bpm", "position": 2679, "name": "BPM_S03.01"},
-					{"type": "quadrupole", "position": 2779, "name": "QAB_S03.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S03.01", "devices":["CEH_S03.02","CEV_S03.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S03.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S03.01"}
+					
+					{"type": "sextupole_CHV", "position": 2370, "name": "SF_S03.01", "embedded":["CEH_S03.01","CEV_S03.01"]},
+					{"type": "bpm", "position": 2529, "name": "BPM_S03.01"},
+					{"type": "quadrupole", "position": 2679, "name": "QAB_S03.01"},
+					{"type": "sextupole_CHV", "position": 2910, "name": "SD_S03.01", "embedded":["CEH_S03.02","CEV_S03.02"]},
+					{"type": "bpm", "position": 3060, "name": "BPM_S03.02"},
+					{"type": "corrector", "position": 3170, "name": "CFHV_S03.01"}
 				]
 			},
 			{
 				"start": {"x": 21373, "z": 35458},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S03.01", "devices":["TRCEB_S03.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S03.01", "embedded":["TRCEB_S03.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S03.02", "devices":["CEH_S03.03","CEV_S03.03"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S03.03"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S03.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S03.02", "devices":["CEH_S03.04","CEV_S03.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S03.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S03.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S03.03", "devices":["CEH_S03.05","CEV_S03.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S03.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S03.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S03.02", "embedded":["CEH_S03.03","CEV_S03.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S03.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S03.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S03.02", "embedded":["CEH_S03.04","CEV_S03.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S03.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S03.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S03.03", "embedded":["CEH_S03.05","CEV_S03.05"]},
+					{"type": "corrector", "position": 1750, "name": "CFHV_S03.02"}
 				]
 			},
 			{
 				"start": {"x": 19357, "z": 36526},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S03.02", "devices":["TRCEB_S03.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S03.02", "embedded":["TRCEB_S03.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 660, "name": "SD_S03.04", "devices":["CEH_S03.06","CEV_S03.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S03.04"},
-					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S03.03", "devices":["CEH_S03.07","CEV_S03.07"]},
-					{"type": "bpm", "position": 1320, "name": "BPM_S03.05"},
-					{"type": "octupole_CHV", "position": 1420, "name": "OCT_S03.01", "devices":["CEH_S03.08","CEV_S03.08"]},
-					{"type": "quadrupole", "position": 1640, "name": "QF_S03.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S03.05", "devices":["QS_S03.01","CEV_S03.09"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S03.03"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S03.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S03.04", "embedded":["CEH_S03.06","CEV_S03.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S03.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S03.03", "embedded":["CEH_S03.07","CEV_S03.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S03.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S03.01", "embedded":["CEH_S03.08","CEV_S03.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S03.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S03.05", "embedded":["QS_S03.01","CEV_S03.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S03.03"}
 				]
 			},
 			{
@@ -1228,24 +1230,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S03.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S03.02", "devices":["QD_S03.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S03.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S03.01", "devices":["CEH_S03.10","CEV_S03.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S03.02"},
-					{"type": "shutter_QK", "position": 1331, "name": "SH_S03.02", "devices":["QS_S03.02","CEV_S03.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S03.02"},
-					{"type": "corrector", "position": 4081, "name": "CV_S03.01"},
-					{"type": "bpm", "position": 4181, "name": "BPM_S03.07"},
-					{"type": "undulator", "position": 4281, "name": "ID_S03.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S03.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S03.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S03.03"},
-					{"type": "shutter_QK", "position": 7231, "name": "SH_S03.03", "devices":["QS_S03.03","CEV_S03.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S03.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S03.04", "devices":["CEH_S03.13","CEV_S03.13"]},
-					{"type": "octupole_QD", "position": 8016, "name": "OCT_S03.03", "devices":["QD_S03.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S03.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S03.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S03.02", "embedded":["QD_S03.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S03.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S03.01", "embedded":["CEH_S03.10","CEV_S03.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S03.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S03.02", "embedded":["QS_S03.02","CEV_S03.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S03.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S03.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S03.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S03.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S03.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S03.08"},
+					{"type": "corrector", "position": 5989, "name": "CHV_S03.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S03.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S03.03", "embedded":["QS_S03.03","CEV_S03.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S03.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S03.04", "embedded":["CEH_S03.13","CEV_S03.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S03.03", "embedded":["QD_S03.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S03.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S03.04"}
 				]
 			},
 			{
@@ -1253,81 +1258,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S03.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 551, "name": "SD_S03.06", "devices":["QS_S03.04","CEV_S03.14"]},
-					{"type": "quadrupole", "position": 781, "name": "QF_S03.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S03.04", "devices":["CEH_S03.15","CEV_S03.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S03.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S03.04", "devices":["CEH_S03.16","CEV_S03.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S03.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S03.07", "devices":["CEH_S03.17","CEV_S03.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S03.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S03.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S03.06", "embedded":["QS_S03.04","CEV_S03.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S03.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S03.04", "embedded":["CEH_S03.15","CEV_S03.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S03.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S03.04", "embedded":["CEH_S03.16","CEV_S03.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S03.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S03.07", "embedded":["CEH_S03.17","CEV_S03.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S03.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S03.05"}
 				]
 			},
 			{
 				"start": {"x": 6664, "z": 40797},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S03.05", "devices":["TRCEB_S03.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S03.05", "embedded":["TRCEB_S03.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S03.08", "devices":["CEH_S03.18","CEV_S03.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S03.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S03.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S03.05", "devices":["CEH_S03.19","CEV_S03.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S03.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S03.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S03.09", "devices":["CEH_S03.20","CEV_S03.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S03.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S03.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S03.08", "embedded":["CEH_S03.18","CEV_S03.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S03.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S03.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S03.05", "embedded":["CEH_S03.19","CEV_S03.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S03.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S03.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S03.09", "embedded":["CEH_S03.20","CEV_S03.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S03.06"}
 				]
 			},
 			{
 				"start": {"x": 4413, "z": 41166},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S03.06", "devices":["TRCEB_S03.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S03.06", "embedded":["TRCEB_S03.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S03.10", "devices":["CEH_S03.21","CEV_S03.21"]},
+					{"type": "sextupole_CHV", "position": 610, "name": "SD_S03.10", "embedded":["CEH_S03.21","CEV_S03.21"]},
 					{"type": "quadrupole", "position": 860, "name": "QAB_S03.08"},
 					{"type": "bpm", "position": 1010, "name": "BPM_S03.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S03.06", "devices":["CEH_S03.22","CEV_S03.22"]},
+					{"type": "sextupole_CHV", "position": 1170, "name": "SF_S03.06", "embedded":["CEH_S03.22","CEV_S03.22"]},
+					
 					{"type": "cavrf", "position": 1819, "name": "CAVRF_S04.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S04.01", "devices":["CEH_S04.01","CEV_S04.01"]},
-					{"type": "bpm", "position": 2680, "name": "BPM_S04.01"},
-					{"type": "quadrupole", "position": 2780, "name": "QAB_S04.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S04.01", "devices":["CEH_S04.02","CEV_S04.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S04.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S04.01"}
+					
+					{"type": "sextupole_CHV", "position": 2370, "name": "SF_S04.01", "embedded":["CEH_S04.01","CEV_S04.01"]},
+					{"type": "bpm", "position": 2529, "name": "BPM_S04.01"},
+					{"type": "quadrupole", "position": 2679, "name": "QAB_S04.01"},
+					{"type": "sextupole_CHV", "position": 2910, "name": "SD_S04.01", "embedded":["CEH_S04.02","CEV_S04.02"]},
+					{"type": "bpm", "position": 3060, "name": "BPM_S04.02"},
+					{"type": "corrector", "position": 3170, "name": "CFV_S04.01"}
 				]
 			},
 			{
 				"start": {"x": 780, "z": 41395},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S04.01", "devices":["TRCEB_S04.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S04.01", "embedded":["TRCEB_S04.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S04.02", "devices":["CEH_S04.03","CEV_S04.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S04.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S04.02"},
-					{"type": "sextupole_CHV", "position": 1150, "name": "SF_S04.02", "devices":["CEH_S04.04","CEV_S04.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S04.03"},
-					{"type": "bpm", "position": 1569, "name": "BPM_S04.04"},
-					{"type": "sextupole_CHV", "position": 1669, "name": "SD_S04.03", "devices":["CEH_S04.05","CEV_S04.05"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S04.02"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S04.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S04.02", "embedded":["CEH_S04.03","CEV_S04.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S04.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S04.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S04.02", "embedded":["CEH_S04.04","CEV_S04.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S04.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S04.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S04.03", "embedded":["CEH_S04.05","CEV_S04.05"]},
+					{"type": "corrector", "position": 2080, "name": "CFHV_S04.02"}
 				]
 			},
 			{
 				"start": {"x": -1498, "z": 41311},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S04.02", "devices":["TRCEB_S04.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S04.02", "embedded":["TRCEB_S04.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S04.04", "devices":["CEH_S04.06","CEV_S04.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S04.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S04.03", "devices":["CEH_S04.07","CEV_S04.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S04.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S04.01", "devices":["CEH_S04.08","CEV_S04.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S04.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S04.05", "devices":["QS_S04.01","CEV_S04.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S04.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S04.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S04.04", "embedded":["CEH_S04.06","CEV_S04.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S04.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S04.03", "embedded":["CEH_S04.07","CEV_S04.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S04.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S04.01", "embedded":["CEH_S04.08","CEV_S04.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S04.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S04.05", "embedded":["QS_S04.01","CEV_S04.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFH_S04.03"}
 				]
 			},
 			{
@@ -1335,24 +1339,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S04.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S04.02", "devices":["QD_S04.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S04.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S04.01", "devices":["CEH_S04.10","CEV_S04.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S04.02"},
-					{"type": "shutter_QK", "position": 1329, "name": "SH_S04.02", "devices":["QS_S04.02","CEV_S04.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S04.02"},
-					{"type": "corrector", "position": 4079, "name": "CV_S04.01"},
-					{"type": "bpm", "position": 4179, "name": "BPM_S04.07"},
-					{"type": "undulator", "position": 4279, "name": "ID_S04.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S04.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S04.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S04.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S04.03", "devices":["QS_S04.03","CEV_S04.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S04.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S04.04", "devices":["CEH_S04.13","CEV_S04.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S04.03", "devices":["QD_S04.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S04.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S04.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S04.02", "embedded":["QD_S04.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S04.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S04.01", "embedded":["CEH_S04.10","CEV_S04.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S04.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S04.02", "embedded":["QS_S04.02","CEV_S04.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S04.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S04.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S04.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S04.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S04.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S04.08"},
+					{"type": "corrector", "position": 5989, "name": "CHV_S04.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S04.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S04.03", "embedded":["QS_S04.03","CEV_S04.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S04.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S04.04", "embedded":["CEH_S04.13","CEV_S04.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S04.03", "embedded":["QD_S04.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S04.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S04.04"}
 				]
 			},
 			{
@@ -1360,81 +1367,78 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S04.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S04.06", "devices":["QS_S04.04","CEV_S04.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S04.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S04.04", "devices":["CEH_S04.15","CEV_S04.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S04.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S04.04", "devices":["CEH_S04.16","CEV_S04.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S04.05"},
-					{"type": "sextupole_CHV", "position": 1761, "name": "SD_S04.07", "devices":["CEH_S04.17","CEV_S04.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S04.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S04.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S04.06", "embedded":["QS_S04.04","CEV_S04.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S04.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S04.04", "embedded":["CEH_S04.15","CEV_S04.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S04.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S04.04", "embedded":["CEH_S04.16","CEV_S04.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S04.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S04.07", "embedded":["CEH_S04.17","CEV_S04.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S04.11"},
+					{"type": "corrector", "position": 1900, "name": "CFV_S04.05"}
 				]
 			},
 			{
 				"start": {"x": -14627, "z": 38664},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S04.05", "devices":["TRCEB_S04.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S04.05", "embedded":["TRCEB_S04.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S04.08", "devices":["CEH_S04.18","CEV_S04.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S04.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S04.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S04.05", "devices":["CEH_S04.19","CEV_S04.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S04.07"},
-					{"type": "bpm", "position": 1571, "name": "BPM_S04.13"},
-					{"type": "sextupole_CHV", "position": 1671, "name": "SD_S04.09", "devices":["CEH_S04.20","CEV_S04.20"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S04.06"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S04.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S04.08", "embedded":["CEH_S04.18","CEV_S04.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S04.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S04.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S04.05", "embedded":["CEH_S04.19","CEV_S04.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S04.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S04.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S04.09", "embedded":["CEH_S04.20","CEV_S04.20"]},
+					{"type": "corrector", "position": 2080, "name": "CFHV_S04.06"}
 				]
 			},
 			{
 				"start": {"x": -16760, "z": 37858},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S04.06", "devices":["TRCEB_S04.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S04.06", "embedded":["TRCEB_S04.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S04.10", "devices":["CEH_S04.21","CEV_S04.21"]},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S04.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S04.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S04.06", "devices":["CEH_S04.22","CEV_S04.22"]},
-					{"type": "undulator", "position": 2431, "name": "SHID_S05.01"},
-					{"type": "sextupole_CHV", "position": 2531, "name": "SF_S05.01", "devices":["CEH_S05.01","CEV_S05.01"]},
-					{"type": "bpm", "position": 2681, "name": "BPM_S05.01"},
-					{"type": "quadrupole", "position": 2781, "name": "QAB_S05.01"},
-					{"type": "sextupole_CHV", "position": 3031, "name": "SD_S05.01", "devices":["CEH_S05.02","CEV_S05.02"]},
-					{"type": "corrector", "position": 3441, "name": "CFH_S05.01"},
-					{"type": "corrector", "position": 3541, "name": "CFV_S05.01"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S04.10", "embedded":["CEH_S04.21","CEV_S04.21"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S04.08"},
+					{"type": "bpm", "position": 860, "name": "BPM_S04.14"},
+					{"type": "sextupole_CHV", "position": 1000, "name": "SF_S04.06", "embedded":["CEH_S04.22","CEV_S04.22"]},
+					{"type": "undulator", "position": 1280, "name": "SHID_S05.01"},
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S05.01", "embedded":["CEH_S05.01","CEV_S05.01"]},
+					{"type": "bpm", "position": 2561, "name": "BPM_S05.01"},
+					{"type": "quadrupole", "position": 2700, "name": "QAB_S05.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S05.01", "embedded":["CEH_S05.02","CEV_S05.02"]},
+					{"type": "bpm", "position": 3065, "name": "BPM_S05.02"},
+					{"type": "corrector", "position": 3161, "name": "CFV_S05.01"}
 				]
 			},
 			{
 				"start": {"x": -20021, "z": 36239},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S05.01", "devices":["TRCEB_S05.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S05.01", "embedded":["TRCEB_S05.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S05.02", "devices":["CEH_S05.03","CEV_S05.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S05.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S05.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S05.02", "devices":["CEH_S05.04","CEV_S05.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S05.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S05.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S05.03", "devices":["CEH_S05.05","CEV_S05.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S05.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S05.02"}
+					{"type": "sextupole_CHV", "position": 551, "name": "SD_S05.02", "embedded":["CEH_S05.03","CEV_S05.03"]},
+					{"type": "bpm", "position": 700, "name": "BPM_S05.03"},
+					{"type": "quadrupole", "position": 850, "name": "QAB_S05.02"},
+					{"type": "sextupole_CHV", "position": 1101, "name": "SF_S05.02", "embedded":["CEH_S05.04","CEV_S05.04"]},
+					{"type": "quadrupole", "position": 1340, "name": "QAB_S05.03"},
+					{"type": "bpm", "position": 1480, "name": "BPM_S05.04"},
+					{"type": "sextupole_CHV", "position": 1630, "name": "SD_S05.03", "embedded":["CEH_S05.05","CEV_S05.05"]},
+					{"type": "corrector", "position": 1821, "name": "CFHV_S05.02"}
 				]
 			},
 			{
 				"start": {"x": -21953, "z": 35027},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S05.02", "devices":["TRCEB_S05.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S05.02", "embedded":["TRCEB_S05.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S05.04", "devices":["CEH_S05.06","CEV_S05.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S05.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S05.03", "devices":["CEH_S05.07","CEV_S05.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S05.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S05.01", "devices":["CEH_S05.08","CEV_S05.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S05.01"},
-					{"type": "sextupole_QK", "position": 1891, "name": "SD_S05.05", "devices":["QS_S05.01","CEV_S05.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S05.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S05.03"}
+					{"type": "sextupole_CHV", "position": 561, "name": "SD_S05.04", "embedded":["CEH_S05.06","CEV_S05.06"]},
+					{"type": "quadrupole", "position": 810, "name": "QAB_S05.04"},
+					{"type": "sextupole_CHV", "position": 1081, "name": "SF_S05.03", "embedded":["CEH_S05.07","CEV_S05.07"]},
+					{"type": "bpm", "position": 1221, "name": "BPM_S05.05"},
+					{"type": "octupole_CHV", "position": 1321, "name": "OCT_S05.01", "embedded":["CEH_S05.08","CEV_S05.08"]},
+					{"type": "quadrupole", "position": 1541, "name": "QF_S05.01"},
+					{"type": "sextupole_QK", "position": 1771, "name": "SD_S05.05", "embedded":["QS_S05.01","CEV_S05.09"]},
+					{"type": "corrector", "position": 1951, "name": "CFHV_S05.03"}
 				]
 			},
 			{
@@ -1442,29 +1446,31 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S05.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S05.02", "devices":["QD_S05.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S05.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S05.01", "devices":["CEH_S05.10","CEV_S05.10"]},
-					{"type": "quadrupole", "position": 1054, "name": "QF_S05.02"},
-					{"type": "shutter_QK", "position": 1330, "name": "SH_S05.02", "devices":["QS_S05.02","CEV_S05.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S05.02"},
-					{"type": "corrector", "position": 2430, "name": "CV_S05.01"},
-					{"type": "bpm", "position": 2530, "name": "BPM_S05.07"},
-					{"type": "mbf", "position": 2630, "name": "MBFLK_S05.01"},
-					{"type": "undulator", "position": 4280, "name": "ID_S05.01"},
-					{"type": "mbf", "position": 5947, "name": "MBFHK_S05.01"},
-					{"type": "mbf", "position": 6323, "name": "MBFVK_S05.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S05.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S05.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S05.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S05.03", "devices":["QS_S05.03","CEV_S05.12"]},
-					{"type": "bpm", "position": 7347, "name": "MBFBPM_S05.01"},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S05.03"},
-					{"type": "bpm", "position": 7667, "name": "MBFBPM_S05.02"},
-					{"type": "shutter_CHV", "position": 7789, "name": "SH_S05.04", "devices":["CEH_S05.13","CEV_S05.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S05.03", "devices":["QD_S05.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S05.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S05.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S05.02", "embedded":["QD_S05.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S05.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S05.01", "embedded":["CEH_S05.10","CEV_S05.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S05.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S05.02", "embedded":["QS_S05.02","CEV_S05.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S05.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S05.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S05.07"},
+					{"type": "lmbf", "position": 2530, "name": "MBFLK_S05.01"},
+					
+					{"type": "undulator", "position": 3079, "name": "ID_S05.01"},
+					
+					{"type": "tmbf", "position": 4547, "name": "MBFHVK_S05.01"},
+									
+					{"type": "bpm", "position": 5109, "name": "BPM_S05.08"},
+					{"type": "corrector", "position": 5349, "name": "CHV_S05.02"},
+					{"type": "quadrupole", "position": 5599, "name": "QD_S05.03"},
+					{"type": "sextupole_QK", "position": 5959, "name": "SH_S05.03", "embedded":["QS_S05.03","CEV_S05.12"]},
+					{"type": "bpm", "position": 6247, "name": "MBFBPM_S05.01"},
+					{"type": "quadrupole", "position": 6555, "name": "QF_S05.03"},
+					{"type": "bpm", "position": 6797, "name": "MBFBPM_S05.02"},
+					{"type": "sextupole_CHV", "position": 7079, "name": "SH_S05.04", "embedded":["CEH_S05.13","CEV_S05.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S05.03", "embedded":["QD_S05.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S02.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S05.04"}
 				]
 			},
 			{
@@ -1472,81 +1478,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S05.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S05.06", "devices":["QS_S05.04","CEV_S05.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S05.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S05.04", "devices":["CEH_S05.15","CEV_S05.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S05.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S05.04", "devices":["CEH_S05.16","CEV_S05.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S05.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S05.07", "devices":["CEH_S05.17","CEV_S05.17"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S05.05"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S05.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S05.06", "embedded":["QS_S05.04","CEV_S05.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S05.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S05.04", "embedded":["CEH_S05.15","CEV_S05.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S05.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S05.04", "embedded":["CEH_S05.16","CEV_S05.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S05.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S05.07", "embedded":["CEH_S05.17","CEV_S05.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S05.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S05.05"}
 				]
 			},
 			{
 				"start": {"x": -31999, "z": 26170},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S05.05", "devices":["TRCEB_S05.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S05.05", "embedded":["TRCEB_S05.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S05.08", "devices":["CEH_S05.18","CEV_S05.18"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S05.12"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S05.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S05.05", "devices":["CEH_S05.19","CEV_S05.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S05.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S05.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S05.09", "devices":["CEH_S05.20","CEV_S05.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S05.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S05.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S05.08", "embedded":["CEH_S05.18","CEV_S05.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S05.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S05.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S05.05", "embedded":["CEH_S05.19","CEV_S05.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S05.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S05.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S05.09", "embedded":["CEH_S05.20","CEV_S05.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S05.06"}
 				]
 			},
 			{
 				"start": {"x": -33444, "z": 24405},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S05.06", "devices":["TRCEB_S05.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S05.06", "embedded":["TRCEB_S05.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S05.10", "devices":["CEH_S05.21","CEV_S05.21"]},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S05.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S05.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S05.06", "devices":["CEH_S05.22","CEV_S05.22"]},
-					{"type": "undulator", "position": 2430, "name": "SHID_S06.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S06.01", "devices":["CEH_S06.01","CEV_S06.01"]},
-					{"type": "bpm", "position": 2679, "name": "BPM_S06.01"},
-					{"type": "quadrupole", "position": 2779, "name": "QAB_S06.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S06.01", "devices":["CEH_S06.02","CEV_S06.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S06.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S06.01"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S05.10", "embedded":["CEH_S05.21","CEV_S05.21"]},
+					{"type": "quadrupole", "position": 720, "name": "QAB_S05.08"},
+					{"type": "bpm", "position": 865, "name": "BPM_S05.14"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S05.06", "embedded":["CEH_S05.22","CEV_S05.22"]},
+					
+					{"type": "undulator", "position": 1290, "name": "SHID_S06.01"},
+					
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S06.01", "embedded":["CEH_S06.01","CEV_S06.01"]},
+					{"type": "bpm", "position": 2565, "name": "BPM_S06.01"},
+					{"type": "quadrupole", "position": 2710, "name": "QAB_S06.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S06.01", "embedded":["CEH_S06.02","CEV_S06.02"]},
+					{"type": "bpm", "position": 3070, "name": "BPM_S06.02"},
+					{"type": "corrector", "position": 3170, "name": "CFV_S06.01"}
 				]
 			},
 			{
 				"start": {"x": -35458, "z": 21373},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S06.01", "devices":["TRCEB_S06.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S06.01", "embedded":["TRCEB_S06.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S06.02", "devices":["CEH_S06.03","CEV_S06.03"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S06.03"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S06.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S06.02", "devices":["CEH_S06.04","CEV_S06.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S06.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S06.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S06.03", "devices":["CEH_S06.05","CEV_S06.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S06.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S06.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S06.02", "embedded":["CEH_S06.03","CEV_S06.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S06.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S06.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S06.02", "embedded":["CEH_S06.04","CEV_S06.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S06.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S06.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S06.03", "embedded":["CEH_S06.05","CEV_S06.05"]},
+					{"type": "corrector", "position": 1750, "name": "CFHV_S06.02"}
 				]
 			},
 			{
 				"start": {"x": -36526, "z": 19357},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S06.02", "devices":["TRCEB_S06.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S06.02", "embedded":["TRCEB_S06.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 660, "name": "SD_S06.04", "devices":["CEH_S06.06","CEV_S06.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S06.04"},
-					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S06.03", "devices":["CEH_S06.07","CEV_S06.07"]},
-					{"type": "bpm", "position": 1320, "name": "BPM_S06.05"},
-					{"type": "octupole_CHV", "position": 1420, "name": "OCT_S06.01", "devices":["CEH_S06.08","CEV_S06.08"]},
-					{"type": "quadrupole", "position": 1640, "name": "QF_S06.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S06.05", "devices":["QS_S06.01","CEV_S06.09"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S06.03"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S06.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S06.04", "embedded":["CEH_S06.06","CEV_S06.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S06.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S06.03", "embedded":["CEH_S06.07","CEV_S06.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S06.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S06.01", "embedded":["CEH_S06.08","CEV_S06.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S06.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S06.05", "embedded":["QS_S06.01","CEV_S06.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S06.03"}
 				]
 			},
 			{
@@ -1554,24 +1559,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S06.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S06.02", "devices":["QD_S06.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S06.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S06.01", "devices":["CEH_S06.10","CEV_S06.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S06.02"},
-					{"type": "shutter_QK", "position": 1331, "name": "SH_S06.02", "devices":["QS_S06.02","CEV_S06.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S06.02"},
-					{"type": "corrector", "position": 4081, "name": "CV_S06.01"},
-					{"type": "bpm", "position": 4181, "name": "BPM_S06.07"},
-					{"type": "undulator", "position": 4281, "name": "ID_S06.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S06.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S06.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S06.03"},
-					{"type": "shutter_QK", "position": 7231, "name": "SH_S06.03", "devices":["QS_S06.03","CEV_S06.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S06.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S06.04", "devices":["CEH_S06.13","CEV_S06.13"]},
-					{"type": "octupole_QD", "position": 8016, "name": "OCT_S06.03", "devices":["QD_S06.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S06.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S06.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S06.02", "embedded":["QD_S06.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S06.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S06.01", "embedded":["CEH_S06.10","CEV_S06.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S06.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S06.02", "embedded":["QS_S06.02","CEV_S06.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S06.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S06.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S06.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S06.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S06.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S06.08"},
+					{"type": "corrector", "position": 5989, "name": "CHV_S06.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S06.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S06.03", "embedded":["QS_S06.03","CEV_S06.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S06.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S06.04", "embedded":["CEH_S06.13","CEV_S06.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S06.03", "embedded":["QD_S06.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S06.09"},
+					{"type": "corrector", "position": 7839, "name": "CFFV_S06.04"}
 				]
 			},
 			{
@@ -1579,81 +1587,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S06.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 551, "name": "SD_S06.06", "devices":["QS_S06.04","CEV_S06.14"]},
-					{"type": "quadrupole", "position": 781, "name": "QF_S06.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S06.04", "devices":["CEH_S06.15","CEV_S06.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S06.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S06.04", "devices":["CEH_S06.16","CEV_S06.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S06.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S06.07", "devices":["CEH_S06.17","CEV_S06.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S06.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S06.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S06.06", "embedded":["QS_S06.04","CEV_S06.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S06.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S06.04", "embedded":["CEH_S06.15","CEV_S06.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S06.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S06.04", "embedded":["CEH_S06.16","CEV_S06.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S06.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S06.07", "embedded":["CEH_S06.17","CEV_S06.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S06.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S06.05"}
 				]
 			},
 			{
 				"start": {"x": -40797, "z": 6664},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S06.05", "devices":["TRCEB_S06.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S06.05", "embedded":["TRCEB_S06.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S06.08", "devices":["CEH_S06.18","CEV_S06.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S06.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S06.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S06.05", "devices":["CEH_S06.19","CEV_S06.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S06.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S06.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S06.09", "devices":["CEH_S06.20","CEV_S06.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S06.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S06.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S06.08", "embedded":["CEH_S06.18","CEV_S06.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S06.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S06.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S06.05", "embedded":["CEH_S06.19","CEV_S06.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S06.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S06.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S06.09", "embedded":["CEH_S06.20","CEV_S06.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S06.06"}
 				]
 			},
 			{
 				"start": {"x": -41166, "z": 4413},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S06.06", "devices":["TRCEB_S06.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S06.06", "embedded":["TRCEB_S06.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S06.10", "devices":["CEH_S06.21","CEV_S06.21"]},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S06.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S06.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S06.06", "devices":["CEH_S06.22","CEV_S06.22"]},
-					{"type": "undulator", "position": 2430, "name": "SHID_S07.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S07.01", "devices":["CEH_S07.01","CEV_S07.01"]},
-					{"type": "bpm", "position": 2680, "name": "BPM_S07.01"},
-					{"type": "quadrupole", "position": 2780, "name": "QAB_S07.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S07.01", "devices":["CEH_S07.02","CEV_S07.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S07.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S07.01"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S06.10", "embedded":["CEH_S06.21","CEV_S06.21"]},
+					{"type": "quadrupole", "position": 720, "name": "QAB_S06.08"},
+					{"type": "bpm", "position": 865, "name": "BPM_S06.14"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S06.06", "embedded":["CEH_S06.22","CEV_S06.22"]},
+					
+					{"type": "undulator", "position": 1290, "name": "SHID_S07.01"},
+					
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S07.01", "embedded":["CEH_S07.01","CEV_S07.01"]},
+					{"type": "bpm", "position": 2565, "name": "BPM_S07.01"},
+					{"type": "quadrupole", "position": 2710, "name": "QAB_S07.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S07.01", "embedded":["CEH_S07.02","CEV_S07.02"]},
+					{"type": "bpm", "position": 3070, "name": "BPM_S07.02"},
+					{"type": "corrector", "position": 3170, "name": "CFV_S07.01"}
 				]
 			},
 			{
 				"start": {"x": -41395, "z": 780},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S07.01", "devices":["TRCEB_S07.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S07.01", "embedded":["TRCEB_S07.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S07.02", "devices":["CEH_S07.03","CEV_S07.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S07.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S07.02"},
-					{"type": "sextupole_CHV", "position": 1150, "name": "SF_S07.02", "devices":["CEH_S07.04","CEV_S07.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S07.03"},
-					{"type": "bpm", "position": 1569, "name": "BPM_S07.04"},
-					{"type": "sextupole_CHV", "position": 1669, "name": "SD_S07.03", "devices":["CEH_S07.05","CEV_S07.05"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S07.02"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S07.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S07.02", "embedded":["CEH_S07.03","CEV_S07.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S07.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S07.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S07.02", "embedded":["CEH_S07.04","CEV_S07.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S07.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S07.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S07.03", "embedded":["CEH_S07.05","CEV_S07.05"]},
+					{"type": "corrector", "position": 1750, "name": "CFHV_S07.02"}
 				]
 			},
 			{
 				"start": {"x": -41311, "z": -1498},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S07.02", "devices":["TRCEB_S07.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S07.02", "embedded":["TRCEB_S07.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S07.04", "devices":["CEH_S07.06","CEV_S07.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S07.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S07.03", "devices":["CEH_S07.07","CEV_S07.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S07.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S07.01", "devices":["CEH_S07.08","CEV_S07.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S07.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S07.05", "devices":["QS_S07.01","CEV_S07.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S07.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S07.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S07.04", "embedded":["CEH_S07.06","CEV_S07.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S07.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S07.03", "embedded":["CEH_S07.07","CEV_S07.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S07.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S07.01", "embedded":["CEH_S07.08","CEV_S07.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S07.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S07.05", "embedded":["QS_S07.01","CEV_S07.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S07.03"}
 				]
 			},
 			{
@@ -1661,24 +1668,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S07.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S07.02", "devices":["QD_S07.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S07.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S07.01", "devices":["CEH_S07.10","CEV_S07.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S07.02"},
-					{"type": "shutter_QK", "position": 1329, "name": "SH_S07.02", "devices":["QS_S07.02","CEV_S07.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S07.02"},
-					{"type": "corrector", "position": 4079, "name": "CV_S07.01"},
-					{"type": "bpm", "position": 4179, "name": "BPM_S07.07"},
-					{"type": "undulator", "position": 4279, "name": "ID_S07.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S07.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S07.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S07.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S07.03", "devices":["QS_S07.03","CEV_S07.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S07.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S07.04", "devices":["CEH_S07.13","CEV_S07.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S07.03", "devices":["QD_S07.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S07.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S07.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S07.02", "embedded":["QD_S07.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S07.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S07.01", "embedded":["CEH_S07.10","CEV_S07.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S07.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S07.02", "embedded":["QS_S07.02","CEV_S07.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S07.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S07.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S07.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S07.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S07.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S07.08"},
+					{"type": "corrector", "position": 5989, "name": "CV_S07.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S07.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S07.03", "embedded":["QS_S07.03","CEV_S07.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S07.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S07.04", "embedded":["CEH_S07.13","CEV_S07.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S07.03", "embedded":["QD_S07.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S07.09"},
+					{"type": "corrector", "position": 7839, "name": "CFV_S07.04"}
 				]
 			},
 			{
@@ -1686,49 +1696,50 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S07.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S07.06", "devices":["QS_S07.04","CEV_S07.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S07.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S07.04", "devices":["CEH_S07.15","CEV_S07.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S07.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S07.04", "devices":["CEH_S07.16","CEV_S07.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S07.05"},
-					{"type": "sextupole_CHV", "position": 1761, "name": "SD_S07.07", "devices":["CEH_S07.17","CEV_S07.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S07.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S07.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S07.06", "embedded":["QS_S07.04","CEV_S07.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S07.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S07.04", "embedded":["CEH_S07.15","CEV_S07.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S07.10"},
+					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S07.04", "embedded":["CEH_S07.16","CEV_S07.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S07.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S07.07", "embedded":["CEH_S07.17","CEV_S07.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S07.11"},
+					{"type": "corrector", "position": 1900, "name": "CFV_S07.05"}
 				]
 			},
 			{
 				"start": {"x": -38664, "z": -14627},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S07.05", "devices":["TRCEB_S07.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S07.05", "embedded":["TRCEB_S07.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S07.08", "devices":["CEH_S07.18","CEV_S07.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S07.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S07.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S07.05", "devices":["CEH_S07.19","CEV_S07.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S07.07"},
-					{"type": "bpm", "position": 1571, "name": "BPM_S07.13"},
-					{"type": "sextupole_CHV", "position": 1671, "name": "SD_S07.09", "devices":["CEH_S07.20","CEV_S07.20"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S07.06"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S07.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S07.08", "embedded":["CEH_S07.18","CEV_S07.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S07.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S07.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S07.05", "embedded":["CEH_S07.19","CEV_S07.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S07.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S07.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S07.09", "embedded":["CEH_S07.20","CEV_S07.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFH_S07.06"}
 				]
 			},
 			{
 				"start": {"x": -37858, "z": -16760},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S07.06", "devices":["TRCEB_S07.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S07.06", "embedded":["TRCEB_S07.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S07.10", "devices":["CEH_S07.21","CEV_S07.21"]},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S07.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S07.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S07.06", "devices":["CEH_S07.22","CEV_S07.22"]},
-					{"type": "dcct", "position": 2331, "name": "DCCT_S08.01"},
-					{"type": "bpm", "position": 2431, "name": "DBPM_S08.01"},
-					{"type": "sextupole_CHV", "position": 2531, "name": "SF_S08.01", "devices":["CEH_S08.01","CEV_S08.01"]},
-					{"type": "bpm", "position": 2681, "name": "BPM_S08.01"},
-					{"type": "quadrupole", "position": 2781, "name": "QAB_S08.01"},
-					{"type": "sextupole_CHV", "position": 3031, "name": "SD_S08.01", "devices":["CEH_S08.02","CEV_S08.02"]},
-					{"type": "bpm", "position": 3541, "name": "BPM_S08.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S07.10", "embedded":["CEH_S07.21","CEV_S07.21"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S07.08"},
+					{"type": "bpm", "position": 860, "name": "BPM_S07.14"},
+					{"type": "sextupole_CHV", "position": 1000, "name": "SF_S07.06", "embedded":["CEH_S07.22","CEV_S07.22"]},
+					
+					{"type": "dcct", "position": 1531, "name": "DCCT_S08.01"},
+					
+					{"type": "bpm", "position": 2131, "name": "DBPM_S08.01"},
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S08.01", "embedded":["CEH_S08.01","CEV_S08.01"]},
+					{"type": "bpm", "position": 2561, "name": "BPM_S08.01"},
+					{"type": "quadrupole", "position": 2700, "name": "QAB_S08.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S08.01", "embedded":["CEH_S08.02","CEV_S08.02"]},
+					{"type": "bpm", "position": 3065, "name": "BPM_S08.02"}
 				]
 			},
 			{
@@ -1736,29 +1747,28 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S08.01"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S08.02", "devices":["CEH_S08.03","CEV_S08.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S08.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S08.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S08.02", "devices":["CEH_S08.04","CEV_S08.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S08.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S08.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S08.03", "devices":["CEH_S08.05","CEV_S08.05"]}
+					{"type": "sextupole_CHV", "position": 551, "name": "SD_S08.02", "embedded":["CEH_S08.03","CEV_S08.03"]},
+					{"type": "bpm", "position": 700, "name": "BPM_S08.03"},
+					{"type": "quadrupole", "position": 850, "name": "QAB_S08.02"},
+					{"type": "sextupole_CHV", "position": 1101, "name": "SF_S08.02", "embedded":["CEH_S08.04","CEV_S08.04"]},
+					{"type": "quadrupole", "position": 1340, "name": "QAB_S08.03"},
+					{"type": "bpm", "position": 1480, "name": "BPM_S08.04"},
+					{"type": "sextupole_CHV", "position": 1630, "name": "SD_S08.03", "embedded":["CEH_S08.05","CEV_S08.05"]}
 				]
 			},
 			{
 				"start": {"x": -35027, "z": -21953},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S08.02", "devices":["TRCEB_S08.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S08.02", "embedded":["TRCEB_S08.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S08.04", "devices":["CEH_S08.06","CEV_S08.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S08.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S08.03", "devices":["CEH_S08.07","CEV_S08.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S08.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S08.01", "devices":["CEH_S08.08","CEV_S08.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S08.01"},
-					{"type": "sextupole_QK", "position": 1891, "name": "SD_S08.05", "devices":["QS_S08.01","CEV_S08.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S08.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S08.03"}
+					{"type": "sextupole_CHV", "position": 561, "name": "SD_S08.04", "embedded":["CEH_S08.06","CEV_S08.06"]},
+					{"type": "quadrupole", "position": 810, "name": "QAB_S08.04"},
+					{"type": "sextupole_CHV", "position": 1081, "name": "SF_S08.03", "embedded":["CEH_S08.07","CEV_S08.07"]},
+					{"type": "bpm", "position": 1221, "name": "BPM_S08.05"},
+					{"type": "octupole_CHV", "position": 1321, "name": "OCT_S08.01", "embedded":["CEH_S08.08","CEV_S08.08"]},
+					{"type": "quadrupole", "position": 1541, "name": "QF_S08.01"},
+					{"type": "sextupole_QK", "position": 1771, "name": "SD_S08.05", "embedded":["QS_S08.01","CEV_S08.09"]},
+					{"type": "corrector", "position": 1951, "name": "CFHV_S08.03"}
 				]
 			},
 			{
@@ -1766,24 +1776,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S08.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S08.02", "devices":["QD_S08.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S08.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S08.01", "devices":["CEH_S08.10","CEV_S08.10"]},
-					{"type": "quadrupole", "position": 1054, "name": "QF_S08.02"},
-					{"type": "shutter_QK", "position": 1330, "name": "SH_S08.02", "devices":["QS_S08.02","CEV_S08.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S08.02"},
-					{"type": "corrector", "position": 4080, "name": "CV_S08.01"},
-					{"type": "bpm", "position": 4180, "name": "BPM_S08.07"},
-					{"type": "undulator", "position": 4280, "name": "ID_S08.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S08.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S08.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S08.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S08.03", "devices":["QS_S08.03","CEV_S08.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S08.03"},
-					{"type": "shutter_CHV", "position": 7789, "name": "SH_S08.04", "devices":["CEH_S08.13","CEV_S08.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S08.03", "devices":["QD_S08.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S08.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S08.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S08.02", "embedded":["QD_S08.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S08.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S08.01", "embedded":["CEH_S08.10","CEV_S08.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S08.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S08.02", "embedded":["QS_S08.02","CEV_S08.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S08.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S08.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S08.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S08.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S08.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S08.08"},
+					{"type": "corrector", "position": 5989, "name": "CHV_S08.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S08.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S08.03", "embedded":["QS_S08.03","CEV_S08.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S08.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S08.04", "embedded":["CEH_S08.13","CEV_S08.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S08.03", "embedded":["QD_S08.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S08.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S08.04"}
 				]
 			},
 			{
@@ -1791,81 +1804,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S08.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S08.06", "devices":["QS_S08.04","CEV_S08.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S08.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S08.04", "devices":["CEH_S08.15","CEV_S08.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S08.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S08.04", "devices":["CEH_S08.16","CEV_S08.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S08.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S08.07", "devices":["CEH_S08.17","CEV_S08.17"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S08.05"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S08.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S08.06", "embedded":["QS_S08.04","CEV_S08.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S08.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S08.04", "embedded":["CEH_S08.15","CEV_S08.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S08.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S08.04", "embedded":["CEH_S08.16","CEV_S08.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S08.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S08.07", "embedded":["CEH_S08.17","CEV_S08.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S08.11"},
+					{"type": "corrector", "position": 1900, "name": "CFV_S08.05"}
 				]
 			},
 			{
 				"start": {"x": -26170, "z": -31999},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S08.05", "devices":["TRCEB_S08.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S08.05", "embedded":["TRCEB_S08.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S08.08", "devices":["CEH_S08.18","CEV_S08.18"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S08.12"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S08.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S08.05", "devices":["CEH_S08.19","CEV_S08.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S08.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S08.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S08.09", "devices":["CEH_S08.20","CEV_S08.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S08.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S08.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S08.08", "embedded":["CEH_S08.18","CEV_S08.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S08.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S08.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S08.05", "embedded":["CEH_S08.19","CEV_S08.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S08.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S08.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S08.09", "embedded":["CEH_S08.20","CEV_S08.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S08.06"}
 				]
 			},
 			{
 				"start": {"x": -24405, "z": -33444},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S08.06", "devices":["TRCEB_S08.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S08.06", "embedded":["TRCEB_S08.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S08.10", "devices":["CEH_S08.21","CEV_S08.21"]},
+					{"type": "sextupole_CHV", "position": 610, "name": "SD_S08.10", "embedded":["CEH_S08.21","CEV_S08.21"]},
 					{"type": "quadrupole", "position": 860, "name": "QAB_S08.08"},
 					{"type": "bpm", "position": 1010, "name": "BPM_S08.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S08.06", "devices":["CEH_S08.22","CEV_S08.22"]},
+					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S08.06", "embedded":["CEH_S08.22","CEV_S08.22"]},
+					
 					{"type": "cavrf", "position": 1820, "name": "CAVRF_S09.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S09.01", "devices":["CEH_S09.01","CEV_S09.01"]},
-					{"type": "bpm", "position": 2679, "name": "BPM_S09.01"},
-					{"type": "quadrupole", "position": 2779, "name": "QAB_S09.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S09.01", "devices":["CEH_S09.02","CEV_S09.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S09.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S09.01"}
+					
+					{"type": "sextupole_CHV", "position": 2370, "name": "SF_S09.01", "embedded":["CEH_S09.01","CEV_S09.01"]},
+					{"type": "bpm", "position": 2529, "name": "BPM_S09.01"},
+					{"type": "quadrupole", "position": 2679, "name": "QAB_S09.01"},
+					{"type": "sextupole_CHV", "position": 2910, "name": "SD_S09.01", "embedded":["CEH_S09.02","CEV_S09.02"]},
+					{"type": "bpm", "position": 3060, "name": "BPM_S09.02"},
+					{"type": "corrector", "position": 3170, "name": "CFV_S09.01"}
 				]
 			},
 			{
 				"start": {"x": -21373, "z": -35458},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S09.01", "devices":["TRCEB_S09.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S09.01", "embedded":["TRCEB_S09.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S09.02", "devices":["CEH_S09.03","CEV_S09.03"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S09.03"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S09.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S09.02", "devices":["CEH_S09.04","CEV_S09.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S09.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S09.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S09.03", "devices":["CEH_S09.05","CEV_S09.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S09.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S09.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S09.02", "embedded":["CEH_S09.03","CEV_S09.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S09.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S09.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S09.02", "embedded":["CEH_S09.04","CEV_S09.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S09.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S09.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S09.03", "embedded":["CEH_S09.05","CEV_S09.05"]},
+					{"type": "corrector", "position": 1750, "name": "CFH_S09.02"}
 				]
 			},
 			{
 				"start": {"x": -19357, "z": -36526},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S09.02", "devices":["TRCEB_S09.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S09.02", "embedded":["TRCEB_S09.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 660, "name": "SD_S09.04", "devices":["CEH_S09.06","CEV_S09.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S09.04"},
-					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S09.03", "devices":["CEH_S09.07","CEV_S09.07"]},
-					{"type": "bpm", "position": 1320, "name": "BPM_S09.05"},
-					{"type": "octupole_CHV", "position": 1420, "name": "OCT_S09.01", "devices":["CEH_S09.08","CEV_S09.08"]},
-					{"type": "quadrupole", "position": 1640, "name": "QF_S09.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S09.05", "devices":["QS_S09.01","CEV_S09.09"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S09.03"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S09.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S09.04", "embedded":["CEH_S09.06","CEV_S09.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S09.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S09.03", "embedded":["CEH_S09.07","CEV_S09.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S09.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S09.01", "embedded":["CEH_S09.08","CEV_S09.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S09.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S09.05", "embedded":["QS_S09.01","CEV_S09.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S09.03"}
 				]
 			},
 			{
@@ -1873,24 +1885,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S09.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S09.02", "devices":["QD_S09.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S09.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S09.01", "devices":["CEH_S09.10","CEV_S09.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S09.02"},
-					{"type": "shutter_QK", "position": 1331, "name": "SH_S09.02", "devices":["QS_S09.02","CEV_S09.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S09.02"},
-					{"type": "corrector", "position": 4081, "name": "CV_S09.01"},
-					{"type": "bpm", "position": 4181, "name": "BPM_S09.07"},
-					{"type": "undulator", "position": 4281, "name": "ID_S09.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S09.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S09.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S09.03"},
-					{"type": "shutter_QK", "position": 7231, "name": "SH_S09.03", "devices":["QS_S09.03","CEV_S09.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S09.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S09.04", "devices":["CEH_S09.13","CEV_S09.13"]},
-					{"type": "octupole_QD", "position": 8016, "name": "OCT_S09.03", "devices":["QD_S09.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S09.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S09.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S09.02", "embedded":["QD_S09.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S09.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S09.01", "embedded":["CEH_S09.10","CEV_S09.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S09.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S09.02", "embedded":["QS_S09.02","CEV_S09.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S09.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S09.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S09.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S09.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S09.01"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S09.08"},
+					{"type": "corrector", "position": 5989, "name": "CV_S09.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S09.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S09.03", "embedded":["QS_S09.03","CEV_S09.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S09.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S09.04", "embedded":["CEH_S09.13","CEV_S09.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S09.03", "embedded":["QD_S09.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S09.09"},
+					{"type": "corrector", "position": 7839, "name": "CFHV_S09.04"}
 				]
 			},
 			{
@@ -1898,81 +1913,80 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S09.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 551, "name": "SD_S09.06", "devices":["QS_S09.04","CEV_S09.14"]},
-					{"type": "quadrupole", "position": 781, "name": "QF_S09.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S09.04", "devices":["CEH_S09.15","CEV_S09.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S09.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S09.04", "devices":["CEH_S09.16","CEV_S09.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S09.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S09.07", "devices":["CEH_S09.17","CEV_S09.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S09.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S09.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S09.06", "embedded":["QS_S09.04","CEV_S09.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S09.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S09.04", "embedded":["CEH_S09.15","CEV_S09.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S09.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S09.04", "embedded":["CEH_S09.16","CEV_S09.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S09.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S09.07", "embedded":["CEH_S09.17","CEV_S09.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S09.11"},
+					{"type": "corrector", "position": 1900, "name": "CFV_S09.05"}
 				]
 			},
 			{
 				"start": {"x": -6664, "z": -40797},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S09.05", "devices":["TRCEB_S09.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S09.05", "embedded":["TRCEB_S09.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S09.08", "devices":["CEH_S09.18","CEV_S09.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S09.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S09.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S09.05", "devices":["CEH_S09.19","CEV_S09.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S09.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S09.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S09.09", "devices":["CEH_S09.20","CEV_S09.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S09.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S09.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S09.08", "embedded":["CEH_S09.18","CEV_S09.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S09.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S09.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S09.05", "embedded":["CEH_S09.19","CEV_S09.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S09.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S09.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S09.09", "embedded":["CEH_S09.20","CEV_S09.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S09.06"}
 				]
 			},
 			{
 				"start": {"x": -4413, "z": -41166},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S09.06", "devices":["TRCEB_S09.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S09.06", "embedded":["TRCEB_S09.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S09.10", "devices":["CEH_S09.21","CEV_S09.21"]},
+					{"type": "sextupole_CHV", "position": 610, "name": "SD_S09.10", "embedded":["CEH_S09.21","CEV_S09.21"]},
 					{"type": "quadrupole", "position": 860, "name": "QAB_S09.08"},
 					{"type": "bpm", "position": 1010, "name": "BPM_S09.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S09.06", "devices":["CEH_S09.22","CEV_S09.22"]},
+					{"type": "sextupole_CHV", "position": 1170, "name": "SF_S09.06", "embedded":["CEH_S09.22","CEV_S09.22"]},
+					
 					{"type": "cavrf", "position": 1819, "name": "CAVRF_S10.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S10.01", "devices":["CEH_S10.01","CEV_S10.01"]},
-					{"type": "bpm", "position": 2680, "name": "BPM_S10.01"},
-					{"type": "quadrupole", "position": 2780, "name": "QAB_S10.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S10.01", "devices":["CEH_S10.02","CEV_S10.02"]},
-					{"type": "corrector", "position": 3440, "name": "CFH_S10.01"},
-					{"type": "corrector", "position": 3540, "name": "CFV_S10.01"}
+					
+					{"type": "sextupole_CHV", "position": 2370, "name": "SF_S10.01", "embedded":["CEH_S10.01","CEV_S10.01"]},
+					{"type": "bpm", "position": 2529, "name": "BPM_S10.01"},
+					{"type": "quadrupole", "position": 2679, "name": "QAB_S10.01"},
+					{"type": "sextupole_CHV", "position": 2910, "name": "SD_S10.01", "embedded":["CEH_S10.02","CEV_S10.02"]},
+					{"type": "bpm", "position": 3060, "name": "BPM_S010.02"},
+					{"type": "corrector", "position": 3170, "name": "CFV_S10.01"}
 				]
 			},
 			{
 				"start": {"x": -780, "z": -41395},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S10.01", "devices":["TRCEB_S10.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S10.01", "embedded":["TRCEB_S10.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S10.02", "devices":["CEH_S10.03","CEV_S10.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S10.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S10.02"},
-					{"type": "sextupole_CHV", "position": 1150, "name": "SF_S10.02", "devices":["CEH_S10.04","CEV_S10.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S10.03"},
-					{"type": "bpm", "position": 1569, "name": "BPM_S10.04"},
-					{"type": "sextupole_CHV", "position": 1669, "name": "SD_S10.03", "devices":["CEH_S10.05","CEV_S10.05"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S10.02"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S10.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S10.02", "embedded":["CEH_S10.03","CEV_S10.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S10.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S10.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S10.02", "embedded":["CEH_S10.04","CEV_S10.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S10.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S10.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S10.03", "embedded":["CEH_S10.05","CEV_S10.05"]},
+					{"type": "corrector", "position": 2080, "name": "CFH_S10.02"}
 				]
 			},
 			{
 				"start": {"x": 1498, "z": -41311},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S10.02", "devices":["TRCEB_S10.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S10.02", "embedded":["TRCEB_S10.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S10.04", "devices":["CEH_S10.06","CEV_S10.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S10.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S10.03", "devices":["CEH_S10.07","CEV_S10.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S10.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S10.01", "devices":["CEH_S10.08","CEV_S10.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S10.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S10.05", "devices":["QS_S10.01","CEV_S10.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S10.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S10.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S10.04", "embedded":["CEH_S10.06","CEV_S10.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S10.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S10.03", "embedded":["CEH_S10.07","CEV_S10.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S10.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S10.01", "embedded":["CEH_S10.08","CEV_S10.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S10.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S10.05", "embedded":["QS_S10.01","CEV_S10.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFHV_S10.03"}
 				]
 			},
 			{
@@ -1980,24 +1994,27 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S10.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S10.02", "devices":["QD_S10.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S10.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S10.01", "devices":["CEH_S10.10","CEV_S10.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S10.02"},
-					{"type": "shutter_QK", "position": 1329, "name": "SH_S10.02", "devices":["QS_S10.02","CEV_S10.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S10.02"},
-					{"type": "corrector", "position": 4079, "name": "CV_S10.01"},
-					{"type": "bpm", "position": 4179, "name": "BPM_S10.07"},
-					{"type": "undulator", "position": 4279, "name": "ID_S10.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S10.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S10.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S10.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S10.03", "devices":["QS_S10.03","CEV_S10.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S10.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S10.04", "devices":["CEH_S10.13","CEV_S10.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S10.03", "devices":["QD_S10.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S10.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S10.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S10.02", "embedded":["QD_S10.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S10.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S10.01", "embedded":["CEH_S10.10","CEV_S10.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S10.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S10.02", "embedded":["QS_S10.02","CEV_S10.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S10.02"},
+					{"type": "corrector", "position": 2040, "name": "CHV_S10.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S10.07"},
+					
+					{"type": "undulator", "position": 2879, "name": "ID_S10.01"},
+					{"type": "undulator", "position": 4479, "name": "ID_S10.02"},
+					
+					{"type": "bpm", "position": 5809, "name": "BPM_S10.08"},
+					{"type": "corrector", "position": 5989, "name": "CV_S10.02"},
+					{"type": "quadrupole", "position": 6229, "name": "QD_S10.03"},
+					{"type": "sextupole_QK", "position": 6529, "name": "SH_S10.03", "embedded":["QS_S10.03","CEV_S10.12"]},
+					{"type": "quadrupole", "position": 6829, "name": "QF_S10.03"},
+					{"type": "sextupole_CHV", "position": 7129, "name": "SH_S10.04", "embedded":["CEH_S10.13","CEV_S10.13"]},
+					{"type": "octupole_QD", "position": 7399, "name": "OCT_S10.03", "embedded":["QD_S10.04"]},
+					{"type": "bpm", "position": 7639, "name": "BPM_S10.09"},
+					{"type": "corrector", "position": 7839, "name": "CFV_S10.04"}
 				]
 			},
 			{
@@ -2005,81 +2022,78 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S10.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S10.06", "devices":["QS_S10.04","CEV_S10.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S10.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S10.04", "devices":["CEH_S10.15","CEV_S10.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S10.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S10.04", "devices":["CEH_S10.16","CEV_S10.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S10.05"},
-					{"type": "sextupole_CHV", "position": 1761, "name": "SD_S10.07", "devices":["CEH_S10.17","CEV_S10.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S10.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S10.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S10.06", "embedded":["QS_S10.04","CEV_S10.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S10.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S10.04", "embedded":["CEH_S10.15","CEV_S10.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S10.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S10.04", "embedded":["CEH_S10.16","CEV_S10.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S10.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S10.07", "embedded":["CEH_S10.17","CEV_S10.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S10.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S10.05"}
 				]
 			},
 			{
 				"start": {"x": 14627, "z": -38664},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S10.05", "devices":["TRCEB_S10.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S10.05", "embedded":["TRCEB_S10.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S10.08", "devices":["CEH_S10.18","CEV_S10.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S10.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S10.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S10.05", "devices":["CEH_S10.19","CEV_S10.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S10.07"},
-					{"type": "bpm", "position": 1571, "name": "BPM_S10.13"},
-					{"type": "sextupole_CHV", "position": 1671, "name": "SD_S10.09", "devices":["CEH_S10.20","CEV_S10.20"]},
-					{"type": "corrector", "position": 2080, "name": "CFH_S10.06"},
-					{"type": "corrector", "position": 2180, "name": "CFV_S10.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S10.08", "embedded":["CEH_S10.18","CEV_S10.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S10.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S10.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S10.05", "embedded":["CEH_S10.19","CEV_S10.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S10.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S10.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S10.09", "embedded":["CEH_S10.20","CEV_S10.20"]},
+					{"type": "corrector", "position": 2080, "name": "CFHV_S10.06"}
 				]
 			},
 			{
 				"start": {"x": 16760, "z": -37858},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S10.06", "devices":["TRCEB_S10.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S10.06", "embedded":["TRCEB_S10.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S10.10", "devices":["CEH_S10.21","CEV_S10.21"]},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S10.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S10.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S10.06", "devices":["CEH_S10.22","CEV_S10.22"]},
-					{"type": "undulator", "position": 2431, "name": "SHID_S11.01"},
-					{"type": "sextupole_CHV", "position": 2531, "name": "SF_S11.01", "devices":["CEH_S11.01","CEV_S11.01"]},
-					{"type": "bpm", "position": 2681, "name": "BPM_S11.01"},
-					{"type": "quadrupole", "position": 2781, "name": "QAB_S11.01"},
-					{"type": "sextupole_CHV", "position": 3031, "name": "SD_S11.01", "devices":["CEH_S11.02","CEV_S11.02"]},
-					{"type": "corrector", "position": 3441, "name": "CFH_S11.01"},
-					{"type": "corrector", "position": 3541, "name": "CFV_S11.01"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S10.10", "embedded":["CEH_S10.21","CEV_S10.21"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S10.08"},
+					{"type": "bpm", "position": 860, "name": "BPM_S10.14"},
+					{"type": "sextupole_CHV", "position": 1000, "name": "SF_S10.06", "embedded":["CEH_S10.22","CEV_S10.22"]},
+					{"type": "undulator", "position": 1280, "name": "SHID_S11.01"},
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S11.01", "embedded":["CEH_S11.01","CEV_S11.01"]},
+					{"type": "bpm", "position": 2561, "name": "BPM_S11.01"},
+					{"type": "quadrupole", "position": 2700, "name": "QAB_S11.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S11.01", "embedded":["CEH_S11.02","CEV_S11.02"]},
+					{"type": "bpm", "position": 3065, "name": "BPM_S10.02"},
+					{"type": "corrector", "position": 3161, "name": "CFV_S11.01"}
 				]
 			},
 			{
 				"start": {"x": 20021, "z": -36239},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S11.01", "devices":["TRCEB_S11.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S11.01", "embedded":["TRCEB_S11.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S11.02", "devices":["CEH_S11.03","CEV_S11.03"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S11.03"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S11.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S11.02", "devices":["CEH_S11.04","CEV_S11.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S11.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S11.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S11.03", "devices":["CEH_S11.05","CEV_S11.05"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S11.02"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S11.02"}
+					{"type": "sextupole_CHV", "position": 551, "name": "SD_S11.02", "embedded":["CEH_S11.03","CEV_S11.03"]},
+					{"type": "bpm", "position": 700, "name": "BPM_S11.03"},
+					{"type": "quadrupole", "position": 850, "name": "QAB_S11.02"},
+					{"type": "sextupole_CHV", "position": 1101, "name": "SF_S11.02", "embedded":["CEH_S11.04","CEV_S11.04"]},
+					{"type": "quadrupole", "position": 1340, "name": "QAB_S11.03"},
+					{"type": "bpm", "position": 1480, "name": "BPM_S11.04"},
+					{"type": "sextupole_CHV", "position": 1630, "name": "SD_S11.03", "embedded":["CEH_S11.05","CEV_S11.05"]},
+					{"type": "corrector", "position": 1821, "name": "CFH_S11.02"}
 				]
 			},
 			{
 				"start": {"x": 21953, "z": -35027},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S11.02", "devices":["TRCEB_S11.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S11.02", "embedded":["TRCEB_S11.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 661, "name": "SD_S11.04", "devices":["CEH_S11.06","CEV_S11.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S11.04"},
-					{"type": "sextupole_CHV", "position": 1181, "name": "SF_S11.03", "devices":["CEH_S11.07","CEV_S11.07"]},
-					{"type": "bpm", "position": 1321, "name": "BPM_S11.05"},
-					{"type": "octupole_CHV", "position": 1421, "name": "OCT_S11.01", "devices":["CEH_S11.08","CEV_S11.08"]},
-					{"type": "quadrupole", "position": 1641, "name": "QF_S11.01"},
-					{"type": "sextupole_QK", "position": 1891, "name": "SD_S11.05", "devices":["QS_S11.01","CEV_S11.09"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S11.03"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S11.03"}
+					{"type": "sextupole_CHV", "position": 561, "name": "SD_S11.04", "embedded":["CEH_S11.06","CEV_S11.06"]},
+					{"type": "quadrupole", "position": 810, "name": "QAB_S11.04"},
+					{"type": "sextupole_CHV", "position": 1081, "name": "SF_S11.03", "embedded":["CEH_S11.07","CEV_S11.07"]},
+					{"type": "bpm", "position": 1221, "name": "BPM_S11.05"},
+					{"type": "octupole_CHV", "position": 1321, "name": "OCT_S11.01", "embedded":["CEH_S11.08","CEV_S11.08"]},
+					{"type": "quadrupole", "position": 1541, "name": "QF_S11.01"},
+					{"type": "sextupole_QK", "position": 1771, "name": "SD_S11.05", "embedded":["QS_S11.01","CEV_S11.09"]},
+					{"type": "corrector", "position": 1951, "name": "CFH_S11.03"}
 				]
 			},
 			{
@@ -2087,25 +2101,25 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S11.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S11.02", "devices":["QD_S11.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S11.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S11.01", "devices":["CEH_S11.10","CEV_S11.10"]},
-					{"type": "quadrupole", "position": 1054, "name": "QF_S11.02"},
-					{"type": "shutter_QK", "position": 1330, "name": "SH_S11.02", "devices":["QS_S11.02","CEV_S11.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S11.02"},
-					{"type": "corrector", "position": 4080, "name": "CV_S11.01"},
-					{"type": "bpm", "position": 4180, "name": "BPM_S11.07"},
-					{"type": "cavity_3hc", "position": 2480, "name": "3HC_S11.01"},
-					{"type": "scw", "position": 5280, "name": "SCW_S11.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S11.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S11.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S11.03"},
-					{"type": "shutter_QK", "position": 7230, "name": "SH_S11.03", "devices":["QS_S11.03","CEV_S11.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S11.03"},
-					{"type": "shutter_CHV", "position": 7789, "name": "SH_S11.04", "devices":["CEH_S11.13","CEV_S11.13"]},
-					{"type": "octupole_QD", "position": 8015, "name": "OCT_S11.03", "devices":["QD_S11.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S11.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S11.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S11.02", "embedded":["QD_S11.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S11.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S11.01", "embedded":["CEH_S11.10","CEV_S11.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S11.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S11.02", "embedded":["QS_S11.02","CEV_S11.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S11.02"},
+					{"type": "corrector", "position": 2040, "name": "CV_S11.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S11.07"},
+					
+					{"type": "cavity_3hc", "position": 2580, "name": "3HC_S11.01"},
+					{"type": "scw", "position": 4080, "name": "SCW_S11.01"},
+					
+					{"type": "corrector", "position": 5949, "name": "CHV_S11.02"},
+					{"type": "quadrupole", "position": 6299, "name": "QD_S11.03"},
+					{"type": "sextupole_QK", "position": 6659, "name": "SH_S11.03", "embedded":["QS_S11.03","CEV_S11.12"]},
+					{"type": "quadrupole", "position": 7005, "name": "QF_S11.03"},
+					{"type": "sextupole_CHV", "position": 7389, "name": "SH_S11.04", "embedded":["CEH_S11.13","CEV_S11.13"]},
+					{"type": "octupole_QD", "position": 7695, "name": "OCT_S11.03", "embedded":["QD_S11.04"]},
+					{"type": "corrector", "position": 7960, "name": "CFHV_S11.04"}
 				]
 			},
 			{
@@ -2113,79 +2127,77 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S11.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 550, "name": "SD_S11.06", "devices":["QS_S11.04","CEV_S11.14"]},
-					{"type": "quadrupole", "position": 780, "name": "QF_S11.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S11.04", "devices":["CEH_S11.15","CEV_S11.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S11.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S11.04", "devices":["CEH_S11.16","CEV_S11.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S11.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S11.07", "devices":["CEH_S11.17","CEV_S11.17"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S11.05"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S11.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S11.06", "embedded":["QS_S11.04","CEV_S11.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S11.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S11.04", "embedded":["CEH_S11.15","CEV_S11.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S11.10"},
+					{"type": "sextupole_CHV", "position": 1200, "name": "SF_S11.04", "embedded":["CEH_S11.16","CEV_S11.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S11.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S11.07", "embedded":["CEH_S11.17","CEV_S11.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S11.11"},
+					{"type": "corrector", "position": 1900, "name": "CFV_S11.05"}
 				]
 			},
 			{
 				"start": {"x": 31999, "z": -26170},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S11.05", "devices":["TRCEB_S11.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S11.05", "embedded":["TRCEB_S11.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S11.08", "devices":["CEH_S11.18","CEV_S11.18"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S11.12"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S11.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S11.05", "devices":["CEH_S11.19","CEV_S11.19"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S11.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S11.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S11.09", "devices":["CEH_S11.20","CEV_S11.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S11.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S11.06"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S11.08", "embedded":["CEH_S11.18","CEV_S11.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S11.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S11.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S11.05", "embedded":["CEH_S11.19","CEV_S11.19"]},
+					{"type": "quadrupole", "position": 1250, "name": "QAB_S11.07"},
+					{"type": "bpm", "position": 1391, "name": "BPM_S11.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S11.09", "embedded":["CEH_S11.20","CEV_S11.20"]},
+					{"type": "corrector", "position": 1731, "name": "CFHV_S11.06"}
 				]
 			},
 			{
 				"start": {"x": 33444, "z": -24405},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S11.06", "devices":["TRCEB_S11.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S11.06", "embedded":["TRCEB_S11.04"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S11.10", "devices":["CEH_S11.21","CEV_S11.21"]},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S11.08"},
-					{"type": "bpm", "position": 1010, "name": "BPM_S11.14"},
-					{"type": "sextupole_CHV", "position": 1110, "name": "SF_S11.06", "devices":["CEH_S11.22","CEV_S11.22"]},
-					{"type": "flsc", "position": 2330, "name": "FLSC_S12.01"},
-					{"type": "bpm", "position": 2430, "name": "DBPM_12.01"},
-					{"type": "sextupole_CHV", "position": 2530, "name": "SF_S12.01", "devices":["CEH_S12.01","CEV_S12.01"]},
-					{"type": "bpm", "position": 2679, "name": "BPM_S12.01"},
-					{"type": "quadrupole", "position": 2779, "name": "QAB_S12.01"},
-					{"type": "sextupole_CHV", "position": 3030, "name": "SD_S12.01", "devices":["CEH_S12.02","CEV_S12.02"]},
-					{"type": "bpm", "position": 3540, "name": "BPM_S12.02"}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S11.10", "embedded":["CEH_S11.21","CEV_S11.21"]},
+					{"type": "quadrupole", "position": 720, "name": "QAB_S11.08"},
+					{"type": "bpm", "position": 865, "name": "BPM_S11.14"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S11.06", "embedded":["CEH_S11.22","CEV_S11.22"]},
+					{"type": "flsc", "position": 1290, "name": "FLSC_S12.01"},
+					{"type": "bpm", "position": 2230, "name": "DBPM_12.01"},
+					{"type": "sextupole_CHV", "position": 2430, "name": "SF_S12.01", "embedded":["CEH_S12.01","CEV_S12.01"]},
+					{"type": "bpm", "position": 2565, "name": "BPM_S12.01"},
+					{"type": "quadrupole", "position": 2710, "name": "QAB_S12.01"},
+					{"type": "sextupole_CHV", "position": 2930, "name": "SD_S12.01", "embedded":["CEH_S12.02","CEV_S12.02"]},
+					{"type": "bpm", "position": 3070, "name": "BPM_S12.02"}
 				]
 			},
 			{
 				"start": {"x": 35458, "z": -21373},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S12.01", "devices":["TRCEB_S12.01"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S12.01", "embedded":["TRCEB_S12.01"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 611, "name": "SD_S12.02", "devices":["CEH_S12.03","CEV_S12.03"]},
-					{"type": "bpm", "position": 761, "name": "BPM_S12.03"},
-					{"type": "quadrupole", "position": 861, "name": "QAB_S12.02"},
-					{"type": "sextupole_CHV", "position": 1151, "name": "SF_S12.02", "devices":["CEH_S12.04","CEV_S12.04"]},
-					{"type": "quadrupole", "position": 1420, "name": "QAB_S12.03"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S12.04"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S12.03", "devices":["CEH_S12.05","CEV_S12.05"]}
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S12.02", "embedded":["CEH_S12.03","CEV_S12.03"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S12.03"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S12.02"},
+					{"type": "sextupole_CHV", "position": 1030, "name": "SF_S12.02", "embedded":["CEH_S12.04","CEV_S12.04"]},
+					{"type": "quadrupole", "position": 1260, "name": "QAB_S12.03"},
+					{"type": "bpm", "position": 1400, "name": "BPM_S12.04"},
+					{"type": "sextupole_CHV", "position": 1550, "name": "SD_S12.03", "embedded":["CEH_S12.05","CEV_S12.05"]}
 				]
 			},
 			{
 				"start": {"x": 36526, "z": -19357},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S12.02", "devices":["TRCEB_S12.02"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S12.02", "embedded":["TRCEB_S12.02"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 660, "name": "SD_S12.04", "devices":["CEH_S12.06","CEV_S12.06"]},
-					{"type": "quadrupole", "position": 910, "name": "QAB_S12.04"},
-					{"type": "sextupole_CHV", "position": 1180, "name": "SF_S12.03", "devices":["CEH_S12.07","CEV_S12.07"]},
-					{"type": "bpm", "position": 1320, "name": "BPM_S12.05"},
-					{"type": "octupole_CHV", "position": 1420, "name": "OCT_S12.01", "devices":["CEH_S12.08","CEV_S12.08"]},
-					{"type": "quadrupole", "position": 1640, "name": "QF_S12.01"},
-					{"type": "sextupole_QK", "position": 1890, "name": "SD_S12.05", "devices":["QS_S12.01","CEV_S12.09"]},
-					{"type": "corrector", "position": 2220, "name": "CFH_S12.03"},
-					{"type": "corrector", "position": 2320, "name": "CFV_S12.03"}
+					{"type": "sextupole_CHV", "position": 501, "name": "SD_S12.04", "embedded":["CEH_S12.06","CEV_S12.06"]},
+					{"type": "quadrupole", "position": 730, "name": "QAB_S12.04"},
+					{"type": "sextupole_CHV", "position": 971, "name": "SF_S12.03", "embedded":["CEH_S12.07","CEV_S12.07"]},
+					{"type": "bpm", "position": 1121, "name": "BPM_S12.05"},
+					{"type": "octupole_CHV", "position": 1231, "name": "OCT_S12.01", "embedded":["CEH_S12.08","CEV_S12.08"]},
+					{"type": "quadrupole", "position": 1471, "name": "QF_S12.01"},
+					{"type": "sextupole_QK", "position": 1709, "name": "SD_S12.05", "embedded":["QS_S12.01","CEV_S12.09"]},
+					{"type": "corrector", "position": 1910, "name": "CFH_S12.03"}
 				]
 			},
 			{
@@ -2193,24 +2205,34 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S12.03"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "octupole_QD", "position": 545, "name": "OCT_S12.02", "devices":["QD_S12.01"]},
-					{"type": "bpm", "position": 670, "name": "BPM_S12.06"},
-					{"type": "shutter_CHV", "position": 770, "name": "SH_S12.01", "devices":["CEH_S12.10","CEV_S12.10"]},
-					{"type": "quadrupole", "position": 1055, "name": "QF_S12.02"},
-					{"type": "shutter_QK", "position": 1331, "name": "SH_S12.02", "devices":["QS_S12.02","CEV_S12.11"]},
-					{"type": "quadrupole", "position": 1515, "name": "QD_S12.02"},
-					{"type": "corrector", "position": 4081, "name": "CV_S12.01"},
-					{"type": "bpm", "position": 4181, "name": "BPM_S12.07"},
-					{"type": "inj", "position": 4281, "name": "INJ_S12.01"},
-					{"type": "corrector", "position": 6845, "name": "CH_S12.02"},
-					{"type": "corrector", "position": 6945, "name": "CV_S12.02"},
-					{"type": "quadrupole", "position": 7045, "name": "QD_S12.03"},
-					{"type": "shutter_QK", "position": 7231, "name": "SH_S12.03", "devices":["QS_S12.03","CEV_S12.12"]},
-					{"type": "quadrupole", "position": 7505, "name": "QF_S12.03"},
-					{"type": "shutter_CHV", "position": 7790, "name": "SH_S12.04", "devices":["CEH_S12.13","CEV_S12.13"]},
-					{"type": "octupole_QD", "position": 8016, "name": "OCT_S12.03", "devices":["QD_S12.04"]},
-					{"type": "corrector", "position": 8360, "name": "CFH_S12.04"},
-					{"type": "corrector", "position": 8460, "name": "CFV_S12.04"}
+					{"type": "octupole_QD", "position": 545, "name": "OCT_S12.02", "embedded":["QD_S12.01"]},
+					{"type": "bpm", "position": 750, "name": "BPM_S12.06"},
+					{"type": "sextupole_CHV", "position": 950, "name": "SH_S12.01", "embedded":["CEH_S12.10","CEV_S12.10"]},
+					{"type": "quadrupole", "position": 1235, "name": "QF_S12.02"},
+					{"type": "sextupole_QK", "position": 1509, "name": "SH_S12.02", "embedded":["QS_S12.02","CEV_S12.11"]},
+					{"type": "quadrupole", "position": 1785, "name": "QD_S12.02"},
+					{"type": "corrector", "position": 2040, "name": "CV_S12.01"},
+					{"type": "bpm", "position": 2245, "name": "BPM_S12.07"},
+					
+					{"type": "kicker", "position": 2455, "name": "KICKER_S12.1"},
+					{"type": "vlv", "position": 2865, "name": "VLVINJ_S12.1"},
+					{"type": "kicker", "position": 3106, "name": "KICKER_S12.2"},
+					{"type": "flsc", "position": 3646, "name": "FLSC_S12.1"},
+					{"type": "spte", "position": 3720, "length": 1600,  "offset3d": [0, 0, 150], "ps": ["SEPTUM_BTS2.1","SEPTUM_BTS2.2"],"name": "SISR_BTS2.1", "alias": ["SISR_BTS2.2", "SE_S12.1", "SE_S12.2"]},
+					{"type": "flsc", "position": 4651, "name": "FLSC_S12.2"},
+					{"type": "kicker", "position": 4886, "name": "KICKER_S12.3"},
+					{"type": "vlv", "position": 5289, "name": "VLVINJ_S12.2"},
+					{"type": "kicker", "position": 5527, "name": "KICKER_S12.4"},
+					
+					{"type": "bpm", "position": 5939, "name": "BPM_S12.08"},
+					{"type": "corrector", "position": 6099, "name": "CV_S12.02"},
+					{"type": "quadrupole", "position": 6329, "name": "QD_S12.03"},
+					{"type": "sextupole_QK", "position": 6629, "name": "SH_S12.03", "embedded":["QS_S12.03","CEV_S12.12"]},
+					{"type": "quadrupole", "position": 6929, "name": "QF_S12.03"},
+					{"type": "sextupole_CHV", "position": 7229, "name": "SH_S12.04", "embedded":["CEH_S12.13","CEV_S12.13"]},
+					{"type": "octupole_QD", "position": 7499, "name": "OCT_S12.03", "embedded":["QD_S12.04"]},
+					{"type": "bpm", "position": 7739, "name": "BPM_S12.09"},
+					{"type": "corrector", "position": 7939, "name": "CFV_S12.04"}
 				]
 			},
 			{
@@ -2218,36 +2240,35 @@
 				"bending": {"type": "dipole", "label": "show", "name": "B_S12.04"},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_QK", "position": 551, "name": "SD_S12.06", "devices":["QS_S12.04","CEV_S12.14"]},
-					{"type": "quadrupole", "position": 781, "name": "QF_S12.04"},
-					{"type": "octupole_CHV", "position": 1000, "name": "OCT_S12.04", "devices":["CEH_S12.15","CEV_S12.15"]},
-					{"type": "bpm", "position": 1140, "name": "BPM_S12.10"},
-					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S12.04", "devices":["CEH_S12.16","CEV_S12.16"]},
-					{"type": "quadrupole", "position": 1510, "name": "QAB_S12.05"},
-					{"type": "sextupole_CHV", "position": 1760, "name": "SD_S12.07", "devices":["CEH_S12.17","CEV_S12.17"]},
-					{"type": "corrector", "position": 2221, "name": "CFH_S12.05"},
-					{"type": "corrector", "position": 2321, "name": "CFV_S12.05"}
+					{"type": "sextupole_QK", "position": 500, "name": "SD_S12.06", "embedded":["QS_S12.04","CEV_S12.14"]},
+					{"type": "quadrupole", "position": 730, "name": "QF_S12.04"},
+					{"type": "octupole_CHV", "position": 900, "name": "OCT_S12.04", "embedded":["CEH_S12.15","CEV_S12.15"]},
+					{"type": "bpm", "position": 1050, "name": "BPM_S12.10"},
+					{"type": "sextupole_CHV", "position": 1240, "name": "SF_S12.04", "embedded":["CEH_S12.16","CEV_S12.16"]},
+					{"type": "quadrupole", "position": 1420, "name": "QAB_S12.05"},
+					{"type": "sextupole_CHV", "position": 1640, "name": "SD_S12.07", "embedded":["CEH_S12.17","CEV_S12.17"]},
+					{"type": "bpm", "position": 1789, "name": "BPM_S12.11"},
+					{"type": "corrector", "position": 1900, "name": "CFHV_S12.05"}
 				]
 			},
 			{
 				"start": {"x": 40797, "z": -6664},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S12.05", "devices":["TRCEB_S12.03"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S12.05", "embedded":["TRCEB_S12.03"]},
 				"chamber": {"type": "chamber"},
 				"components": [
-					{"type": "sextupole_CHV", "position": 610, "name": "SD_S12.08", "devices":["CEH_S12.18","CEV_S12.18"]},
-					{"type": "bpm", "position": 760, "name": "BPM_S12.12"},
-					{"type": "quadrupole", "position": 860, "name": "QAB_S12.06"},
-					{"type": "sextupole_CHV", "position": 1130, "name": "SF_S12.05", "devices":["CEH_S12.19","CEV_S12.19"]},
+					{"type": "sextupole_CHV", "position": 500, "name": "SD_S12.08", "embedded":["CEH_S12.18","CEV_S12.18"]},
+					{"type": "bpm", "position": 650, "name": "BPM_S12.12"},
+					{"type": "quadrupole", "position": 800, "name": "QAB_S12.06"},
+					{"type": "sextupole_CHV", "position": 1020, "name": "SF_S12.05", "embedded":["CEH_S12.19","CEV_S12.19"]},
 					{"type": "quadrupole", "position": 1420, "name": "QAB_S12.07"},
-					{"type": "bpm", "position": 1570, "name": "BPM_S12.13"},
-					{"type": "sextupole_CHV", "position": 1670, "name": "SD_S12.09", "devices":["CEH_S12.20","CEV_S12.20"]},
-					{"type": "corrector", "position": 2081, "name": "CFH_S12.06"},
-					{"type": "corrector", "position": 2181, "name": "CFV_S12.06"}
+					{"type": "bpm", "position": 1391, "name": "BPM_S12.13"},
+					{"type": "sextupole_CHV", "position": 1541, "name": "SD_S12.09", "embedded":["CEH_S12.20","CEV_S12.20"]},
+					{"type": "corrector", "position": 2080, "name": "CFHV_S12.06"}
 				]
 			},
 			{
 				"start": {"x": 41166, "z": -4413},
-				"bending": {"type": "dipole", "label": "show", "name": "B_S12.06", "devices":["TRCEB_S12.04"]},
+				"bending": {"type": "dipole", "label": "show", "name": "B_S12.06", "embedded":["TRCEB_S12.04"]},
 				"chamber": {"type": "chamber"},
 				"components": []
 			}
@@ -2258,8 +2279,8 @@
 			{
 				"start": {"x": 33249, "y": -300, "z": 4557},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.05" ,"reverse": true, "devices":["PSOCT_S01.02","PSOCT_S01.01","PSTRCEB_S01.01","PSTRCEB_S01.02","PSB_S01.01","PSB_S01.02","PSB_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.10" ,"reverse": true, "devices":["PSCFH_S01.01","PSCFV_S01.01","PSCEH_S01.01","PSCEV_S01.01","PSCEH_S01.02","PSCEV_S01.02","PSCEH_S01.03","PSQAB_S01.01","PSQAB_S01.02","PSSF_S01.01","PSSD_S01.01","PSSD_S01.02","PSSF_S01.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.05" ,"reverse": true, "embedded":["PSOCT_S01.02","PSOCT_S01.01","PSTRCEB_S01.01","PSTRCEB_S01.02","PSB_S01.01","PSB_S01.02","PSB_S01.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB01.10" ,"reverse": true, "embedded":["PSCFH_S01.01","PSCFV_S01.01","PSCEH_S01.01","PSCEV_S01.01","PSCEH_S01.02","PSCEV_S01.02","PSCEH_S01.03","PSQAB_S01.01","PSQAB_S01.02","PSSF_S01.01","PSSD_S01.01","PSSD_S01.02","PSSF_S01.02"]}
 				]
 			},
 			{
@@ -2268,12 +2289,12 @@
 			{
 				"start": {"x": 32402, "y": -300, "z": 8682},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB01.15" ,"reverse": true, "devices":["PSCFH_S01.02","PSCFV_S01.02","PSCEH_S01.05","PSCEV_S01.05","PSCEH_S01.06","PSCEH_S01.06","PSCEH_S01.08","PSCEV_S01.08","PSQAB_S01.03","PSQAB_S01.04","PSQF_S01.01","PSSD_S01.03","PSSD_S01.04","PSSF_S01.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB01.20" ,"reverse": true, "devices":["PSCFH_S01.03","PSCFV_S01.03","PSQK_S01.01","PSCEV_S01.09","PSCEH_S01.10","PSCEV_S01.10","PSQK_S01.02","PSCEV_S01.11","PSCH_S01.01","PSCV_S01.01","PSQD_S01.01","PSQF_S01.02","PSQD_S01.02","PSSD_S01.05","PSSH_S01.01","PSSH_S01.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB01.25" ,"reverse": true, "devices":["PSCFH_S01.04","PSCFV_S01.04","PSCH_S01.02","PSCV_S01.02","PSQK_S01.03","PSCEH_S01.13","PSCEV_S01.13","PSQK_S01.04","PSQD_S01.03","PSQF_S01.03","PSQD_S01.04","PSSH_S01.03","PSSH_S01.04","PSSD_S01.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB01.30" ,"reverse": true, "devices":["PSCFH_S01.05","PSCFV_S01.05","PSCEH_S01.15","PSCEV_S01.15","PSCEH_S01.17","PSCEV_S01.17","PSCEH_S01.18","PSCEV_S01.18","PSQD_S01.04","PSQF_S01.04","PSQAB_S01.05","PSSF_S01.04","PSSD_S01.07","PSSD_S01.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB01.35" ,"reverse": true, "devices":["PSCFH_S01.06","PSCFV_S01.06","PSCEH_S01.20","PSCEV_S01.20","PSCEH_S01.21","PSCEV_S01.21","PSCEH_S01.22","PSCEV_S01.22","PSQAB_S01.06","PSQAB_S01.07","PSSF_S01.05","PSSD_S01.09","PSSD_S01.10","PSSF_S01.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB01.40" ,"reverse": true, "devices":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB01.15" ,"reverse": true, "embedded":["PSCFH_S01.02","PSCFV_S01.02","PSCEH_S01.05","PSCEV_S01.05","PSCEH_S01.06","PSCEH_S01.06","PSCEH_S01.08","PSCEV_S01.08","PSQAB_S01.03","PSQAB_S01.04","PSQF_S01.01","PSSD_S01.03","PSSD_S01.04","PSSF_S01.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB01.20" ,"reverse": true, "embedded":["PSCFH_S01.03","PSCFV_S01.03","PSQK_S01.01","PSCEV_S01.09","PSCEH_S01.10","PSCEV_S01.10","PSQK_S01.02","PSCEV_S01.11","PSCH_S01.01","PSCV_S01.01","PSQD_S01.01","PSQF_S01.02","PSQD_S01.02","PSSD_S01.05","PSSH_S01.01","PSSH_S01.02"]},
+					{"type": "rps", "position": 3397, "name": "RPS_AB01.25" ,"reverse": true, "embedded":["PSCFH_S01.04","PSCFV_S01.04","PSCH_S01.02","PSCV_S01.02","PSQK_S01.03","PSCEH_S01.13","PSCEV_S01.13","PSQK_S01.04","PSQD_S01.03","PSQF_S01.03","PSQD_S01.04","PSSH_S01.03","PSSH_S01.04","PSSD_S01.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB01.30" ,"reverse": true, "embedded":["PSCFH_S01.05","PSCFV_S01.05","PSCEH_S01.15","PSCEV_S01.15","PSCEH_S01.17","PSCEV_S01.17","PSCEH_S01.18","PSCEV_S01.18","PSQD_S01.04","PSQF_S01.04","PSQAB_S01.05","PSSF_S01.04","PSSD_S01.07","PSSD_S01.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB01.35" ,"reverse": true, "embedded":["PSCFH_S01.06","PSCFV_S01.06","PSCEH_S01.20","PSCEV_S01.20","PSCEH_S01.21","PSCEV_S01.21","PSCEH_S01.22","PSCEV_S01.22","PSQAB_S01.06","PSQAB_S01.07","PSSF_S01.05","PSSD_S01.09","PSSD_S01.10","PSSF_S01.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB01.40" ,"reverse": true, "embedded":["PSOCT_S01.03","PSOCT_S01.04","PSTRCEB_S01.03","PSTRCEB_S01.04","PSB_S01.04","PSB_S01.05","PSB_S01.06"]}
 				]
 			},
 			{
@@ -2282,10 +2303,10 @@
 			{
 				"start": {"x": 36190, "y": -300, "z": 7199},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA01.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 828, "name": "RCF_AA01.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA01.05" ,"reverse": true},
+					{"type": "rv", "position": 2457, "name": "RV_AA01.05" ,"reverse": true},
+					{"type": "rv", "position": 1649, "name": "RV_AA01.10" ,"reverse": true},
+					{"type": "rc", "position": 828, "name": "RCF_AA01.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2294,7 +2315,7 @@
 			{
 				"start": {"x": 33415, "y": -300, "z": 3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB01.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2303,7 +2324,7 @@
 			{
 				"start": {"x": 31769, "y": -300, "z": 10939},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB01.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2312,9 +2333,9 @@
 			{
 				"start": {"x": 36910, "y": -300, "z": 2848},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA01.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA01.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA01.15" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA01.05" ,"reverse": true},
+					{"type": "rid", "position": 610, "name": "RID_AA01.10" ,"reverse": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA01.15" ,"reverse": true}
 				]
 			},
 			{
@@ -2323,10 +2344,10 @@
 			{
 				"start": {"x": 26434, "y": -300, "z": 20653},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.05" ,"reverse": true, "devices":["PSOCT_S02.02","PSOCT_S02.01","PSTRCEB_S02.01","PSTRCEB_S02.02","PSB_S02.01","PSB_S02.02","PSB_S02.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.10" ,"reverse": true, "devices":["PSCFH_S02.01","PSCFV_S02.01","PSCEH_S02.01","PSCEV_S02.01","PSCEH_S02.02","PSCEV_S02.02","PSCEH_S02.03","PSQAB_S02.01","PSQAB_S02.02","PSSF_S02.01","PSSD_S02.01","PSSD_S02.02","PSSF_S02.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.15" ,"reverse": true, "devices":["PSCFH_S02.02","PSCFV_S02.02","PSCEH_S02.05","PSCEV_S02.05","PSCEH_S02.06","PSCEH_S02.06","PSCEH_S02.08","PSCEV_S02.08","PSQAB_S02.03","PSQAB_S02.04","PSQF_S02.01","PSSD_S02.03","PSSD_S02.04","PSSF_S02.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.20" ,"reverse": true, "devices":["PSCFH_S02.03","PSCFV_S02.03","PSQK_S02.01","PSCEV_S02.09","PSCEH_S02.10","PSCEV_S02.10","PSQK_S02.02","PSCEV_S02.11","PSCH_S02.01","PSCV_S02.01","PSQD_S02.01","PSQF_S02.02","PSQD_S02.02","PSSD_S02.05","PSSH_S02.01","PSSH_S02.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.05" ,"reverse": true, "embedded":["PSOCT_S02.02","PSOCT_S02.01","PSTRCEB_S02.01","PSTRCEB_S02.02","PSB_S02.01","PSB_S02.02","PSB_S02.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB02.10" ,"reverse": true, "embedded":["PSCFH_S02.01","PSCFV_S02.01","PSCEH_S02.01","PSCEV_S02.01","PSCEH_S02.02","PSCEV_S02.02","PSCEH_S02.03","PSQAB_S02.01","PSQAB_S02.02","PSSF_S02.01","PSSD_S02.01","PSSD_S02.02","PSSF_S02.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB02.15" ,"reverse": true, "embedded":["PSCFH_S02.02","PSCFV_S02.02","PSCEH_S02.05","PSCEV_S02.05","PSCEH_S02.06","PSCEH_S02.06","PSCEH_S02.08","PSCEV_S02.08","PSQAB_S02.03","PSQAB_S02.04","PSQF_S02.01","PSSD_S02.03","PSSD_S02.04","PSSF_S02.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB02.20" ,"reverse": true, "embedded":["PSCFH_S02.03","PSCFV_S02.03","PSQK_S02.01","PSCEV_S02.09","PSCEH_S02.10","PSCEV_S02.10","PSQK_S02.02","PSCEV_S02.11","PSCH_S02.01","PSCV_S02.01","PSQD_S02.01","PSQF_S02.02","PSQD_S02.02","PSSD_S02.05","PSSH_S02.01","PSSH_S02.02"]}
 				]
 			},
 			{
@@ -2335,10 +2356,10 @@
 			{
 				"start": {"x": 22446, "y": -300, "z": 24930},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB02.25" ,"reverse": true, "devices":["PSCFH_S02.04","PSCFV_S02.04","PSCH_S02.02","PSCV_S02.02","PSQK_S02.03","PSCEH_S02.13","PSCEV_S02.13","PSQK_S02.04","PSQD_S02.03","PSQF_S02.03","PSQD_S02.04","PSSH_S02.03","PSSH_S02.04","PSSD_S02.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB02.30" ,"reverse": true, "devices":["PSCFH_S02.05","PSCFV_S02.05","PSCEH_S02.15","PSCEV_S02.15","PSCEH_S02.17","PSCEV_S02.17","PSCEH_S02.18","PSCEV_S02.18","PSQD_S02.04","PSQF_S02.04","PSQAB_S02.05","PSSF_S02.04","PSSD_S02.07","PSSD_S02.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB02.35" ,"reverse": true, "devices":["PSCFH_S02.06","PSCFV_S02.06","PSCEH_S02.20","PSCEV_S02.20","PSCEH_S02.21","PSCEV_S02.21","PSCEH_S02.22","PSCEV_S02.22","PSQAB_S02.06","PSQAB_S02.07","PSSF_S02.05","PSSD_S02.09","PSSD_S02.10","PSSF_S02.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB02.40" ,"reverse": true, "devices":["PSOCT_S02.03","PSOCT_S02.04","PSTRCEB_S02.03","PSTRCEB_S02.04","PSB_S02.04","PSB_S02.05","PSB_S02.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB02.25" ,"reverse": true, "embedded":["PSCFH_S02.04","PSCFV_S02.04","PSCH_S02.02","PSCV_S02.02","PSQK_S02.03","PSCEH_S02.13","PSCEV_S02.13","PSQK_S02.04","PSQD_S02.03","PSQF_S02.03","PSQD_S02.04","PSSH_S02.03","PSSH_S02.04","PSSD_S02.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB02.30" ,"reverse": true, "embedded":["PSCFH_S02.05","PSCFV_S02.05","PSCEH_S02.15","PSCEV_S02.15","PSCEH_S02.17","PSCEV_S02.17","PSCEH_S02.18","PSCEV_S02.18","PSQD_S02.04","PSQF_S02.04","PSQAB_S02.05","PSSF_S02.04","PSSD_S02.07","PSSD_S02.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB02.35" ,"reverse": true, "embedded":["PSCFH_S02.06","PSCFV_S02.06","PSCEH_S02.20","PSCEV_S02.20","PSCEH_S02.21","PSCEV_S02.21","PSCEH_S02.22","PSCEV_S02.22","PSQAB_S02.06","PSQAB_S02.07","PSSF_S02.05","PSSD_S02.09","PSSD_S02.10","PSSF_S02.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB02.40" ,"reverse": true, "embedded":["PSOCT_S02.03","PSOCT_S02.04","PSTRCEB_S02.03","PSTRCEB_S02.04","PSB_S02.04","PSB_S02.05","PSB_S02.06"]}
 				]
 			},
 			{
@@ -2347,10 +2368,10 @@
 			{
 				"start": {"x": 27742, "y": -300, "z": 24330},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2585, "name": "RV_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1777, "name": "RV_AA02.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA02.05" ,"reverse": true},
+					{"type": "rv", "position": 2585, "name": "RV_AA02.05" ,"reverse": true},
+					{"type": "rv", "position": 1777, "name": "RV_AA02.10" ,"reverse": true},
+					{"type": "rc", "position": 953, "name": "RCF_AA02.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2359,7 +2380,7 @@
 			{
 				"start": {"x": 27182, "y": -300, "z": 19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB02.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2368,7 +2389,7 @@
 			{
 				"start": {"x": 23340, "y": -300, "z": 24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB02.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2377,7 +2398,7 @@
 			{
 				"start": {"x": 32967, "y": -300, "z": 16798},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true, "devices":[]}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA02.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2386,9 +2407,9 @@
 			{
 				"start": {"x": 27332, "y": -300, "z": 24969},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA02.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA02.15" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA02.05" ,"reverse": true},
+					{"type": "rid", "position": 610, "name": "RID_AA02.10" ,"reverse": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA02.15" ,"reverse": true}
 				]
 			},
 			{
@@ -2397,8 +2418,8 @@
 			{
 				"start": {"x": 30337, "y": -300, "z": 21007},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA02.05" ,"reverse": true, "devices":[]},
-					{"type": "rcry", "position": 610, "name": "RCRY_AA02.10" ,"reverse": true, "devices":[]}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA02.05" ,"reverse": true},
+					{"type": "rcry", "position": 610, "name": "RCRY_AA02.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2407,10 +2428,10 @@
 			{
 				"start": {"x": 12566, "y": -300, "z": 31103},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.05" ,"reverse": true, "devices":["PSOCT_S03.02","PSOCT_S03.01","PSTRCEB_S03.01","PSTRCEB_S03.02","PSB_S03.01","PSB_S03.02","PSB_S03.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.10" ,"reverse": true, "devices":["PSCFH_S03.01","PSCFV_S03.01","PSCEH_S03.01","PSCEV_S03.01","PSCEH_S03.02","PSCEV_S03.02","PSCEH_S03.03","PSQAB_S03.01","PSQAB_S03.02","PSSF_S03.01","PSSD_S03.01","PSSD_S03.02","PSSF_S03.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.15" ,"reverse": true, "devices":["PSCFH_S03.02","PSCFV_S03.02","PSCEH_S03.05","PSCEV_S03.05","PSCEH_S03.06","PSCEH_S03.06","PSCEH_S03.08","PSCEV_S03.08","PSQAB_S03.03","PSQAB_S03.04","PSQF_S03.01","PSSD_S03.03","PSSD_S03.04","PSSF_S03.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.20" ,"reverse": true, "devices":["PSCFH_S03.03","PSCFV_S03.03","PSQK_S03.01","PSCEV_S03.09","PSCEH_S03.10","PSCEV_S03.10","PSQK_S03.02","PSCEV_S03.11","PSCH_S03.01","PSCV_S03.01","PSQD_S03.01","PSQF_S03.02","PSQD_S03.02","PSSD_S03.05","PSSH_S03.01","PSSH_S03.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.05" ,"reverse": true, "embedded":["PSOCT_S03.02","PSOCT_S03.01","PSTRCEB_S03.01","PSTRCEB_S03.02","PSB_S03.01","PSB_S03.02","PSB_S03.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB03.10" ,"reverse": true, "embedded":["PSCFH_S03.01","PSCFV_S03.01","PSCEH_S03.01","PSCEV_S03.01","PSCEH_S03.02","PSCEV_S03.02","PSCEH_S03.03","PSQAB_S03.01","PSQAB_S03.02","PSSF_S03.01","PSSD_S03.01","PSSD_S03.02","PSSF_S03.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB03.15" ,"reverse": true, "embedded":["PSCFH_S03.02","PSCFV_S03.02","PSCEH_S03.05","PSCEV_S03.05","PSCEH_S03.06","PSCEH_S03.06","PSCEH_S03.08","PSCEV_S03.08","PSQAB_S03.03","PSQAB_S03.04","PSQF_S03.01","PSSD_S03.03","PSSD_S03.04","PSSF_S03.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB03.20" ,"reverse": true, "embedded":["PSCFH_S03.03","PSCFV_S03.03","PSQK_S03.01","PSCEV_S03.09","PSCEH_S03.10","PSCEV_S03.10","PSQK_S03.02","PSCEV_S03.11","PSCH_S03.01","PSCV_S03.01","PSQD_S03.01","PSQF_S03.02","PSQD_S03.02","PSSD_S03.05","PSSH_S03.01","PSSH_S03.02"]}
 				]
 			},
 			{
@@ -2419,10 +2440,10 @@
 			{
 				"start": {"x": 6974, "y": -300, "z": 32813},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB03.25" ,"reverse": true, "devices":["PSCFH_S03.04","PSCFV_S03.04","PSCH_S03.02","PSCV_S03.02","PSQK_S03.03","PSCEH_S03.13","PSCEV_S03.13","PSQK_S03.04","PSQD_S03.03","PSQF_S03.03","PSQD_S03.04","PSSH_S03.03","PSSH_S03.04","PSSD_S03.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB03.30" ,"reverse": true, "devices":["PSCFH_S03.05","PSCFV_S03.05","PSCEH_S03.15","PSCEV_S03.15","PSCEH_S03.17","PSCEV_S03.17","PSCEH_S03.18","PSCEV_S03.18","PSQD_S03.04","PSQF_S03.04","PSQAB_S03.05","PSSF_S03.04","PSSD_S03.07","PSSD_S03.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB03.35" ,"reverse": true, "devices":["PSCFH_S03.06","PSCFV_S03.06","PSCEH_S03.20","PSCEV_S03.20","PSCEH_S03.21","PSCEV_S03.21","PSCEH_S03.22","PSCEV_S03.22","PSQAB_S03.06","PSQAB_S03.07","PSSF_S03.05","PSSD_S03.09","PSSD_S03.10","PSSF_S03.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB03.40" ,"reverse": true, "devices":["PSOCT_S03.03","PSOCT_S03.04","PSTRCEB_S03.03","PSTRCEB_S03.04","PSB_S03.04","PSB_S03.05","PSB_S03.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB03.25" ,"reverse": true, "embedded":["PSCFH_S03.04","PSCFV_S03.04","PSCH_S03.02","PSCV_S03.02","PSQK_S03.03","PSCEH_S03.13","PSCEV_S03.13","PSQK_S03.04","PSQD_S03.03","PSQF_S03.03","PSQD_S03.04","PSSH_S03.03","PSSH_S03.04","PSSD_S03.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB03.30" ,"reverse": true, "embedded":["PSCFH_S03.05","PSCFV_S03.05","PSCEH_S03.15","PSCEV_S03.15","PSCEH_S03.17","PSCEV_S03.17","PSCEH_S03.18","PSCEV_S03.18","PSQD_S03.04","PSQF_S03.04","PSQAB_S03.05","PSSF_S03.04","PSSD_S03.07","PSSD_S03.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB03.35" ,"reverse": true, "embedded":["PSCFH_S03.06","PSCFV_S03.06","PSCEH_S03.20","PSCEV_S03.20","PSCEH_S03.21","PSCEV_S03.21","PSCEH_S03.22","PSCEV_S03.22","PSQAB_S03.06","PSQAB_S03.07","PSSF_S03.05","PSSD_S03.09","PSSD_S03.10","PSSF_S03.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB03.40" ,"reverse": true, "embedded":["PSOCT_S03.03","PSOCT_S03.04","PSTRCEB_S03.03","PSTRCEB_S03.04","PSB_S03.04","PSB_S03.05","PSB_S03.06"]}
 				]
 			},
 			{
@@ -2431,10 +2452,10 @@
 			{
 				"start": {"x": 11861, "y": -300, "z": 34942},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2521, "name": "RV_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1713, "name": "RV_AA03.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 890, "name": "RCF_AA03.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA03.05" ,"reverse": true},
+					{"type": "rv", "position": 2521, "name": "RV_AA03.05" ,"reverse": true},
+					{"type": "rv", "position": 1713, "name": "RV_AA03.10" ,"reverse": true},
+					{"type": "rc", "position": 890, "name": "RCF_AA03.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2443,7 +2464,7 @@
 			{
 				"start": {"x": 13666, "y": -300, "z": 30695},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB03.05" ,"reverse": true}
 				]
 			},
 			{
@@ -2452,7 +2473,7 @@
 			{
 				"start": {"x": 8128, "y": -300, "z": 32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB03.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2461,9 +2482,9 @@
 			{
 				"start": {"x": 11248, "y": -300, "z": 35270},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA03.10" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA03.05" ,"reverse": true},
+					{"type": "rid", "position": 610, "name": "RID_AA03.10" ,"reverse": true},
+					{"type": "rid", "position": 1220, "name": "RID_AA03.15" ,"reverse": true}
 				]
 			},
 			{
@@ -2472,8 +2493,8 @@
 			{
 				"start": {"x": 19436, "y": -300, "z": 31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true, "devices":[]},
-					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true, "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA03.05" ,"reverse": true},
+					{"type": "rrf", "position": 649, "name": "RRF_AA03.10" ,"reverse": true}
 				]
 			},
 			{
@@ -2482,8 +2503,8 @@
 			{
 				"start": {"x": -4557, "y": -300, "z": 33250},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "devices":["PSOCT_S04.02","PSOCT_S04.01","PSTRCEB_S04.01","PSTRCEB_S04.02","PSB_S04.01","PSB_S04.02","PSB_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.10", "devices":["PSCFH_S04.01","PSCFV_S04.01","PSCEH_S04.01","PSCEV_S04.01","PSCEH_S04.02","PSCEV_S04.02","PSCEH_S04.03","PSQAB_S04.01","PSQAB_S04.02","PSSF_S04.01","PSSD_S04.01","PSSD_S04.02","PSSF_S04.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB04.05", "embedded":["PSOCT_S04.02","PSOCT_S04.01","PSTRCEB_S04.01","PSTRCEB_S04.02","PSB_S04.01","PSB_S04.02","PSB_S04.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB04.10", "embedded":["PSCFH_S04.01","PSCFV_S04.01","PSCEH_S04.01","PSCEV_S04.01","PSCEH_S04.02","PSCEV_S04.02","PSCEH_S04.03","PSQAB_S04.01","PSQAB_S04.02","PSSF_S04.01","PSSD_S04.01","PSSD_S04.02","PSSF_S04.02"]}
 				]
 			},
 			{
@@ -2492,12 +2513,12 @@
 			{
 				"start": {"x": -8682, "y": -300, "z": 32403},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "devices":["PSCFH_S04.02","PSCFV_S04.02","PSCEH_S04.05","PSCEV_S04.05","PSCEH_S04.06","PSCEH_S04.06","PSCEH_S04.08","PSCEV_S04.08","PSQAB_S04.03","PSQAB_S04.04","PSQF_S04.01","PSSD_S04.03","PSSD_S04.04","PSSF_S04.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB04.20", "devices":["PSCFH_S04.03","PSCFV_S04.03","PSQK_S04.01","PSCEV_S04.09","PSCEH_S04.10","PSCEV_S04.10","PSQK_S04.02","PSCEV_S04.11","PSCH_S04.01","PSCV_S04.01","PSQD_S04.01","PSQF_S04.02","PSQD_S04.02","PSSD_S04.05","PSSH_S04.01","PSSH_S04.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "devices":["PSCFH_S04.04","PSCFV_S04.04","PSCH_S04.02","PSCV_S04.02","PSQK_S04.03","PSCEH_S04.13","PSCEV_S04.13","PSQK_S04.04","PSQD_S04.03","PSQF_S04.03","PSQD_S04.04","PSSH_S04.03","PSSH_S04.04","PSSD_S04.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB04.30", "devices":["PSCFH_S04.05","PSCFV_S04.05","PSCEH_S04.15","PSCEV_S04.15","PSCEH_S04.17","PSCEV_S04.17","PSCEH_S04.18","PSCEV_S04.18","PSQD_S04.04","PSQF_S04.04","PSQAB_S04.05","PSSF_S04.04","PSSD_S04.07","PSSD_S04.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB04.35", "devices":["PSCFH_S04.06","PSCFV_S04.06","PSCEH_S04.20","PSCEV_S04.20","PSCEH_S04.21","PSCEV_S04.21","PSCEH_S04.22","PSCEV_S04.22","PSQAB_S04.06","PSQAB_S04.07","PSSF_S04.05","PSSD_S04.09","PSSD_S04.10","PSSF_S04.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB04.40", "devices":["PSOCT_S04.03","PSOCT_S04.04","PSTRCEB_S04.03","PSTRCEB_S04.04","PSB_S04.04","PSB_S04.05","PSB_S04.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB04.15", "embedded":["PSCFH_S04.02","PSCFV_S04.02","PSCEH_S04.05","PSCEV_S04.05","PSCEH_S04.06","PSCEH_S04.06","PSCEH_S04.08","PSCEV_S04.08","PSQAB_S04.03","PSQAB_S04.04","PSQF_S04.01","PSSD_S04.03","PSSD_S04.04","PSSF_S04.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB04.20", "embedded":["PSCFH_S04.03","PSCFV_S04.03","PSQK_S04.01","PSCEV_S04.09","PSCEH_S04.10","PSCEV_S04.10","PSQK_S04.02","PSCEV_S04.11","PSCH_S04.01","PSCV_S04.01","PSQD_S04.01","PSQF_S04.02","PSQD_S04.02","PSSD_S04.05","PSSH_S04.01","PSSH_S04.02"]},
+					{"type": "rps", "position": 3397, "name": "RPS_AB04.25", "embedded":["PSCFH_S04.04","PSCFV_S04.04","PSCH_S04.02","PSCV_S04.02","PSQK_S04.03","PSCEH_S04.13","PSCEV_S04.13","PSQK_S04.04","PSQD_S04.03","PSQF_S04.03","PSQD_S04.04","PSSH_S04.03","PSSH_S04.04","PSSD_S04.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB04.30", "embedded":["PSCFH_S04.05","PSCFV_S04.05","PSCEH_S04.15","PSCEV_S04.15","PSCEH_S04.17","PSCEV_S04.17","PSCEH_S04.18","PSCEV_S04.18","PSQD_S04.04","PSQF_S04.04","PSQAB_S04.05","PSSF_S04.04","PSSD_S04.07","PSSD_S04.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB04.35", "embedded":["PSCFH_S04.06","PSCFV_S04.06","PSCEH_S04.20","PSCEV_S04.20","PSCEH_S04.21","PSCEV_S04.21","PSCEH_S04.22","PSCEV_S04.22","PSQAB_S04.06","PSQAB_S04.07","PSSF_S04.05","PSSD_S04.09","PSSD_S04.10","PSSF_S04.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB04.40", "embedded":["PSOCT_S04.03","PSOCT_S04.04","PSTRCEB_S04.03","PSTRCEB_S04.04","PSB_S04.04","PSB_S04.05","PSB_S04.06"]}
 				]
 			},
 			{
@@ -2506,10 +2527,10 @@
 			{
 				"start": {"x": -7199, "y": -300, "z": 36191},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA04.05", "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA04.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA04.10", "devices":[]},
-					{"type": "rc", "position": 828, "name": "RCF_AA04.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA04.05"},
+					{"type": "rv", "position": 2457, "name": "RV_AA04.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA04.10"},
+					{"type": "rc", "position": 828, "name": "RCF_AA04.05"}
 				]
 			},
 			{
@@ -2518,7 +2539,7 @@
 			{
 				"start": {"x": -3512, "y": -300, "z": 33415},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB04.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB04.05"}
 				]
 			},
 			{
@@ -2527,7 +2548,7 @@
 			{
 				"start": {"x": -10939, "y": -300, "z": 31769},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB04.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB04.10"}
 				]
 			},
 			{
@@ -2536,9 +2557,9 @@
 			{
 				"start": {"x": -2784, "y": -300, "z": 36916},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA04.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA04.10", "devices":[]},
-					{"type": "rid", "position": 1219, "name": "RID_AA04.15", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA04.05"},
+					{"type": "rid", "position": 610, "name": "RID_AA04.10"},
+					{"type": "rid", "position": 1219, "name": "RID_AA04.15"}
 				]
 			},
 			{
@@ -2547,8 +2568,8 @@
 			{
 				"start": {"x": 973, "y": -300, "z": 37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA04.05", "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AA04.10", "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA04.05"},
+					{"type": "rrf", "position": 650, "name": "RRF_AA04.10"}
 				]
 			},
 			{
@@ -2557,10 +2578,10 @@
 			{
 				"start": {"x": -20653, "y": -300, "z": 26435},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "devices":["PSOCT_S05.02","PSOCT_S05.01","PSTRCEB_S05.01","PSTRCEB_S05.02","PSB_S05.01","PSB_S05.02","PSB_S05.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.10", "devices":["PSCFH_S05.01","PSCFV_S05.01","PSCEH_S05.01","PSCEV_S05.01","PSCEH_S05.02","PSCEV_S05.02","PSCEH_S05.03","PSQAB_S05.01","PSQAB_S05.02","PSSF_S05.01","PSSD_S05.01","PSSD_S05.02","PSSF_S05.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.15", "devices":["PSCFH_S05.02","PSCFV_S05.02","PSCEH_S05.05","PSCEV_S05.05","PSCEH_S05.06","PSCEH_S05.06","PSCEH_S05.08","PSCEV_S05.08","PSQAB_S05.03","PSQAB_S05.04","PSQF_S05.01","PSSD_S05.03","PSSD_S05.04","PSSF_S05.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.20", "devices":["PSCFH_S05.03","PSCFV_S05.03","PSQK_S05.01","PSCEV_S05.09","PSCEH_S05.10","PSCEV_S05.10","PSQK_S05.02","PSCEV_S05.11","PSCH_S05.01","PSCV_S05.01","PSQD_S05.01","PSQF_S05.02","PSQD_S05.02","PSSD_S05.05","PSSH_S05.01","PSSH_S05.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.05", "embedded":["PSOCT_S05.02","PSOCT_S05.01","PSTRCEB_S05.01","PSTRCEB_S05.02","PSB_S05.01","PSB_S05.02","PSB_S05.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB05.10", "embedded":["PSCFH_S05.01","PSCFV_S05.01","PSCEH_S05.01","PSCEV_S05.01","PSCEH_S05.02","PSCEV_S05.02","PSCEH_S05.03","PSQAB_S05.01","PSQAB_S05.02","PSSF_S05.01","PSSD_S05.01","PSSD_S05.02","PSSF_S05.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB05.15", "embedded":["PSCFH_S05.02","PSCFV_S05.02","PSCEH_S05.05","PSCEV_S05.05","PSCEH_S05.06","PSCEH_S05.06","PSCEH_S05.08","PSCEV_S05.08","PSQAB_S05.03","PSQAB_S05.04","PSQF_S05.01","PSSD_S05.03","PSSD_S05.04","PSSF_S05.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB05.20", "embedded":["PSCFH_S05.03","PSCFV_S05.03","PSQK_S05.01","PSCEV_S05.09","PSCEH_S05.10","PSCEV_S05.10","PSQK_S05.02","PSCEV_S05.11","PSCH_S05.01","PSCV_S05.01","PSQD_S05.01","PSQF_S05.02","PSQD_S05.02","PSSD_S05.05","PSSH_S05.01","PSSH_S05.02"]}
 				]
 			},
 			{
@@ -2569,10 +2590,10 @@
 			{
 				"start": {"x": -24930, "y": -300, "z": 22447},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "devices":["PSCFH_S05.04","PSCFV_S05.04","PSCH_S05.02","PSCV_S05.02","PSQK_S05.03","PSCEH_S05.13","PSCEV_S05.13","PSQK_S05.04","PSQD_S05.03","PSQF_S05.03","PSQD_S05.04","PSSH_S05.03","PSSH_S05.04","PSSD_S05.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB05.30", "devices":["PSCFH_S05.05","PSCFV_S05.05","PSCEH_S05.15","PSCEV_S05.15","PSCEH_S05.17","PSCEV_S05.17","PSCEH_S05.18","PSCEV_S05.18","PSQD_S05.04","PSQF_S05.04","PSQAB_S05.05","PSSF_S05.04","PSSD_S05.07","PSSD_S05.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB05.35", "devices":["PSCFH_S05.06","PSCFV_S05.06","PSCEH_S05.20","PSCEV_S05.20","PSCEH_S05.21","PSCEV_S05.21","PSCEH_S05.22","PSCEV_S05.22","PSQAB_S05.06","PSQAB_S05.07","PSSF_S05.05","PSSD_S05.09","PSSD_S05.10","PSSF_S05.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB05.40", "devices":["PSOCT_S05.03","PSOCT_S05.04","PSTRCEB_S05.03","PSTRCEB_S05.04","PSB_S05.04","PSB_S05.05","PSB_S05.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB05.25", "embedded":["PSCFH_S05.04","PSCFV_S05.04","PSCH_S05.02","PSCV_S05.02","PSQK_S05.03","PSCEH_S05.13","PSCEV_S05.13","PSQK_S05.04","PSQD_S05.03","PSQF_S05.03","PSQD_S05.04","PSSH_S05.03","PSSH_S05.04","PSSD_S05.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB05.30", "embedded":["PSCFH_S05.05","PSCFV_S05.05","PSCEH_S05.15","PSCEV_S05.15","PSCEH_S05.17","PSCEV_S05.17","PSCEH_S05.18","PSCEV_S05.18","PSQD_S05.04","PSQF_S05.04","PSQAB_S05.05","PSSF_S05.04","PSSD_S05.07","PSSD_S05.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB05.35", "embedded":["PSCFH_S05.06","PSCFV_S05.06","PSCEH_S05.20","PSCEV_S05.20","PSCEH_S05.21","PSCEV_S05.21","PSCEH_S05.22","PSCEV_S05.22","PSQAB_S05.06","PSQAB_S05.07","PSSF_S05.05","PSSD_S05.09","PSSD_S05.10","PSSF_S05.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB05.40", "embedded":["PSOCT_S05.03","PSOCT_S05.04","PSTRCEB_S05.03","PSTRCEB_S05.04","PSB_S05.04","PSB_S05.05","PSB_S05.06"]}
 				]
 			},
 			{
@@ -2581,7 +2602,7 @@
 			{
 				"start": {"x": -15763, "y": -300, "z": 27743},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA05.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA05.05"}
 				]
 			},
 			{
@@ -2590,7 +2611,7 @@
 			{
 				"start": {"x": -24330, "y": -300, "z": 21302},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AC05.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AC05.05"}
 				]
 			},
 			{
@@ -2599,9 +2620,9 @@
 			{
 				"start": {"x": -22315, "y": -300, "z": 29149},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA05.05", "devices":[]},
-					{"type": "rv", "position": 810, "name": "RV_AA05.10", "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA05.05", "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA05.05"},
+					{"type": "rv", "position": 810, "name": "RV_AA05.10"},
+					{"type": "rc", "position": 1643, "name": "RCF_AA05.05"}
 				]
 			},
 			{
@@ -2610,7 +2631,7 @@
 			{
 				"start": {"x": -19749, "y": -300, "z": 27182},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB05.05"}
 				]
 			},
 			{
@@ -2619,7 +2640,7 @@
 			{
 				"start": {"x": -24169, "y": -300, "z": 23340},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB05.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB05.10"}
 				]
 			},
 			{
@@ -2628,10 +2649,10 @@
 			{
 				"start": {"x": -25986, "y": -300, "z": 25986},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.10", "devices":[]},
-					{"type": "rc", "position": 769, "name": "RC_AA05.15", "devices":[]},
-					{"type": "rc", "position": 1539, "name": "RC_AA05.20", "devices":[]},
-					{"type": "rc", "position": 2758, "name": "RC_AA05.25", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AA05.10"},
+					{"type": "rc", "position": 769, "name": "RC_AA05.15"},
+					{"type": "rc", "position": 1539, "name": "RC_AA05.20"},
+					{"type": "rc", "position": 2758, "name": "RC_AA05.25"}
 				]
 			},
 			{
@@ -2640,9 +2661,9 @@
 			{
 				"start": {"x": -14964, "y": -300, "z": 23718},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AC05.05", "devices":[]},
-					{"type": "rc", "position": 700, "name": "RC_AC05.10", "devices":[]},
-					{"type": "rc", "position": 1400, "name": "RC_AC05.15", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AC05.05"},
+					{"type": "rc", "position": 700, "name": "RC_AC05.10"},
+					{"type": "rc", "position": 1400, "name": "RC_AC05.15"}
 				]
 			},
 			{
@@ -2651,7 +2672,7 @@
 			{
 				"start": {"x": -21638, "y": -300, "z": 29673},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA05.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AA05.05"}
 				]
 			},
 			{
@@ -2660,7 +2681,7 @@
 			{
 				"start": {"x": -16798, "y": -300, "z": 32968},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA05.05", "devices":[]}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA05.05"}
 				]
 			},
 			{
@@ -2669,8 +2690,8 @@
 			{
 				"start": {"x": -24884, "y": -300, "z": 27390},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA05.05", "devices":[]},
-					{"type": "rid", "position": 611, "name": "RID_AA05.10", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA05.05"},
+					{"type": "rid", "position": 611, "name": "RID_AA05.10"}
 				]
 			},
 			{
@@ -2679,12 +2700,12 @@
 			{
 				"start": {"x": -27524, "y": -300, "z": 19273},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AB05.05", "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AB05.10", "devices":[]},
-					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "devices":["PSOCT_S06.02","PSOCT_S06.01","PSTRCEB_S06.01","PSTRCEB_S06.02","PSB_S06.01","PSB_S06.02","PSB_S06.03"]},
-					{"type": "rps", "position": 2578, "name": "RPS_AB06.10", "devices":["PSCFH_S06.01","PSCFV_S06.01","PSCEH_S06.01","PSCEV_S06.01","PSCEH_S06.02","PSCEV_S06.02","PSCEH_S06.03","PSQAB_S06.01","PSQAB_S06.02","PSSF_S06.01","PSSD_S06.01","PSSD_S06.02","PSSF_S06.02"]},
-					{"type": "rps", "position": 3399, "name": "RPS_AB06.15", "devices":["PSCFH_S06.02","PSCFV_S06.02","PSCEH_S06.05","PSCEV_S06.05","PSCEH_S06.06","PSCEH_S06.06","PSCEH_S06.08","PSCEV_S06.08","PSQAB_S06.03","PSQAB_S06.04","PSQF_S06.01","PSSD_S06.03","PSSD_S06.04","PSSF_S06.03"]},
-					{"type": "rps", "position": 4220, "name": "RPS_AB06.20", "devices":["PSCFH_S06.03","PSCFV_S06.03","PSQK_S06.01","PSCEV_S06.09","PSCEH_S06.10","PSCEV_S06.10","PSQK_S06.02","PSCEV_S06.11","PSCH_S06.01","PSCV_S06.01","PSQD_S06.01","PSQF_S06.02","PSQD_S06.02","PSSD_S06.05","PSSH_S06.01","PSSH_S06.02"]}
+					{"type": "rrf", "position": 0, "name": "RRF_AB05.05"},
+					{"type": "rrf", "position": 650, "name": "RRF_AB05.10"},
+					{"type": "rps", "position": 1759, "name": "RPS_AB06.05", "embedded":["PSOCT_S06.02","PSOCT_S06.01","PSTRCEB_S06.01","PSTRCEB_S06.02","PSB_S06.01","PSB_S06.02","PSB_S06.03"]},
+					{"type": "rps", "position": 2578, "name": "RPS_AB06.10", "embedded":["PSCFH_S06.01","PSCFV_S06.01","PSCEH_S06.01","PSCEV_S06.01","PSCEH_S06.02","PSCEV_S06.02","PSCEH_S06.03","PSQAB_S06.01","PSQAB_S06.02","PSSF_S06.01","PSSD_S06.01","PSSD_S06.02","PSSF_S06.02"]},
+					{"type": "rps", "position": 3399, "name": "RPS_AB06.15", "embedded":["PSCFH_S06.02","PSCFV_S06.02","PSCEH_S06.05","PSCEV_S06.05","PSCEH_S06.06","PSCEH_S06.06","PSCEH_S06.08","PSCEV_S06.08","PSQAB_S06.03","PSQAB_S06.04","PSQF_S06.01","PSSD_S06.03","PSSD_S06.04","PSSF_S06.03"]},
+					{"type": "rps", "position": 4220, "name": "RPS_AB06.20", "embedded":["PSCFH_S06.03","PSCFV_S06.03","PSQK_S06.01","PSCEV_S06.09","PSCEH_S06.10","PSCEV_S06.10","PSQK_S06.02","PSCEV_S06.11","PSCH_S06.01","PSCV_S06.01","PSQD_S06.01","PSQF_S06.02","PSQD_S06.02","PSSD_S06.05","PSSH_S06.01","PSSH_S06.02"]}
 				]
 			},
 			{
@@ -2693,10 +2714,10 @@
 			{
 				"start": {"x": -32813, "y": -300, "z": 6975},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "devices":["PSCFH_S06.04","PSCFV_S06.04","PSCH_S06.02","PSCV_S06.02","PSQK_S06.03","PSCEH_S06.13","PSCEV_S06.13","PSQK_S06.04","PSQD_S06.03","PSQF_S06.03","PSQD_S06.04","PSSH_S06.03","PSSH_S06.04","PSSD_S06.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB06.30", "devices":["PSCFH_S06.05","PSCFV_S06.05","PSCEH_S06.15","PSCEV_S06.15","PSCEH_S06.17","PSCEV_S06.17","PSCEH_S06.18","PSCEV_S06.18","PSQD_S06.04","PSQF_S06.04","PSQAB_S06.05","PSSF_S06.04","PSSD_S06.07","PSSD_S06.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB06.35", "devices":["PSCFH_S06.06","PSCFV_S06.06","PSCEH_S06.20","PSCEV_S06.20","PSCEH_S06.21","PSCEV_S06.21","PSCEH_S06.22","PSCEV_S06.22","PSQAB_S06.06","PSQAB_S06.07","PSSF_S06.05","PSSD_S06.09","PSSD_S06.10","PSSF_S06.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB06.40", "devices":["PSOCT_S06.03","PSOCT_S06.04","PSTRCEB_S06.03","PSTRCEB_S06.04","PSB_S06.04","PSB_S06.05","PSB_S06.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB06.25", "embedded":["PSCFH_S06.04","PSCFV_S06.04","PSCH_S06.02","PSCV_S06.02","PSQK_S06.03","PSCEH_S06.13","PSCEV_S06.13","PSQK_S06.04","PSQD_S06.03","PSQF_S06.03","PSQD_S06.04","PSSH_S06.03","PSSH_S06.04","PSSD_S06.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB06.30", "embedded":["PSCFH_S06.05","PSCFV_S06.05","PSCEH_S06.15","PSCEV_S06.15","PSCEH_S06.17","PSCEV_S06.17","PSCEH_S06.18","PSCEV_S06.18","PSQD_S06.04","PSQF_S06.04","PSQAB_S06.05","PSSF_S06.04","PSSD_S06.07","PSSD_S06.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB06.35", "embedded":["PSCFH_S06.06","PSCFV_S06.06","PSCEH_S06.20","PSCEV_S06.20","PSCEH_S06.21","PSCEV_S06.21","PSCEH_S06.22","PSCEV_S06.22","PSQAB_S06.06","PSQAB_S06.07","PSSF_S06.05","PSSD_S06.09","PSSD_S06.10","PSSF_S06.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB06.40", "embedded":["PSOCT_S06.03","PSOCT_S06.04","PSTRCEB_S06.03","PSTRCEB_S06.04","PSB_S06.04","PSB_S06.05","PSB_S06.06"]}
 				]
 			},
 			{
@@ -2705,10 +2726,10 @@
 			{
 				"start": {"x": -34942, "y": -300, "z": 11862},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA06.05", "devices":[]},
-					{"type": "rv", "position": 2456, "name": "RV_AA06.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA06.10", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA06.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA06.05"},
+					{"type": "rv", "position": 2456, "name": "RV_AA06.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA06.10"},
+					{"type": "rc", "position": 827, "name": "RCF_AA06.05"}
 				]
 			},
 			{
@@ -2717,7 +2738,7 @@
 			{
 				"start": {"x": -32601, "y": -300, "z": 8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB06.05"}
 				]
 			},
 			{
@@ -2726,7 +2747,7 @@
 			{
 				"start": {"x": -33518, "y": -300, "z": 2343},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB06.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB06.10"}
 				]
 			},
 			{
@@ -2735,9 +2756,9 @@
 			{
 				"start": {"x": -35270, "y": -300, "z": 11249},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA06.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA06.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA06.15", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA06.05"},
+					{"type": "rid", "position": 610, "name": "RID_AA06.10"},
+					{"type": "rid", "position": 1220, "name": "RID_AA06.15"}
 				]
 			},
 			{
@@ -2746,8 +2767,8 @@
 			{
 				"start": {"x": -33250, "y": -300, "z": -4556},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB07.05", "devices":["PSOCT_S07.02","PSOCT_S07.01","PSTRCEB_S07.01","PSTRCEB_S07.02","PSB_S07.01","PSB_S07.02","PSB_S07.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB07.10", "devices":["PSCFH_S07.01","PSCFV_S07.01","PSCEH_S07.01","PSCEV_S07.01","PSCEH_S07.02","PSCEV_S07.02","PSCEH_S07.03","PSQAB_S07.01","PSQAB_S07.02","PSSF_S07.01","PSSD_S07.01","PSSD_S07.02","PSSF_S07.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB07.05", "embedded":["PSOCT_S07.02","PSOCT_S07.01","PSTRCEB_S07.01","PSTRCEB_S07.02","PSB_S07.01","PSB_S07.02","PSB_S07.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB07.10", "embedded":["PSCFH_S07.01","PSCFV_S07.01","PSCEH_S07.01","PSCEV_S07.01","PSCEH_S07.02","PSCEV_S07.02","PSCEH_S07.03","PSQAB_S07.01","PSQAB_S07.02","PSSF_S07.01","PSSD_S07.01","PSSD_S07.02","PSSF_S07.02"]}
 				]
 			},
 			{
@@ -2756,12 +2777,12 @@
 			{
 				"start": {"x": -32403, "y": -300, "z": -8681},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB07.15", "devices":["PSCFH_S07.02","PSCFV_S07.02","PSCEH_S07.05","PSCEV_S07.05","PSCEH_S07.06","PSCEH_S07.06","PSCEH_S07.08","PSCEV_S07.08","PSQAB_S07.03","PSQAB_S07.04","PSQF_S07.01","PSSD_S07.03","PSSD_S07.04","PSSF_S07.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB07.20", "devices":["PSCFH_S07.03","PSCFV_S07.03","PSQK_S07.01","PSCEV_S07.09","PSCEH_S07.10","PSCEV_S07.10","PSQK_S07.02","PSCEV_S07.11","PSCH_S07.01","PSCV_S07.01","PSQD_S07.01","PSQF_S07.02","PSQD_S07.02","PSSD_S07.05","PSSH_S07.01","PSSH_S07.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB07.25", "devices":["PSCFH_S07.04","PSCFV_S07.04","PSCH_S07.02","PSCV_S07.02","PSQK_S07.03","PSCEH_S07.13","PSCEV_S07.13","PSQK_S07.04","PSQD_S07.03","PSQF_S07.03","PSQD_S07.04","PSSH_S07.03","PSSH_S07.04","PSSD_S07.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB07.30", "devices":["PSCFH_S07.05","PSCFV_S07.05","PSCEH_S07.15","PSCEV_S07.15","PSCEH_S07.17","PSCEV_S07.17","PSCEH_S07.18","PSCEV_S07.18","PSQD_S07.04","PSQF_S07.04","PSQAB_S07.05","PSSF_S07.04","PSSD_S07.07","PSSD_S07.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB07.35", "devices":["PSCFH_S07.06","PSCFV_S07.06","PSCEH_S07.20","PSCEV_S07.20","PSCEH_S07.21","PSCEV_S07.21","PSCEH_S07.22","PSCEV_S07.22","PSQAB_S07.06","PSQAB_S07.07","PSSF_S07.05","PSSD_S07.09","PSSD_S07.10","PSSF_S07.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB07.40", "devices":["PSOCT_S07.03","PSOCT_S07.04","PSTRCEB_S07.03","PSTRCEB_S07.04","PSB_S07.04","PSB_S07.05","PSB_S07.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB07.15", "embedded":["PSCFH_S07.02","PSCFV_S07.02","PSCEH_S07.05","PSCEV_S07.05","PSCEH_S07.06","PSCEH_S07.06","PSCEH_S07.08","PSCEV_S07.08","PSQAB_S07.03","PSQAB_S07.04","PSQF_S07.01","PSSD_S07.03","PSSD_S07.04","PSSF_S07.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB07.20", "embedded":["PSCFH_S07.03","PSCFV_S07.03","PSQK_S07.01","PSCEV_S07.09","PSCEH_S07.10","PSCEV_S07.10","PSQK_S07.02","PSCEV_S07.11","PSCH_S07.01","PSCV_S07.01","PSQD_S07.01","PSQF_S07.02","PSQD_S07.02","PSSD_S07.05","PSSH_S07.01","PSSH_S07.02"]},
+					{"type": "rps", "position": 3397, "name": "RPS_AB07.25", "embedded":["PSCFH_S07.04","PSCFV_S07.04","PSCH_S07.02","PSCV_S07.02","PSQK_S07.03","PSCEH_S07.13","PSCEV_S07.13","PSQK_S07.04","PSQD_S07.03","PSQF_S07.03","PSQD_S07.04","PSSH_S07.03","PSSH_S07.04","PSSD_S07.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB07.30", "embedded":["PSCFH_S07.05","PSCFV_S07.05","PSCEH_S07.15","PSCEV_S07.15","PSCEH_S07.17","PSCEV_S07.17","PSCEH_S07.18","PSCEV_S07.18","PSQD_S07.04","PSQF_S07.04","PSQAB_S07.05","PSSF_S07.04","PSSD_S07.07","PSSD_S07.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB07.35", "embedded":["PSCFH_S07.06","PSCFV_S07.06","PSCEH_S07.20","PSCEV_S07.20","PSCEH_S07.21","PSCEV_S07.21","PSCEH_S07.22","PSCEV_S07.22","PSQAB_S07.06","PSQAB_S07.07","PSSF_S07.05","PSSD_S07.09","PSSD_S07.10","PSSF_S07.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB07.40", "embedded":["PSOCT_S07.03","PSOCT_S07.04","PSTRCEB_S07.03","PSTRCEB_S07.04","PSB_S07.04","PSB_S07.05","PSB_S07.06"]}
 				]
 			},
 			{
@@ -2770,10 +2791,10 @@
 			{
 				"start": {"x": -36191, "y": -300, "z": -7198},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA07.05", "devices":[]},
-					{"type": "rv", "position": 2457, "name": "RV_AA07.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA07.10", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA07.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA07.05"},
+					{"type": "rv", "position": 2457, "name": "RV_AA07.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA07.10"},
+					{"type": "rc", "position": 827, "name": "RCF_AA07.05"}
 				]
 			},
 			{
@@ -2782,7 +2803,7 @@
 			{
 				"start": {"x": -33415, "y": -300, "z": -3512},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB07.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB07.05"}
 				]
 			},
 			{
@@ -2791,7 +2812,7 @@
 			{
 				"start": {"x": -31769, "y": -300, "z": -10939},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB07.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB07.10"}
 				]
 			},
 			{
@@ -2800,7 +2821,7 @@
 			{
 				"start": {"x": -36950, "y": -300, "z": 1937},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA07.05", "devices":[]}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA07.05"}
 				]
 			},
 			{
@@ -2809,8 +2830,8 @@
 			{
 				"start": {"x": -36856, "y": -300, "z": -3325},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA07.05", "devices":[]},
-					{"type": "rid", "position": 609, "name": "RID_AA07.10", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA07.05"},
+					{"type": "rid", "position": 609, "name": "RID_AA07.10"}
 				]
 			},
 			{
@@ -2819,8 +2840,8 @@
 			{
 				"start": {"x": -32966, "y": -300, "z": -16579},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA08.05", "devices":[]},
-					{"type": "rcry", "position": 610, "name": "RCRY_AA08.10", "devices":[]}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA08.05"},
+					{"type": "rcry", "position": 610, "name": "RCRY_AA08.10"}
 				]
 			},
 			{
@@ -2829,10 +2850,10 @@
 			{
 				"start": {"x": -26435, "y": -300, "z": -20652},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB08.05", "devices":["PSOCT_S08.02","PSOCT_S08.01","PSTRCEB_S08.01","PSTRCEB_S08.02","PSB_S08.01","PSB_S08.02","PSB_S08.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB08.10", "devices":["PSCFH_S08.01","PSCFV_S08.01","PSCEH_S08.01","PSCEV_S08.01","PSCEH_S08.02","PSCEV_S08.02","PSCEH_S08.03","PSQAB_S08.01","PSQAB_S08.02","PSSF_S08.01","PSSD_S08.01","PSSD_S08.02","PSSF_S08.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB08.15", "devices":["PSCFH_S08.02","PSCFV_S08.02","PSCEH_S08.05","PSCEV_S08.05","PSCEH_S08.06","PSCEH_S08.06","PSCEH_S08.08","PSCEV_S08.08","PSQAB_S08.03","PSQAB_S08.04","PSQF_S08.01","PSSD_S08.03","PSSD_S08.04","PSSF_S08.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB08.20", "devices":["PSCFH_S08.03","PSCFV_S08.03","PSQK_S08.01","PSCEV_S08.09","PSCEH_S08.10","PSCEV_S08.10","PSQK_S08.02","PSCEV_S08.11","PSCH_S08.01","PSCV_S08.01","PSQD_S08.01","PSQF_S08.02","PSQD_S08.02","PSSD_S08.05","PSSH_S08.01","PSSH_S08.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB08.05", "embedded":["PSOCT_S08.02","PSOCT_S08.01","PSTRCEB_S08.01","PSTRCEB_S08.02","PSB_S08.01","PSB_S08.02","PSB_S08.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB08.10", "embedded":["PSCFH_S08.01","PSCFV_S08.01","PSCEH_S08.01","PSCEV_S08.01","PSCEH_S08.02","PSCEV_S08.02","PSCEH_S08.03","PSQAB_S08.01","PSQAB_S08.02","PSSF_S08.01","PSSD_S08.01","PSSD_S08.02","PSSF_S08.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB08.15", "embedded":["PSCFH_S08.02","PSCFV_S08.02","PSCEH_S08.05","PSCEV_S08.05","PSCEH_S08.06","PSCEH_S08.06","PSCEH_S08.08","PSCEV_S08.08","PSQAB_S08.03","PSQAB_S08.04","PSQF_S08.01","PSSD_S08.03","PSSD_S08.04","PSSF_S08.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB08.20", "embedded":["PSCFH_S08.03","PSCFV_S08.03","PSQK_S08.01","PSCEV_S08.09","PSCEH_S08.10","PSCEV_S08.10","PSQK_S08.02","PSCEV_S08.11","PSCH_S08.01","PSCV_S08.01","PSQD_S08.01","PSQF_S08.02","PSQD_S08.02","PSSD_S08.05","PSSH_S08.01","PSSH_S08.02"]}
 				]
 			},
 			{
@@ -2841,10 +2862,10 @@
 			{
 				"start": {"x": -22447, "y": -300, "z": -24929},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB08.25", "devices":["PSCFH_S08.04","PSCFV_S08.04","PSCH_S08.02","PSCV_S08.02","PSQK_S08.03","PSCEH_S08.13","PSCEV_S08.13","PSQK_S08.04","PSQD_S08.03","PSQF_S08.03","PSQD_S08.04","PSSH_S08.03","PSSH_S08.04","PSSD_S08.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB08.30", "devices":["PSCFH_S08.05","PSCFV_S08.05","PSCEH_S08.15","PSCEV_S08.15","PSCEH_S08.17","PSCEV_S08.17","PSCEH_S08.18","PSCEV_S08.18","PSQD_S08.04","PSQF_S08.04","PSQAB_S08.05","PSSF_S08.04","PSSD_S08.07","PSSD_S08.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB08.35", "devices":["PSCFH_S08.06","PSCFV_S08.06","PSCEH_S08.20","PSCEV_S08.20","PSCEH_S08.21","PSCEV_S08.21","PSCEH_S08.22","PSCEV_S08.22","PSQAB_S08.06","PSQAB_S08.07","PSSF_S08.05","PSSD_S08.09","PSSD_S08.10","PSSF_S08.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB08.40", "devices":["PSOCT_S08.03","PSOCT_S08.04","PSTRCEB_S08.03","PSTRCEB_S08.04","PSB_S08.04","PSB_S08.05","PSB_S08.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB08.25", "embedded":["PSCFH_S08.04","PSCFV_S08.04","PSCH_S08.02","PSCV_S08.02","PSQK_S08.03","PSCEH_S08.13","PSCEV_S08.13","PSQK_S08.04","PSQD_S08.03","PSQF_S08.03","PSQD_S08.04","PSSH_S08.03","PSSH_S08.04","PSSD_S08.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB08.30", "embedded":["PSCFH_S08.05","PSCFV_S08.05","PSCEH_S08.15","PSCEV_S08.15","PSCEH_S08.17","PSCEV_S08.17","PSCEH_S08.18","PSCEV_S08.18","PSQD_S08.04","PSQF_S08.04","PSQAB_S08.05","PSSF_S08.04","PSSD_S08.07","PSSD_S08.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB08.35", "embedded":["PSCFH_S08.06","PSCFV_S08.06","PSCEH_S08.20","PSCEV_S08.20","PSCEH_S08.21","PSCEV_S08.21","PSCEH_S08.22","PSCEV_S08.22","PSQAB_S08.06","PSQAB_S08.07","PSSF_S08.05","PSSD_S08.09","PSSD_S08.10","PSSF_S08.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB08.40", "embedded":["PSOCT_S08.03","PSOCT_S08.04","PSTRCEB_S08.03","PSTRCEB_S08.04","PSB_S08.04","PSB_S08.05","PSB_S08.06"]}
 				]
 			},
 			{
@@ -2853,8 +2874,8 @@
 			{
 				"start": {"x": -28164, "y": -300, "z": -23841},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA08.05", "devices":[]},
-					{"type": "rd", "position": 645, "name": "RD_AA08.10", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA08.05"},
+					{"type": "rd", "position": 645, "name": "RD_AA08.10"}
 				]
 			},
 			{
@@ -2863,9 +2884,9 @@
 			{
 				"start": {"x": -29534, "y": -300, "z": -21802},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA08.05", "devices":[]},
-					{"type": "rv", "position": 810, "name": "RV_AA08.10", "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA08.05", "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA08.05"},
+					{"type": "rv", "position": 810, "name": "RV_AA08.10"},
+					{"type": "rc", "position": 1643, "name": "RCF_AA08.05"}
 				]
 			},
 			{
@@ -2874,7 +2895,7 @@
 			{
 				"start": {"x": -27182, "y": -300, "z": -19749},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB08.05"}
 				]
 			},
 			{
@@ -2883,7 +2904,7 @@
 			{
 				"start": {"x": -23340, "y": -300, "z": -24169},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB08.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB08.10"}
 				]
 			},
 			{
@@ -2892,9 +2913,9 @@
 			{
 				"start": {"x": -27333, "y": -300, "z": -24968},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA08.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA08.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA08.15", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA08.05"},
+					{"type": "rid", "position": 610, "name": "RID_AA08.10"},
+					{"type": "rid", "position": 1220, "name": "RID_AA08.15"}
 				]
 			},
 			{
@@ -2903,10 +2924,10 @@
 			{
 				"start": {"x": -12567, "y": -300, "z": -31102},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB09.05", "devices":["PSOCT_S09.02","PSOCT_S09.01","PSTRCEB_S09.01","PSTRCEB_S09.02","PSB_S09.01","PSB_S09.02","PSB_S09.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB09.10", "devices":["PSCFH_S09.01","PSCFV_S09.01","PSCEH_S09.01","PSCEV_S09.01","PSCEH_S09.02","PSCEV_S09.02","PSCEH_S09.03","PSQAB_S09.01","PSQAB_S09.02","PSSF_S09.01","PSSD_S09.01","PSSD_S09.02","PSSF_S09.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB09.15", "devices":["PSCFH_S09.02","PSCFV_S09.02","PSCEH_S09.05","PSCEV_S09.05","PSCEH_S09.06","PSCEH_S09.06","PSCEH_S09.08","PSCEV_S09.08","PSQAB_S09.03","PSQAB_S09.04","PSQF_S09.01","PSSD_S09.03","PSSD_S09.04","PSSF_S09.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB09.20", "devices":["PSCFH_S09.03","PSCFV_S09.03","PSQK_S09.01","PSCEV_S09.09","PSCEH_S09.10","PSCEV_S09.10","PSQK_S09.02","PSCEV_S09.11","PSCH_S09.01","PSCV_S09.01","PSQD_S09.01","PSQF_S09.02","PSQD_S09.02","PSSD_S09.05","PSSH_S09.01","PSSH_S09.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB09.05", "embedded":["PSOCT_S09.02","PSOCT_S09.01","PSTRCEB_S09.01","PSTRCEB_S09.02","PSB_S09.01","PSB_S09.02","PSB_S09.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB09.10", "embedded":["PSCFH_S09.01","PSCFV_S09.01","PSCEH_S09.01","PSCEV_S09.01","PSCEH_S09.02","PSCEV_S09.02","PSCEH_S09.03","PSQAB_S09.01","PSQAB_S09.02","PSSF_S09.01","PSSD_S09.01","PSSD_S09.02","PSSF_S09.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB09.15", "embedded":["PSCFH_S09.02","PSCFV_S09.02","PSCEH_S09.05","PSCEV_S09.05","PSCEH_S09.06","PSCEH_S09.06","PSCEH_S09.08","PSCEV_S09.08","PSQAB_S09.03","PSQAB_S09.04","PSQF_S09.01","PSSD_S09.03","PSSD_S09.04","PSSF_S09.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB09.20", "embedded":["PSCFH_S09.03","PSCFV_S09.03","PSQK_S09.01","PSCEV_S09.09","PSCEH_S09.10","PSCEV_S09.10","PSQK_S09.02","PSCEV_S09.11","PSCH_S09.01","PSCV_S09.01","PSQD_S09.01","PSQF_S09.02","PSQD_S09.02","PSSD_S09.05","PSSH_S09.01","PSSH_S09.02"]}
 				]
 			},
 			{
@@ -2915,10 +2936,10 @@
 			{
 				"start": {"x": -6975, "y": -300, "z": -32812},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB09.25", "devices":["PSCFH_S09.04","PSCFV_S09.04","PSCH_S09.02","PSCV_S09.02","PSQK_S09.03","PSCEH_S09.13","PSCEV_S09.13","PSQK_S09.04","PSQD_S09.03","PSQF_S09.03","PSQD_S09.04","PSSH_S09.03","PSSH_S09.04","PSSD_S09.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB09.30", "devices":["PSCFH_S09.05","PSCFV_S09.05","PSCEH_S09.15","PSCEV_S09.15","PSCEH_S09.17","PSCEV_S09.17","PSCEH_S09.18","PSCEV_S09.18","PSQD_S09.04","PSQF_S09.04","PSQAB_S09.05","PSSF_S09.04","PSSD_S09.07","PSSD_S09.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB09.35", "devices":["PSCFH_S09.06","PSCFV_S09.06","PSCEH_S09.20","PSCEV_S09.20","PSCEH_S09.21","PSCEV_S09.21","PSCEH_S09.22","PSCEV_S09.22","PSQAB_S09.06","PSQAB_S09.07","PSSF_S09.05","PSSD_S09.09","PSSD_S09.10","PSSF_S09.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB09.40", "devices":["PSOCT_S09.03","PSOCT_S09.04","PSTRCEB_S09.03","PSTRCEB_S09.04","PSB_S09.04","PSB_S09.05","PSB_S09.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB09.25", "embedded":["PSCFH_S09.04","PSCFV_S09.04","PSCH_S09.02","PSCV_S09.02","PSQK_S09.03","PSCEH_S09.13","PSCEV_S09.13","PSQK_S09.04","PSQD_S09.03","PSQF_S09.03","PSQD_S09.04","PSSH_S09.03","PSSH_S09.04","PSSD_S09.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB09.30", "embedded":["PSCFH_S09.05","PSCFV_S09.05","PSCEH_S09.15","PSCEV_S09.15","PSCEH_S09.17","PSCEV_S09.17","PSCEH_S09.18","PSCEV_S09.18","PSQD_S09.04","PSQF_S09.04","PSQAB_S09.05","PSSF_S09.04","PSSD_S09.07","PSSD_S09.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB09.35", "embedded":["PSCFH_S09.06","PSCFV_S09.06","PSCEH_S09.20","PSCEV_S09.20","PSCEH_S09.21","PSCEV_S09.21","PSCEH_S09.22","PSCEV_S09.22","PSQAB_S09.06","PSQAB_S09.07","PSSF_S09.05","PSSD_S09.09","PSSD_S09.10","PSSF_S09.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB09.40", "embedded":["PSOCT_S09.03","PSOCT_S09.04","PSTRCEB_S09.03","PSTRCEB_S09.04","PSB_S09.04","PSB_S09.05","PSB_S09.06"]}
 				]
 			},
 			{
@@ -2927,10 +2948,10 @@
 			{
 				"start": {"x": -11862, "y": -300, "z": -34941},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA09.05", "devices":[]},
-					{"type": "rv", "position": 2456, "name": "RV_AA09.05", "devices":[]},
-					{"type": "rv", "position": 1649, "name": "RV_AA09.10", "devices":[]},
-					{"type": "rc", "position": 827, "name": "RCF_AA09.05", "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA09.05"},
+					{"type": "rv", "position": 2456, "name": "RV_AA09.05"},
+					{"type": "rv", "position": 1649, "name": "RV_AA09.10"},
+					{"type": "rc", "position": 827, "name": "RCF_AA09.05"}
 				]
 			},
 			{
@@ -2939,7 +2960,7 @@
 			{
 				"start": {"x": -13666, "y": -300, "z": -30695},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB09.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB09.05"}
 				]
 			},
 			{
@@ -2948,7 +2969,7 @@
 			{
 				"start": {"x": -8128, "y": -300, "z": -32601},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB09.10", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB09.10"}
 				]
 			},
 			{
@@ -2957,7 +2978,7 @@
 			{
 				"start": {"x": -14879, "y": -300, "z": -33576},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA09.05", "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AA09.05"}
 				]
 			},
 			{
@@ -2966,9 +2987,9 @@
 			{
 				"start": {"x": -11249, "y": -300, "z": -35269},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA09.05", "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA09.10", "devices":[]},
-					{"type": "rid", "position": 1220, "name": "RID_AA09.15", "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA09.05"},
+					{"type": "rid", "position": 610, "name": "RID_AA09.10"},
+					{"type": "rid", "position": 1220, "name": "RID_AA09.15"}
 				]
 			},
 			{
@@ -2977,8 +2998,8 @@
 			{
 				"start": {"x": -19436, "y": -300, "z": -31718},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA09.05", "devices":[]},
-					{"type": "rrf", "position": 649, "name": "RRF_AA09.10", "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA09.05"},
+					{"type": "rrf", "position": 649, "name": "RRF_AA09.10"}
 				]
 			},
 			{
@@ -2987,8 +3008,8 @@
 			{
 				"start": {"x": 4556, "y": -300, "z": -33249},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB10.05" ,"reverse": true, "devices":["PSOCT_S10.02","PSOCT_S10.01","PSTRCEB_S10.01","PSTRCEB_S10.02","PSB_S10.01","PSB_S10.02","PSB_S10.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB10.10" ,"reverse": true, "devices":["PSCFH_S10.01","PSCFV_S10.01","PSCEH_S10.01","PSCEV_S10.01","PSCEH_S10.02","PSCEV_S10.02","PSCEH_S10.03","PSQAB_S10.01","PSQAB_S10.02","PSSF_S10.01","PSSD_S10.01","PSSD_S10.02","PSSF_S10.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB10.05" ,"reverse": true, "embedded":["PSOCT_S10.02","PSOCT_S10.01","PSTRCEB_S10.01","PSTRCEB_S10.02","PSB_S10.01","PSB_S10.02","PSB_S10.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB10.10" ,"reverse": true, "embedded":["PSCFH_S10.01","PSCFV_S10.01","PSCEH_S10.01","PSCEV_S10.01","PSCEH_S10.02","PSCEV_S10.02","PSCEH_S10.03","PSQAB_S10.01","PSQAB_S10.02","PSSF_S10.01","PSSD_S10.01","PSSD_S10.02","PSSF_S10.02"]}
 				]
 			},
 			{
@@ -2997,12 +3018,12 @@
 			{
 				"start": {"x": 8681, "y": -300, "z": -32402},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB10.15" ,"reverse": true, "devices":["PSCFH_S10.02","PSCFV_S10.02","PSCEH_S10.05","PSCEV_S10.05","PSCEH_S10.06","PSCEH_S10.06","PSCEH_S10.08","PSCEV_S10.08","PSQAB_S10.03","PSQAB_S10.04","PSQF_S10.01","PSSD_S10.03","PSSD_S10.04","PSSF_S10.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB10.20" ,"reverse": true, "devices":["PSCFH_S10.03","PSCFV_S10.03","PSQK_S10.01","PSCEV_S10.09","PSCEH_S10.10","PSCEV_S10.10","PSQK_S10.02","PSCEV_S10.11","PSCH_S10.01","PSCV_S10.01","PSQD_S10.01","PSQF_S10.02","PSQD_S10.02","PSSD_S10.05","PSSH_S10.01","PSSH_S10.02"]},
-					{"type": "rps", "position": 3397, "name": "RPS_AB10.25" ,"reverse": true, "devices":["PSCFH_S10.04","PSCFV_S10.04","PSCH_S10.02","PSCV_S10.02","PSQK_S10.03","PSCEH_S10.13","PSCEV_S10.13","PSQK_S10.04","PSQD_S10.03","PSQF_S10.03","PSQD_S10.04","PSSH_S10.03","PSSH_S10.04","PSSD_S10.06"]},
-					{"type": "rps", "position": 4217, "name": "RPS_AB10.30" ,"reverse": true, "devices":["PSCFH_S10.05","PSCFV_S10.05","PSCEH_S10.15","PSCEV_S10.15","PSCEH_S10.17","PSCEV_S10.17","PSCEH_S10.18","PSCEV_S10.18","PSQD_S10.04","PSQF_S10.04","PSQAB_S10.05","PSSF_S10.04","PSSD_S10.07","PSSD_S10.08"]},
-					{"type": "rps", "position": 5848, "name": "RPS_AB10.35" ,"reverse": true, "devices":["PSCFH_S10.06","PSCFV_S10.06","PSCEH_S10.20","PSCEV_S10.20","PSCEH_S10.21","PSCEV_S10.21","PSCEH_S10.22","PSCEV_S10.22","PSQAB_S10.06","PSQAB_S10.07","PSSF_S10.05","PSSD_S10.09","PSSD_S10.10","PSSF_S10.06"]},
-					{"type": "rps", "position": 6664, "name": "RPS_AB10.40" ,"reverse": true, "devices":["PSOCT_S10.03","PSOCT_S10.04","PSTRCEB_S10.03","PSTRCEB_S10.04","PSB_S10.04","PSB_S10.05","PSB_S10.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB10.15" ,"reverse": true, "embedded":["PSCFH_S10.02","PSCFV_S10.02","PSCEH_S10.05","PSCEV_S10.05","PSCEH_S10.06","PSCEH_S10.06","PSCEH_S10.08","PSCEV_S10.08","PSQAB_S10.03","PSQAB_S10.04","PSQF_S10.01","PSSD_S10.03","PSSD_S10.04","PSSF_S10.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB10.20" ,"reverse": true, "embedded":["PSCFH_S10.03","PSCFV_S10.03","PSQK_S10.01","PSCEV_S10.09","PSCEH_S10.10","PSCEV_S10.10","PSQK_S10.02","PSCEV_S10.11","PSCH_S10.01","PSCV_S10.01","PSQD_S10.01","PSQF_S10.02","PSQD_S10.02","PSSD_S10.05","PSSH_S10.01","PSSH_S10.02"]},
+					{"type": "rps", "position": 3397, "name": "RPS_AB10.25" ,"reverse": true, "embedded":["PSCFH_S10.04","PSCFV_S10.04","PSCH_S10.02","PSCV_S10.02","PSQK_S10.03","PSCEH_S10.13","PSCEV_S10.13","PSQK_S10.04","PSQD_S10.03","PSQF_S10.03","PSQD_S10.04","PSSH_S10.03","PSSH_S10.04","PSSD_S10.06"]},
+					{"type": "rps", "position": 4217, "name": "RPS_AB10.30" ,"reverse": true, "embedded":["PSCFH_S10.05","PSCFV_S10.05","PSCEH_S10.15","PSCEV_S10.15","PSCEH_S10.17","PSCEV_S10.17","PSCEH_S10.18","PSCEV_S10.18","PSQD_S10.04","PSQF_S10.04","PSQAB_S10.05","PSSF_S10.04","PSSD_S10.07","PSSD_S10.08"]},
+					{"type": "rps", "position": 5848, "name": "RPS_AB10.35" ,"reverse": true, "embedded":["PSCFH_S10.06","PSCFV_S10.06","PSCEH_S10.20","PSCEV_S10.20","PSCEH_S10.21","PSCEV_S10.21","PSCEH_S10.22","PSCEV_S10.22","PSQAB_S10.06","PSQAB_S10.07","PSSF_S10.05","PSSD_S10.09","PSSD_S10.10","PSSF_S10.06"]},
+					{"type": "rps", "position": 6664, "name": "RPS_AB10.40" ,"reverse": true, "embedded":["PSOCT_S10.03","PSOCT_S10.04","PSTRCEB_S10.03","PSTRCEB_S10.04","PSB_S10.04","PSB_S10.05","PSB_S10.06"]}
 				]
 			},
 			{
@@ -3011,10 +3032,10 @@
 			{
 				"start": {"x": 7198, "y": -300, "z": -36190},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 2520, "name": "RV_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 1714, "name": "RV_AA10.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 890, "name": "RCF_AA10.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA10.05" ,"reverse": true},
+					{"type": "rv", "position": 2520, "name": "RV_AA10.05" ,"reverse": true},
+					{"type": "rv", "position": 1714, "name": "RV_AA10.10" ,"reverse": true},
+					{"type": "rc", "position": 890, "name": "RCF_AA10.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3023,7 +3044,7 @@
 			{
 				"start": {"x": 3512, "y": -300, "z": -33415},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB10.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3032,7 +3053,7 @@
 			{
 				"start": {"x": 10939, "y": -300, "z": -31769},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB10.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB10.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3041,7 +3062,7 @@
 			{
 				"start": {"x": 14947, "y": -300, "z": -33572},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AA10.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AA10.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3050,8 +3071,8 @@
 			{
 				"start": {"x": 3260, "y": -300, "z": -36861},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 610, "name": "RID_AA10.10" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AA10.05" ,"reverse": true},
+					{"type": "rid", "position": 610, "name": "RID_AA10.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3060,8 +3081,8 @@
 			{
 				"start": {"x": -973, "y": -300, "z": -37187},
 				"components": [
-					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true, "devices":[]},
-					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true, "devices":[]}
+					{"type": "rrf", "position": 0, "name": "RRF_AA10.05" ,"reverse": true},
+					{"type": "rrf", "position": 650, "name": "RRF_AA10.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3070,10 +3091,10 @@
 			{
 				"start": {"x": 15748, "y": -300, "z": -29619},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB11.05" ,"reverse": true, "devices":["PSOCT_S11.02","PSOCT_S11.01","PSTRCEB_S11.01","PSTRCEB_S11.02","PSB_S11.01","PSB_S11.02","PSB_S11.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB11.10" ,"reverse": true, "devices":["PSCFH_S11.01","PSCFV_S11.01","PSCEH_S11.01","PSCEV_S11.01","PSCEH_S11.02","PSCEV_S11.02","PSCEH_S11.03","PSQAB_S11.01","PSQAB_S11.02","PSSF_S11.01","PSSD_S11.01","PSSD_S11.02","PSSF_S11.02"]},
-					{"type": "rps", "position": 1642, "name": "RPS_AB11.15" ,"reverse": true, "devices":["PSCFH_S11.02","PSCFV_S11.02","PSCEH_S11.05","PSCEV_S11.05","PSCEH_S11.06","PSCEH_S11.06","PSCEH_S11.08","PSCEV_S11.08","PSQAB_S11.03","PSQAB_S11.04","PSQF_S11.01","PSSD_S11.03","PSSD_S11.04","PSSF_S11.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB11.20" ,"reverse": true, "devices":["PSCFH_S11.03","PSCFV_S11.03","PSQK_S11.01","PSCEV_S11.09","PSCEH_S11.10","PSCEV_S11.10","PSQK_S11.02","PSCEV_S11.11","PSCH_S11.01","PSCV_S11.01","PSQD_S11.01","PSQF_S11.02","PSQD_S11.02","PSSD_S11.05","PSSH_S11.01","PSSH_S11.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB11.05" ,"reverse": true, "embedded":["PSOCT_S11.02","PSOCT_S11.01","PSTRCEB_S11.01","PSTRCEB_S11.02","PSB_S11.01","PSB_S11.02","PSB_S11.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB11.10" ,"reverse": true, "embedded":["PSCFH_S11.01","PSCFV_S11.01","PSCEH_S11.01","PSCEV_S11.01","PSCEH_S11.02","PSCEV_S11.02","PSCEH_S11.03","PSQAB_S11.01","PSQAB_S11.02","PSSF_S11.01","PSSD_S11.01","PSSD_S11.02","PSSF_S11.02"]},
+					{"type": "rps", "position": 1642, "name": "RPS_AB11.15" ,"reverse": true, "embedded":["PSCFH_S11.02","PSCFV_S11.02","PSCEH_S11.05","PSCEV_S11.05","PSCEH_S11.06","PSCEH_S11.06","PSCEH_S11.08","PSCEV_S11.08","PSQAB_S11.03","PSQAB_S11.04","PSQF_S11.01","PSSD_S11.03","PSSD_S11.04","PSSF_S11.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB11.20" ,"reverse": true, "embedded":["PSCFH_S11.03","PSCFV_S11.03","PSQK_S11.01","PSCEV_S11.09","PSCEH_S11.10","PSCEV_S11.10","PSQK_S11.02","PSCEV_S11.11","PSCH_S11.01","PSCV_S11.01","PSQD_S11.01","PSQF_S11.02","PSQD_S11.02","PSSD_S11.05","PSSH_S11.01","PSSH_S11.02"]}
 				]
 			},
 			{
@@ -3082,14 +3103,14 @@
 			{
 				"start": {"x": 23355, "y": -300, "z": -20342},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB11.25" ,"reverse": true, "devices":["PSCFH_S11.04","PSCFV_S11.04","PSCH_S11.02","PSCV_S11.02","PSQK_S11.03","PSCEH_S11.13","PSCEV_S11.13","PSQK_S11.04","PSQD_S11.03","PSQF_S11.03","PSQD_S11.04","PSSH_S11.03","PSSH_S11.04","PSSD_S11.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB11.30" ,"reverse": true, "devices":["PSCFH_S11.05","PSCFV_S11.05","PSCEH_S11.15","PSCEV_S11.15","PSCEH_S11.17","PSCEV_S11.17","PSCEH_S11.18","PSCEV_S11.18","PSQD_S11.04","PSQF_S11.04","PSQAB_S11.05","PSSF_S11.04","PSSD_S11.07","PSSD_S11.08"]},
-					{"type": "rps", "position": 1640, "name": "RPS_AB11.35" ,"reverse": true, "devices":["PSCFH_S11.06","PSCFV_S11.06","PSCEH_S11.20","PSCEV_S11.20","PSCEH_S11.21","PSCEV_S11.21","PSCEH_S11.22","PSCEV_S11.22","PSQAB_S11.06","PSQAB_S11.07","PSSF_S11.05","PSSD_S11.09","PSSD_S11.10","PSSF_S11.06"]},
-					{"type": "rps", "position": 2460, "name": "RPS_AB11.40" ,"reverse": true, "devices":["PSOCT_S11.03","PSOCT_S11.04","PSTRCEB_S11.03","PSTRCEB_S11.04","PSB_S11.04","PSB_S11.05","PSB_S11.06"]},
-					{"type": "rbtsps", "position": 4303, "name": "RBTSPS_AB11.05" ,"reverse": true, "devices":[]},
-					{"type": "rbtsps", "position": 4764, "name": "RBTSPS_AB11.10" ,"reverse": true, "devices":[]},
-					{"type": "rbtsps", "position": 5259, "name": "RBTSPS_AB11.15" ,"reverse": true, "devices":[]},
-					{"type": "rbtsps", "position": 5777, "name": "RBTSPS_AB11.20" ,"reverse": true, "devices":[]}
+					{"type": "rps", "position": 0, "name": "RPS_AB11.25" ,"reverse": true, "embedded":["PSCFH_S11.04","PSCFV_S11.04","PSCH_S11.02","PSCV_S11.02","PSQK_S11.03","PSCEH_S11.13","PSCEV_S11.13","PSQK_S11.04","PSQD_S11.03","PSQF_S11.03","PSQD_S11.04","PSSH_S11.03","PSSH_S11.04","PSSD_S11.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB11.30" ,"reverse": true, "embedded":["PSCFH_S11.05","PSCFV_S11.05","PSCEH_S11.15","PSCEV_S11.15","PSCEH_S11.17","PSCEV_S11.17","PSCEH_S11.18","PSCEV_S11.18","PSQD_S11.04","PSQF_S11.04","PSQAB_S11.05","PSSF_S11.04","PSSD_S11.07","PSSD_S11.08"]},
+					{"type": "rps", "position": 1640, "name": "RPS_AB11.35" ,"reverse": true, "embedded":["PSCFH_S11.06","PSCFV_S11.06","PSCEH_S11.20","PSCEV_S11.20","PSCEH_S11.21","PSCEV_S11.21","PSCEH_S11.22","PSCEV_S11.22","PSQAB_S11.06","PSQAB_S11.07","PSSF_S11.05","PSSD_S11.09","PSSD_S11.10","PSSF_S11.06"]},
+					{"type": "rps", "position": 2460, "name": "RPS_AB11.40" ,"reverse": true, "embedded":["PSOCT_S11.03","PSOCT_S11.04","PSTRCEB_S11.03","PSTRCEB_S11.04","PSB_S11.04","PSB_S11.05","PSB_S11.06"]},
+					{"type": "rbtsps", "position": 4303, "name": "RBTSPS_AB11.05" ,"reverse": true},
+					{"type": "rbtsps", "position": 4764, "name": "RBTSPS_AB11.10" ,"reverse": true},
+					{"type": "rbtsps", "position": 5259, "name": "RBTSPS_AB11.15" ,"reverse": true},
+					{"type": "rbtsps", "position": 5777, "name": "RBTSPS_AB11.20" ,"reverse": true}
 				]
 			},
 			{
@@ -3098,7 +3119,7 @@
 			{
 				"start": {"x": 19197, "y": -300, "z": -31512},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3107,7 +3128,7 @@
 			{
 				"start": {"x": 21203, "y": -300, "z": -21576},
 				"components": [
-					{"type": "rbtsd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rbtsd", "position": 0, "name": "RBTSD_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3116,9 +3137,9 @@
 			{
 				"start": {"x": 16285, "y": -300, "z": -32898},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA11.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 809, "name": "RV_AA11.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 1642, "name": "RCF_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA11.05" ,"reverse": true},
+					{"type": "rv", "position": 809, "name": "RV_AA11.10" ,"reverse": true},
+					{"type": "rc", "position": 1642, "name": "RCF_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3127,7 +3148,7 @@
 			{
 				"start": {"x": 28805, "y": -300, "z": -17103},
 				"components": [
-					{"type": "rbtsv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rbtsv", "position": 0, "name": "RBTSV_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3136,7 +3157,7 @@
 			{
 				"start": {"x": 21728, "y": -300, "z": -22110},
 				"components": [
-					{"type": "rbtsc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true, "devices":[]}
+					{"type": "rbtsc", "position": 0, "name": "RBTSC_AB11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3145,8 +3166,8 @@
 			{
 				"start": {"x": 13022, "y": -300, "z": -27303},
 				"components": [
-					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true, "devices":[]},
-					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true, "devices":[]}
+					{"type": "rid", "position": 0, "name": "RID_AB11.05" ,"reverse": true},
+					{"type": "rid", "position": 793, "name": "RID_AB11.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3155,7 +3176,7 @@
 			{
 				"start": {"x": 15636, "y": -300, "z": -33533},
 				"components": [
-					{"type": "rshid", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rshid", "position": 0, "name": "RSHID_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3164,7 +3185,7 @@
 			{
 				"start": {"x": 19826, "y": -300, "z": -31121},
 				"components": [
-					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true, "devices":[]}
+					{"type": "rcry", "position": 0, "name": "RCRY_AA11.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3173,10 +3194,10 @@
 			{
 				"start": {"x": 31102, "y": -300, "z": -12566},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB12.05" ,"reverse": true, "devices":["PSOCT_S12.02","PSOCT_S12.01","PSTRCEB_S12.01","PSTRCEB_S12.02","PSB_S12.01","PSB_S12.02","PSB_S12.03"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB12.10" ,"reverse": true, "devices":["PSCFH_S12.01","PSCFV_S12.01","PSCEH_S12.01","PSCEV_S12.01","PSCEH_S12.02","PSCEV_S12.02","PSCEH_S12.03","PSQAB_S12.01","PSQAB_S12.02","PSSF_S12.01","PSSD_S12.01","PSSD_S12.02","PSSF_S12.02"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB12.15" ,"reverse": true, "devices":["PSCFH_S12.02","PSCFV_S12.02","PSCEH_S12.05","PSCEV_S12.05","PSCEH_S12.06","PSCEH_S12.06","PSCEH_S12.08","PSCEV_S12.08","PSQAB_S12.03","PSQAB_S12.04","PSQF_S12.01","PSSD_S12.03","PSSD_S12.04","PSSF_S12.03"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB12.20" ,"reverse": true, "devices":["PSCFH_S12.03","PSCFV_S12.03","PSQK_S12.01","PSCEV_S12.09","PSCEH_S12.10","PSCEV_S12.10","PSQK_S12.02","PSCEV_S12.11","PSCH_S12.01","PSCV_S12.01","PSQD_S12.01","PSQF_S12.02","PSQD_S12.02","PSSD_S12.05","PSSH_S12.01","PSSH_S12.02"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB12.05" ,"reverse": true, "embedded":["PSOCT_S12.02","PSOCT_S12.01","PSTRCEB_S12.01","PSTRCEB_S12.02","PSB_S12.01","PSB_S12.02","PSB_S12.03"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB12.10" ,"reverse": true, "embedded":["PSCFH_S12.01","PSCFV_S12.01","PSCEH_S12.01","PSCEV_S12.01","PSCEH_S12.02","PSCEV_S12.02","PSCEH_S12.03","PSQAB_S12.01","PSQAB_S12.02","PSSF_S12.01","PSSD_S12.01","PSSD_S12.02","PSSF_S12.02"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB12.15" ,"reverse": true, "embedded":["PSCFH_S12.02","PSCFV_S12.02","PSCEH_S12.05","PSCEV_S12.05","PSCEH_S12.06","PSCEH_S12.06","PSCEH_S12.08","PSCEV_S12.08","PSQAB_S12.03","PSQAB_S12.04","PSQF_S12.01","PSSD_S12.03","PSSD_S12.04","PSSF_S12.03"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB12.20" ,"reverse": true, "embedded":["PSCFH_S12.03","PSCFV_S12.03","PSQK_S12.01","PSCEV_S12.09","PSCEH_S12.10","PSCEV_S12.10","PSQK_S12.02","PSCEV_S12.11","PSCH_S12.01","PSCV_S12.01","PSQD_S12.01","PSQF_S12.02","PSQD_S12.02","PSSD_S12.05","PSSH_S12.01","PSSH_S12.02"]}
 				]
 			},
 			{
@@ -3185,10 +3206,10 @@
 			{
 				"start": {"x": 32812, "y": -300, "z": -6974},
 				"components": [
-					{"type": "rps", "position": 0, "name": "RPS_AB12.25" ,"reverse": true, "devices":["PSCFH_S12.04","PSCFV_S12.04","PSCH_S12.02","PSCV_S12.02","PSQK_S12.03","PSCEH_S12.13","PSCEV_S12.13","PSQK_S12.04","PSQD_S12.03","PSQF_S12.03","PSQD_S12.04","PSSH_S12.03","PSSH_S12.04","PSSD_S12.06"]},
-					{"type": "rps", "position": 820, "name": "RPS_AB12.30" ,"reverse": true, "devices":["PSCFH_S12.05","PSCFV_S12.05","PSCEH_S12.15","PSCEV_S12.15","PSCEH_S12.17","PSCEV_S12.17","PSCEH_S12.18","PSCEV_S12.18","PSQD_S12.04","PSQF_S12.04","PSQAB_S12.05","PSSF_S12.04","PSSD_S12.07","PSSD_S12.08"]},
-					{"type": "rps", "position": 1641, "name": "RPS_AB12.35" ,"reverse": true, "devices":["PSCFH_S12.06","PSCFV_S12.06","PSCEH_S12.20","PSCEV_S12.20","PSCEH_S12.21","PSCEV_S12.21","PSCEH_S12.22","PSCEV_S12.22","PSQAB_S12.06","PSQAB_S12.07","PSSF_S12.05","PSSD_S12.09","PSSD_S12.10","PSSF_S12.06"]},
-					{"type": "rps", "position": 2461, "name": "RPS_AB12.40" ,"reverse": true, "devices":["PSOCT_S12.03","PSOCT_S12.04","PSTRCEB_S12.03","PSTRCEB_S12.04","PSB_S12.04","PSB_S12.05","PSB_S12.06"]}
+					{"type": "rps", "position": 0, "name": "RPS_AB12.25" ,"reverse": true, "embedded":["PSCFH_S12.04","PSCFV_S12.04","PSCH_S12.02","PSCV_S12.02","PSQK_S12.03","PSCEH_S12.13","PSCEV_S12.13","PSQK_S12.04","PSQD_S12.03","PSQF_S12.03","PSQD_S12.04","PSSH_S12.03","PSSH_S12.04","PSSD_S12.06"]},
+					{"type": "rps", "position": 820, "name": "RPS_AB12.30" ,"reverse": true, "embedded":["PSCFH_S12.05","PSCFV_S12.05","PSCEH_S12.15","PSCEV_S12.15","PSCEH_S12.17","PSCEV_S12.17","PSCEH_S12.18","PSCEV_S12.18","PSQD_S12.04","PSQF_S12.04","PSQAB_S12.05","PSSF_S12.04","PSSD_S12.07","PSSD_S12.08"]},
+					{"type": "rps", "position": 1641, "name": "RPS_AB12.35" ,"reverse": true, "embedded":["PSCFH_S12.06","PSCFV_S12.06","PSCEH_S12.20","PSCEV_S12.20","PSCEH_S12.21","PSCEV_S12.21","PSCEH_S12.22","PSCEV_S12.22","PSQAB_S12.06","PSQAB_S12.07","PSSF_S12.05","PSSD_S12.09","PSSD_S12.10","PSSF_S12.06"]},
+					{"type": "rps", "position": 2461, "name": "RPS_AB12.40" ,"reverse": true, "embedded":["PSOCT_S12.03","PSOCT_S12.04","PSTRCEB_S12.03","PSTRCEB_S12.04","PSB_S12.04","PSB_S12.05","PSB_S12.06"]}
 				]
 			},
 			{
@@ -3197,9 +3218,9 @@
 			{
 				"start": {"x": 36086, "y": -300, "z": -6730},
 				"components": [
-					{"type": "rv", "position": 0, "name": "RV_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rv", "position": 811, "name": "RV_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rc", "position": 1643, "name": "RCF_AA12.05" ,"reverse": true, "devices":[]}
+					{"type": "rv", "position": 0, "name": "RV_AA12.05" ,"reverse": true},
+					{"type": "rv", "position": 811, "name": "RV_AA12.10" ,"reverse": true},
+					{"type": "rc", "position": 1643, "name": "RCF_AA12.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3208,7 +3229,7 @@
 			{
 				"start": {"x": 30695, "y": -300, "z": -13666},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB12.05" ,"reverse": true}
 				]
 			},
 			{
@@ -3217,7 +3238,7 @@
 			{
 				"start": {"x": 32601, "y": -300, "z": -8128},
 				"components": [
-					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true, "devices":[]}
+					{"type": "rc", "position": 0, "name": "RC_AB12.10" ,"reverse": true}
 				]
 			},
 			{
@@ -3226,8 +3247,8 @@
 			{
 				"start": {"x": 32414, "y": -300, "z": -17269},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 678, "name": "RD_AA12.15" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA12.05" ,"reverse": true},
+					{"type": "rd", "position": 678, "name": "RD_AA12.15" ,"reverse": true}
 				]
 			},
 			{
@@ -3236,9 +3257,9 @@
 			{
 				"start": {"x": 36644, "y": -300, "z": -4337},
 				"components": [
-					{"type": "rd", "position": 0, "name": "RD_AA12.15" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 645, "name": "RD_AA12.20" ,"reverse": true, "devices":[]},
-					{"type": "rd", "position": 1288, "name": "RD_AA12.25" ,"reverse": true, "devices":[]}
+					{"type": "rd", "position": 0, "name": "RD_AA12.15" ,"reverse": true},
+					{"type": "rd", "position": 645, "name": "RD_AA12.20" ,"reverse": true},
+					{"type": "rd", "position": 1288, "name": "RD_AA12.25" ,"reverse": true}
 				]
 			},
 			{
@@ -3247,17 +3268,17 @@
 			{
 				"start": {"x": 33765, "y": -300, "z": -14577},
 				"components": [
-					{"type": "rinj", "position": 0, "name": "RINJ_AA12.05" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 610, "name": "RINJ_AA12.10" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 1220, "name": "RINJ_AA12.15" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 1830, "name": "RINJ_AA12.20" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 2439, "name": "RINJ_AA12.25" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 3048, "name": "RINJ_AA12.30" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 3658, "name": "RINJ_AA12.35" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 4268, "name": "RINJ_AA12.40" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 4878, "name": "RINJ_AA12.45" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 5488, "name": "RINJ_AA12.50" ,"reverse": true, "devices":[]},
-					{"type": "rinj", "position": 6098, "name": "RINJ_AA12.55" ,"reverse": true, "devices":[]}
+					{"type": "rinj", "position": 0, "name": "RINJ_AA12.05" ,"reverse": true},
+					{"type": "rinj", "position": 610, "name": "RINJ_AA12.10" ,"reverse": true},
+					{"type": "rinj", "position": 1220, "name": "RINJ_AA12.15" ,"reverse": true},
+					{"type": "rinj", "position": 1830, "name": "RINJ_AA12.20" ,"reverse": true},
+					{"type": "rinj", "position": 2439, "name": "RINJ_AA12.25" ,"reverse": true},
+					{"type": "rinj", "position": 3048, "name": "RINJ_AA12.30" ,"reverse": true},
+					{"type": "rinj", "position": 3658, "name": "RINJ_AA12.35" ,"reverse": true},
+					{"type": "rinj", "position": 4268, "name": "RINJ_AA12.40" ,"reverse": true},
+					{"type": "rinj", "position": 4878, "name": "RINJ_AA12.45" ,"reverse": true},
+					{"type": "rinj", "position": 5488, "name": "RINJ_AA12.50" ,"reverse": true},
+					{"type": "rinj", "position": 6098, "name": "RINJ_AA12.55" ,"reverse": true}
 				]
 			},
 			{
-- 
GitLab