diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
index 454ceddc0694ecc45a48ac09e56246dce9246a3c..631d10b378197f3ab884931c24178da906125ed9 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
@@ -1888,7 +1888,7 @@
           </widget>
           <widget type="action_button" version="3.0.0">
             <name>PIDScreen_Button_1</name>
-            <actions>
+            <actions execute_as_one="true">
               <action type="open_display">
                 <file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
                 <macros>
@@ -1897,6 +1897,11 @@
                 <target>window</target>
                 <description>Open Display</description>
               </action>
+              <action type="write_pv">
+                <pv_name>${WIDSec}:${WIDDis}-${WIDAmConf}:P_Controlled_Devie_Name</pv_name>
+                <value>${ControlledDevice}</value>
+                <description>SetControlledDevice</description>
+              </action>
             </actions>
             <text>PID</text>
             <x>15</x>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
index a379974e91e9e923183ffaf8b0de4f642c114fc7..03e0ea7436ba8a060131946b73ba32c79b1fc812 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_Faceplate.bob
@@ -1915,7 +1915,12 @@
           </widget>
           <widget type="action_button" version="3.0.0">
             <name>PIDScreen_Button_1</name>
-            <actions>
+            <actions execute_as_one="true">
+              <action type="write_pv">
+                <pv_name>${WIDSec}:${WIDDis}-${WIDAmConf}:P_Controlled_Devie_Name</pv_name>
+                <value>${ControlledDevice}</value>
+                <description>SetControlledDevice</description>
+              </action>
               <action type="open_display">
                 <file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
                 <target>window</target>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
index 85c748146de3897a6a2da397bf35b0cdc5b733eb..81e741a7509e162ae4bf5450fc04e8d42b725426 100755
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main2.bob
@@ -190,10 +190,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_21</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>CV-064</ControlledDevice>
+      <MeasureValue>CV-064</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82364</WIDIndex>
       <WIDIndexPID>CV64</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -208,10 +213,14 @@
     <name>PV_Valve_BlockIcon_Horizontal_22</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>CV-007</ControlledDevice>
+      <MeasureValue>CV-007</MeasureValue>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82307</WIDIndex>
       <WIDIndexPID>CV07</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -226,10 +235,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_23</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>CV-062</ControlledDevice>
+      <MeasureValue>CV-062</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82362</WIDIndex>
       <WIDIndexPID>CV62</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -244,10 +258,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_24</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
+      <ControlledDevice>CV-005</ControlledDevice>
+      <MeasureValue>CV-005</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82305</WIDIndex>
       <WIDIndexPID>CV05</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -262,13 +281,16 @@
     <name>PV_Valve_BlockIcon_Verical_4</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
+      <ControlledDevice>CV-060</ControlledDevice>
       <MeasureValue>PT-82360</MeasureValue>
       <ProcessValue>TS2-010CDL:Cryo-PT-82360</ProcessValue>
       <ProcessValueEGU>Bar</ProcessValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82360</WIDIndex>
       <WIDIndexPID>CV60</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -283,13 +305,16 @@
     <name>PV_Valve_BlockIcon_Verical_7</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
-      <MeasureValue>PT-03</MeasureValue>
+      <ControlledDevice>CV-003</ControlledDevice>
+      <MeasureValue>PT-003</MeasureValue>
       <ProcessValue>TS2-010CRM:Cryo-PT-003</ProcessValue>
       <ProcessValueEGU>mBar</ProcessValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82303</WIDIndex>
       <WIDIndexPID>CV03</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -304,10 +329,15 @@
     <name>PV_Valve_BlockIcon_Verical_8</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
+      <ControlledDevice>CV-004</ControlledDevice>
+      <MeasureValue>CV-004</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82304</WIDIndex>
       <WIDIndexPID>CV04</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -322,10 +352,15 @@
     <name>PV_Valve_BlockIcon_Verical_9</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
+      <ControlledDevice>CV-061</ControlledDevice>
+      <MeasureValue>CV-061</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82361</WIDIndex>
       <WIDIndexPID>CV61</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -340,10 +375,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_3</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>CV-063</ControlledDevice>
+      <MeasureValue>CV-063</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82363</WIDIndex>
       <WIDIndexPID>CV63</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -358,10 +398,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_20</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>CV-006</ControlledDevice>
+      <MeasureValue>CV-006</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82306</WIDIndex>
       <WIDIndexPID>CV06</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -526,6 +571,7 @@
     <macros>
       <ControlledDevice>CV-002</ControlledDevice>
       <MeasureValue>PT-82301</MeasureValue>
+      <MeasureValueEGU>Bar</MeasureValueEGU>
       <ProcessValue>TS2-010CDL:Cryo-PT-82301</ProcessValue>
       <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
@@ -1685,10 +1731,15 @@
     <name>PV_Valve_BlockIcon_Horizontal_5</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Sipart_BlockIcon_Vertical_Right.bob</file>
     <macros>
+      <ControlledDevice>CV-071</ControlledDevice>
+      <MeasureValue>CV-071</MeasureValue>
+      <MeasureValueEGU>%</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>CV</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>82371</WIDIndex>
       <WIDIndexPID>CV71</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CDL</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1703,13 +1754,17 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_27</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob</file>
     <macros>
