diff --git a/AgentBin/simulator/SCM_DEMO.xml b/AgentBin/simulator/SCM_DEMO.xml
new file mode 100644
index 0000000..bcb9315
--- /dev/null
+++ b/AgentBin/simulator/SCM_DEMO.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MTConnectDevices xmlns:m="urn:mtconnect.org:MTConnectDevices:1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mtconnect.org:MTConnectDevices:1.1" xsi:schemaLocation="urn:mtconnect.org:MTConnectDevices:1.1 http://www.mtconnect.org/schemas/MTConnectDevices_1.1.xsd">
+  <Header creationTime="2016-04-28T08:44:40+00:00" sender="localhost" instanceId="3" bufferSize="131072" version="1.1"/>
+  <Devices>
+    <Device id="demo_123456" iso841Class="6" name="SCM" sampleInterval="10" uuid="000123456">
+      <Description manufacturer="SCM">Test machine SCM</Description>
+      <DataItems>
+        <DataItem category="EVENT" id="AVAIL" type="AVAILABILITY"/>
+        <DataItem category="EVENT" id="STATUS" type="ACTUATOR_STATE"/>
+        <DataItem category="SAMPLE" id="ACC_TIME" name="Tempo macchina ON" type="ACCUMULATED_TIME"/>
+        <DataItem category="SAMPLE" id="ACC_TIME_WORK" name="Tempo macchina in RUN" type="ACCUMULATED_TIME"/>
+        <DataItem category="SAMPLE" id="CLOCK" type="CLOCK_TIME"/>
+        <DataItem category="SAMPLE" id="POWER" type="WATTAGE"/>
+        <DataItem category="EVENT" id="OperatorId" type="MESSAGE"/>
+        <DataItem category="EVENT" id="FUNCT_MODE" type="MESSAGE"/>
+        <DataItem category="EVENT" id="USER_ACTION" type="MESSAGE"/>
+        <DataItem category="EVENT" id="TESTING_DATA" type="MESSAGE"/>
+        <DataItem category="EVENT" id="UNK_STATUS" type="MESSAGE"/>
+        <DataItem category="EVENT" id="UNK_STROBE" type="MESSAGE"/>
+        <DataItem category="CONDITION" id="CNC" type="SYSTEM"/>
+        <DataItem category="CONDITION" id="PLC" type="LOGIC"/>
+      </DataItems>
+      <Components>
+        <Axes id="ax" name="Axes">
+          <Components>
+            <Linear id="Axis_01" name="Asse X">
+              <DataItems>
+                <!-- descrizione, es "X" che POTREBBE cambiare -->
+                <DataItem category="EVENT" id="Axis_01_Descr" type="MESSAGE"/>
+                <DataItem category="SAMPLE" id="Axis_01_PosAct" name="Pos asse X (1) actual" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_01_PosTgt" name="Pos asse X (1) target" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_01_Load" name="Load asse X (1)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_01_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_01_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_01_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_01_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_01_FeedAct" name="FEEDRATE Asse X (1)" subType="ACTUAL" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_01_FeedOver" name="FEEDRATE OVERRIDE Asse X (1)" subType="OVERRIDE" type="AXIS_FEEDRATE"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_01_AccelAct" name="Accelerazione asse X (1)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_01_AccTime" name="Tempo impiego cumulato asse X (1)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_01_Battery" name="Valore batteria asse X (1)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_01_DistDone" name="Distanza TOTALE percorsa dall'asse X (1)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_01_InvDDone" name="Num cambi direzione asse X (1)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem type="TEMPERATURE" id="Temp_01_Value" category="SAMPLE" name="Sonda Temperatura asse 1" units="DEGREE" />
+                <DataItem category="CONDITION" id="AX01_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX01_PLC" type="LOGIC"/>
+              </DataItems>
+            </Linear>
+            <Linear id="Axis_02" name="Asse Y">
+              <DataItems>
+                <!-- descrizione, es "Asse Y (2)" che POTREBBE cambiare -->
+                <DataItem category="EVENT" id="Axis_02_Descr" type="MESSAGE"/>
+                <DataItem category="SAMPLE" id="Axis_02_PosAct" name="Pos asse Y (2) actual" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_02_PosTgt" name="Pos asse Y (2) target" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_02_Load" name="Load asse Y (2)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_02_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_02_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_02_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_02_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_02_FeedAct" name="FEEDRATE Asse Y (2)" subType="ACTUAL" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_02_FeedOver" name="FEEDRATE OVERRIDE Asse Y (2)" subType="OVERRIDE" type="AXIS_FEEDRATE"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_02_AccelAct" name="Accelerazione asse Y (2)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_02_AccTime" name="Tempo impiego cumulato asse Y (2)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_02_Battery" name="Valore batteria asse Y (2)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_02_DistDone" name="Distanza TOTALE percorsa dall'asse Y (2)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_02_InvDDone" name="Num cambi direzione asse Y (2)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem type="TEMPERATURE" id="Temp_02_Value" category="SAMPLE" name="Sonda Temperatura asse 2" units="DEGREE" />
+                <DataItem category="CONDITION" id="AX02_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX02_PLC" type="LOGIC"/>
+              </DataItems>
+            </Linear>
+            <Linear id="Axis_03" name="Asse Z">
+              <DataItems>
+                <!-- descrizione, es "Asse Z (3)" che POTREBBE cambiare -->
+                <DataItem category="EVENT" id="Axis_02_Descr" type="MESSAGE"/>
+                <DataItem category="SAMPLE" id="Axis_03_PosAct" name="Pos asse Z (3) actual" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_03_PosTgt" name="Pos asse Z (3) target" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_03_Load" name="Load asse Z (3)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_03_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_03_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_03_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_03_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_03_FeedAct" name="FEEDRATE Asse Z (3)" subType="ACTUAL" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_03_FeedOver" name="FEEDRATE OVERRIDE Asse Z (3)" subType="OVERRIDE" type="AXIS_FEEDRATE"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_03_AccelAct" name="Accelerazione asse Z (3)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_03_AccTime" name="Tempo impiego cumulato asse Z (3)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_03_Battery" name="Valore batteria asse Z (3)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_03_DistDone" name="Distanza TOTALE percorsa dall'asse Z (3)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_03_InvDDone" name="Num cambi direzione asse X (3)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem type="TEMPERATURE" id="Temp_03_Value" category="SAMPLE" name="Sonda Temperatura asse 3" units="DEGREE" />
+                <DataItem category="CONDITION" id="AX03_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX03_PLC" type="LOGIC"/>
+              </DataItems>
+            </Linear>
+            <Linear id="Axis_06" name="Asse U">
+              <DataItems>
+                <!-- Descrizione, es "U" che POTREBBE cambiare se si sposta di path -->
+                <DataItem category="EVENT" id="Axis_06_Descr" type="MESSAGE"/>
+                <DataItem category="SAMPLE" id="Axis_06_PosAct" name="Pos asse U (6) actual" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_06_PosTgt" name="Pos asse U (6) target" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
+                <DataItem category="SAMPLE" id="Axis_06_Load" name="Load asse U (6)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_06_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_06_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_06_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_06_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_06_FeedAct" name="FEEDRATE Asse U (6)" subType="ACTUAL" type="AXIS_FEEDRATE" units="MILLIMETER/SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_06_FeedOver" name="FEEDRATE OVERRIDE Asse U (6)" subType="OVERRIDE" type="AXIS_FEEDRATE"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_06_AccelAct" name="Accelerazione asse U (6)" nativeUnits="MILLIMETER/SECOND^2" type="ACCELERATION" units="MILLIMETER/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_06_AccTime" name="Tempo impiego cumulato asse U (6)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_06_Battery" name="Valore batteria asse U (6)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_06_DistDone" name="Distanza TOTALE percorsa dall'asse U (6)" nativeUnits="METER" type="LENGHT" units="METER"/>
+                <DataItem category="SAMPLE" id="Axis_06_InvDDone" name="Num cambi direzione asse U (6)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem type="TEMPERATURE" id="Temp_06_Value" category="SAMPLE" name="Sonda Temperatura asse 6" units="DEGREE" />
+                <DataItem category="CONDITION" id="AX06_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX06_PLC" type="LOGIC"/>
+              </DataItems>
+            </Linear>
+            <Rotary id="Axis_04" name="Asse B">
+              <DataItems>
+                <DataItem category="SAMPLE" id="Axis_04_PosAct" name="Pos asse J (4) actual" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE"/>
+                <DataItem category="SAMPLE" id="Axis_04_PosTgt" name="Pos asse J (4) target" nativeUnits="DEGREE" subType="COMMANDED" type="ANGLE" units="DEGREE"/>
+                <DataItem category="SAMPLE" id="Axis_04_Load" name="Load asse J (4)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_04_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_04_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_04_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_04_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_04_FeedAct" name="ROT SPEED Asse J (4)" subType="ACTUAL" type="ROTARY_VELOCITY" units="REVOLUTION/MINUTE"/>
+                <DataItem category="SAMPLE" id="Axis_04_FeedOver" name="ROT SPEED OVERRIDE Asse J (4)" subType="OVERRIDE" type="ROTARY_VELOCITY"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_04_AccelAct" name="Accelerazione angolare asse J (4)" nativeUnits="DEGREE/SECOND^2" type="ANGULAR_ACCELERATION" units="DEGREE/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_04_AccTime" name="Tempo impiego cumulato asse J (4)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_04_Battery" name="Valore batteria asse J (4)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_04_DistDone" name="Num Giri asse J (4) nel periodo di rilevazione" nativeUnits="COUNT" type="LENGHT" units="COUNT"/>
+                <DataItem category="SAMPLE" id="Axis_04_InvDDone" name="Num cambi direzione asse J (4)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem category="CONDITION" id="AX04_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX04_PLC" type="LOGIC"/>
+              </DataItems>
+            </Rotary>
+            <Rotary id="Axis_05" name="Asse C (5)">
+              <DataItems>
+                <DataItem category="SAMPLE" id="Axis_05_PosAct" name="Pos asse K (5) actual" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE"/>
+                <DataItem category="SAMPLE" id="Axis_05_PosTgt" name="Pos asse K (5) target" nativeUnits="DEGREE" subType="COMMANDED" type="ANGLE" units="DEGREE"/>
+                <DataItem category="SAMPLE" id="Axis_05_Load" name="Load asse K (5)" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <DataItem category="EVENT" id="Axis_05_MainProc" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_05_IsMast" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_05_MastId" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Axis_05_Dir" type="DIRECTION"/>
+                <DataItem category="SAMPLE" id="Axis_05_FeedAct" name="ROT SPEED Asse K (5)" subType="ACTUAL" type="ROTARY_VELOCITY" units="REVOLUTION/MINUTE"/>
+                <DataItem category="SAMPLE" id="Axis_05_FeedOver" name="ROT SPEED OVERRIDE Asse K (5)" subType="OVERRIDE" type="ROTARY_VELOCITY"  nativeUnits="PERCENT" units="PERCENT"/>
+                <DataItem category="SAMPLE" id="Axis_05_AccelAct" name="Accelerazione angolare asse K (5)" nativeUnits="DEGREE/SECOND^2" type="ANGULAR_ACCELERATION" units="DEGREE/SECOND^2"/>
+                <DataItem category="SAMPLE" id="Axis_05_AccTime" name="Tempo impiego cumulato asse K (5)" nativeUnits="SECOND" type="ACCUMULATED_TIME" units="SECOND"/>
+                <DataItem category="SAMPLE" id="Axis_05_Battery" name="Valore batteria asse K (5)" nativeUnits="VOLT" type="VOLTAGE" units="VOLT"/>
+                <DataItem category="SAMPLE" id="Axis_05_DistDone" name="Num Giri asse k (5) nel periodo di rilevazione" nativeUnits="COUNT" type="LENGHT" units="COUNT"/>
+                <DataItem category="SAMPLE" id="Axis_05_InvDDone" name="Num cambi direzione asse K (5)" nativeUnits="COUNT" type="MESSAGE" units="COUNT"/>
+                <DataItem category="CONDITION" id="AX05_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="AX05_PLC" type="LOGIC"/>
+              </DataItems>
+            </Rotary>
+          </Components>
+        </Axes>
+        <Controller id="cn1" name="controller">
+          <DataItems>
+            <DataItem category="EVENT" id="Message" type="MESSAGE"/>
+            <DataItem category="EVENT" id="E_STOP" type="EMERGENCY_STOP"/>
+          </DataItems>
+          <Components>
+            <Path id="Path_01" name="Path 01">
+              <DataItems>
+                <DataItem category="EVENT" id="Path_01_Type" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_ActiveAxes" type="ACTIVE_AXES"/>
+                <DataItem category="EVENT" id="Path_01_CodG_Act" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_SubMode" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_PartId" type="PART_ID"/>
+                <DataItem category="EVENT" id="Path_01_PZ_TOT" type="PART_COUNT"/>
+                <DataItem category="EVENT" id="Path_01_Cod_M" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_Cod_S" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_Cod_T" type="MESSAGE"/>
+                <DataItem category="EVENT" id="Path_01_RUN_MODE" type="CONTROLLER_MODE"/>
+                <DataItem category="EVENT" id="Path_01_EXE_MODE" type="EXECUTION"/>
+                <DataItem category="EVENT" id="Path_01_CurrProg" type="PROGRAM"/>
+                <DataItem category="EVENT" id="Path_01_CurrProg_RowNum" type="LINE"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedRate" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND" subType="ACTUAL" name="Path FEED"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path FEED Override"/>
+                <DataItem category="SAMPLE" id="Path_01_RapidOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path RAPID Override"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActX" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione X"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActY" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Y"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActZ" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Z"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActI" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo I"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActJ" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo J"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActK" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo K"/>
+                <DataItem category="CONDITION" id="Path_01_CNC" type="SYSTEM"/>
+                <DataItem category="CONDITION" id="Path_01_PLC" type="LOGIC"/>
+              </DataItems>
+            </Path>
+            <!-- probabilmente da ri-spostare sotto PATH... -->
+            <Actuator id="UniOp_01" name ="Unità Operatrice 01">
+              <DataItems>
+                <DataItem category="SAMPLE" id="UnOp_01_Speed" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND" subType="ACTUAL" name="UnOp Speed"/>
+                <DataItem category="SAMPLE" id="UnOp_01_SpeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="UnOp SPEED Override"/>
+                <DataItem category="EVENT" id="UnOp_01_ToolId" name="TOOL ID" type="TOOL_ASSET_ID"/>
+                <DataItem category="EVENT" id="UnOp_01_NumCU" name="Num Cambi Utensile effettuati" type="MESSAGE" units="COUNT"/>
+                <DataItem category="EVENT" id="UnOp_01_Status" type="ACTUATOR_STATE"/>
+                <DataItem category="EVENT" id="UnOp_01_VitaRes" name="Vita Residua Tool" type="MESSAGE" units="COUNT"/>
+                <DataItem category="SAMPLE" id="UnOp_01_Load" name="Load sul PATH/UnOp" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>
+                <!-- cambiare in event... -->
+                <DataItem category="SAMPLE" id="UnOp_01_AccTime" name="Totale giri (migliaia) accumulati dal mandrino" type="COUNT"/>
+              </DataItems>
+            </Actuator>
+          </Components>
+        </Controller>
+        <Systems id="systems" name="systems">
+          <Components>
+            <Electric id="el" name="electric">
+              <DataItems>
+                <DataItem category="EVENT" id="p2" name="power" type="POWER_STATE"/>
+              </DataItems>
+            </Electric>
+            <Hydraulic id="hsys" name="hydraulic">
+              <!--<DataItems>
+                <DataItem category="CONDITION" id="hlow" type="LEVEL"/>
+                <DataItem category="CONDITION" id="hpres" type="PRESSURE"/>
+                <DataItem category="CONDITION" id="htemp" type="TEMPERATURE"/>
+              </DataItems>-->
+            </Hydraulic>
+            <Pneumatic id="PneumSys" name="Pneumatic Systems">
+              <Actuator id="VacPump_01" name ="Pompa 1">
+                <DataItems>
+                  <DataItem category="EVENT" id="VacPump_01_Status" name="Stato Pompa 1" type="ACTUATOR_STATE"/>
+                </DataItems>
+              </Actuator>
+              <Actuator id="VacPump_02" name ="Pompa 2">
+                <DataItems>
+                  <DataItem category="EVENT" id="VacPump_02_Status" name="Stato Pompa 2" type="ACTUATOR_STATE"/>
+                </DataItems>
+              </Actuator>
+              <Actuator id="VacAct_01" name ="Valvola vuoto 1">
+                <DataItems>
+                  <DataItem category="EVENT" id="VacAct_01_Count" name="Contatore attivazioni valvola attuatore 1" type="MESSAGE" units="COUNT"/>
+                </DataItems>
+              </Actuator>
+              <Actuator id="VacAct_02" name ="Valvola vuoto 2">
+                <DataItems>
+                  <DataItem category="EVENT" id="VacAct_02_Count" name="Contatore attivazioni valvola attuatore 2" type="MESSAGE" units="COUNT"/>
+                </DataItems>
+              </Actuator>
+            </Pneumatic>
+            <Coolant id="cool" name="coolant">
+              <!--<DataItems>
+                <DataItem category="CONDITION" id="clow" type="LEVEL"/>
+                <DataItem category="CONDITION" id="coolpres" type="PRESSURE"/>
+                <DataItem category="CONDITION" id="filter" type="x:FILTER"/>
+                <DataItem category="CONDITION" id="coolantmotor" type="ACTUATOR"/>
+              </DataItems>-->
+              <Actuator id="Cooler_01" name ="Cooler 1">
+                <DataItems>
+                  <DataItem category="EVENT" id="Cooler_01_Status" name="Stato Cooler 1" type="ACTUATOR_STATE"/>
+                </DataItems>
+              </Actuator>
+              <Actuator id="Cooler_02" name ="Cooler 2">
+                <DataItems>
+                  <DataItem category="EVENT" id="Cooler_02_Status" name="Stato Cooler 2" type="ACTUATOR_STATE"/>
+                </DataItems>
+              </Actuator>
+            </Coolant>
+            <Lubrication id="LubroSys" name="Lubricant Systems">
+              <Actuator id="Lubro_01" name ="Lubrorefrigerante 1">
+                <DataItems>
+                  <DataItem category="EVENT" id="Lubro_01_Num" name="Contatore lubro 1" type="MESSAGE" units="COUNT"/>
+                </DataItems>
+              </Actuator>
+              <Actuator id="Lubro_02" name ="Lubrorefrigerante 2">
+                <DataItems>
+                  <DataItem category="EVENT" id="Lubro_02_Num" name="Contatore lubro 2" type="MESSAGE" units="COUNT"/>
+                </DataItems>
+              </Actuator>
+            </Lubrication>
+          </Components>
+        </Systems>
+        <Sensor id="sens1" name="Sensorunit">
+          <DataItems>
+            <!-- verificare di poterli spostare e siano 4, 1 x ogni asse lineare >>> SPOSTARE!!!!!! -->
+            <!-- <DataItem type="TEMPERATURE" id="Temp_04_Value" category="SAMPLE" name="Sonda Temperatura 4" units="DEGREE"/>            
+            <DataItem type="TEMPERATURE" id="Temp_05_Value" category="SAMPLE" name="Sonda Temperatura 5" units="DEGREE"/> -->
+            <DataItem type="PRESSURE" id="Press_01_Value" category="SAMPLE" name="Pressostato 1" units="PASCAL"/>
+          </DataItems>
+        </Sensor>
+      </Components>
+    </Device>
+  </Devices>
+</MTConnectDevices>
diff --git a/MTC_Sim/MTC_Sim/CmsGeneralStatus.txt b/MTC_Sim/MTC_Sim/CmsGeneralStatus.txt
index 8f6a82d..cd01664 100644
--- a/MTC_Sim/MTC_Sim/CmsGeneralStatus.txt
+++ b/MTC_Sim/MTC_Sim/CmsGeneralStatus.txt
@@ -1,2 +1,3 @@
-# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .cofig come "testCharSep")
-Operator|CMS Operator
+# Commenti con cancelletto, struttura un variabile per riga, tipo chiave|valore (occhio che il separatore è configurato da .config come "testCharSep")
+Operator|CMS Operator 001
+ProgName|WrkProgram_123