diff --git a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
index 3e5c7ad..940137a 100644
--- a/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
+++ b/MTC_Adapter/SCMA/DATA/CONF/DataModel.xml
@@ -49,63 +49,83 @@
       <Variable SymbolicName="ActiveTimeSession" BrowseName="ActiveTimeSession" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
     </Component>
     <Component Name="Axes">
-      <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-      <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-      <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-
-      <Component Name="AxisX">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
-        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+      <Component Name="01">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="LINEAR" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />        
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
-      <Component Name="AxisY">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
-        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+      <Component Name="02">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="LINEAR" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
-      <Component Name="AxisZ">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
-        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000]" Units="Count" />
+      <Component Name="03">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="LINEAR" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
-      <Component Name="AxisB">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
-        <Variable SymbolicName="revolutions" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+      <Component Name="04">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="ROTATIONAL" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="deg" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="deg" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
-      <Component Name="AxisC">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
-        <Variable SymbolicName="revolutions" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+      <Component Name="05">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="ROTATIONAL" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="deg" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="deg" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
-      <Component Name="AxisV">
-        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Count" />
-        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Override" BrowseName="Override" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 5000]" Units="Percent" />
-        <Variable SymbolicName="Inversions" BrowseName="inversion" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="[0 , 1000000]" Units="Count" />
-        <Variable SymbolicName="CurrentAng" BrowseName="CurrentAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
-        <Variable SymbolicName="revolutions" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 500000]" Units="Count" />
-        <Variable SymbolicName="TargetAng" BrowseName="TargetAng" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="[0 , 360]" Units="Count" />
+      <Component Name="06">
+        <Property SymbolicName="Type"  BrowseName="Type" DataType="ua:String" ValueRank="Scalar" Value="LINEAR" />
+        <Variable SymbolicName="Name" BrowseName="Name" DataType="ua:String" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
+        <Variable SymbolicName="Load" BrowseName="Load" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="CurrentPos" BrowseName="CurrentPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="TargetPos" BrowseName="TargetPos" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="mm" />
+        <Variable SymbolicName="Inversions" BrowseName="Inversions" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="Distance" BrowseName="Distance" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedRate" BrowseName="FeedRate" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Count" />
+        <Variable SymbolicName="FeedOverride" BrowseName="FeedOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="RapidOverride" BrowseName="RapidOverride" DataType="ua:Float" ValueRank="Scalar" GenerationRate="" Range="" Units="Percent" />
+        <Variable SymbolicName="ParentProc" BrowseName="ParentProc" DataType="ua:UInt32" ValueRank="Scalar" GenerationRate="" Range="" Units="Enumeration" />
       </Component>
     </Component>