+      <ControlledDevice>EH-061</ControlledDevice>
       <MeasureValue>TE-061</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
       <ProcessValue>TS2-010CRM:Cryo-TE-061</ProcessValue>
       <ProcessValueEGU>K</ProcessValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>061</WIDIndex>
       <WIDIndexPID>EH61</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1724,10 +1779,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_29</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-043</ControlledDevice>
+      <MeasureValue>TE-048</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>043</WIDIndex>
       <WIDIndexPID>EH43</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1742,10 +1802,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_30</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-033</ControlledDevice>
+      <MeasureValue>TE-038</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>033</WIDIndex>
       <WIDIndexPID>EH33</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1760,10 +1825,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_35</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-023</ControlledDevice>
+      <MeasureValue>TE-028</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>023</WIDIndex>
       <WIDIndexPID>EH23</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1778,10 +1848,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_36</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob</file>
     <macros>
+      <ControlledDevice>EH-010</ControlledDevice>
+      <MeasureValue>TE-019</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>010</WIDIndex>
       <WIDIndexPID>EH10</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1889,10 +1964,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_38</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob</file>
     <macros>
+      <ControlledDevice>EH-040</ControlledDevice>
+      <MeasureValue>TE-049</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>040</WIDIndex>
       <WIDIndexPID>EH40</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1907,10 +1987,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_39</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob</file>
     <macros>
+      <ControlledDevice>EH-030</ControlledDevice>
+      <MeasureValue>TE-039</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>030</WIDIndex>
       <WIDIndexPID>EH30</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -1925,10 +2010,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_40</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Vertical.bob</file>
     <macros>
+      <ControlledDevice>EH-020</ControlledDevice>
+      <MeasureValue>TE-029</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>020</WIDIndex>
       <WIDIndexPID>EH20</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2162,10 +2252,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_46</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-013</ControlledDevice>
+      <MeasureDevice>TE-018</MeasureDevice>
+      <MeasureDeviceEGU>K</MeasureDeviceEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>013</WIDIndex>
       <WIDIndexPID>EH13</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2486,10 +2581,15 @@
     <name>EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-060</ControlledDevice>
+      <MeasureValue>TE-064</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>060</WIDIndex>
       <WIDIndexPID>EH60</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2575,10 +2675,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_52</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-041</ControlledDevice>
+      <MeasureValue>TE-045</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>041</WIDIndex>
       <WIDIndexPID>EH41</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2593,10 +2698,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_53</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-042</ControlledDevice>
+      <MeasureValue>TE-041</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>042</WIDIndex>
       <WIDIndexPID>EH42</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2611,10 +2721,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_54</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-031</ControlledDevice>
+      <MeasureValue>TE-035</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>031</WIDIndex>
       <WIDIndexPID>EH31</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2629,10 +2744,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_55</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-032</ControlledDevice>
+      <MeasureValue>TE-031</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>032</WIDIndex>
       <WIDIndexPID>EH32</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2647,10 +2767,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_56</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-021</ControlledDevice>
+      <MeasureValue>TE-025</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>021</WIDIndex>
       <WIDIndexPID>EH21</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2665,10 +2790,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_57</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-022</ControlledDevice>
+      <MeasureValue>TE-021</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>022</WIDIndex>
       <WIDIndexPID>EH22</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2683,10 +2813,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_58</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-011</ControlledDevice>
+      <MeasureValue>TE-015</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>011</WIDIndex>
       <WIDIndexPID>EH11</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -2701,10 +2836,15 @@
     <name>Analog_TRANSMITTER_OnlyText_Horizontal_BlockIcon_59</name>
     <file>../../ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_BlockIcon_OnlyText_Horizontal.bob</file>
     <macros>
+      <ControlledDevice>EH-012</ControlledDevice>
+      <MeasureValue>TE-011</MeasureValue>
+      <MeasureValueEGU>K</MeasureValueEGU>
+      <WIDAmConf>Virt-AMCONF</WIDAmConf>
       <WIDDev>EH</WIDDev>
       <WIDDis>Cryo</WIDDis>
       <WIDIndex>012</WIDIndex>
       <WIDIndexPID>EH12</WIDIndexPID>
+      <WIDSec>TS2-010</WIDSec>
       <WIDSecSub>TS2-010CRM</WIDSecSub>
       <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
     </macros>
@@ -3265,7 +3405,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label_20</name>
-    <text>version 2020-06-15 16:00</text>
+    <text>version 2020-07-08 12:00</text>
     <x>2287</x>
     <y>1303</y>
     <width>197</width>
@@ -3318,25 +3458,6 @@
     <tooltip></tooltip>
     <confirm_message></confirm_message>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>PV_Valve_BlockIcon_Horizontal_6</name>
-    <file>../../ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_Control_BlockIcon.bob</file>
-    <macros>
-      <MeasureValue>LT-001</MeasureValue>
-      <ProcessValue>TS2-010CRM:Cryo-LT-001:MeasValue</ProcessValue>
-      <ProcessValueEGU>%</ProcessValueEGU>
-      <WIDDev>PID</WIDDev>
-      <WIDDis>Cryo</WIDDis>
-      <WIDIndex>001</WIDIndex>
-      <WIDSecSub>TS2-010CRM</WIDSecSub>
-    </macros>
-    <x>2238</x>
-    <y>712</y>
-    <width>160</width>
-    <height>60</height>
-    <resize>1</resize>
-    <transparent>true</transparent>
-  </widget>
   <widget type="embedded" version="2.0.0">
     <name>Embedded Display</name>
     <file>nightbutt.bob</file>