diff --git a/solution/TrialLicense.tclrs b/solution/TrialLicense.tclrs
index 22c783e..35fbe7d 100644
--- a/solution/TrialLicense.tclrs
+++ b/solution/TrialLicense.tclrs
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcLicenseInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2011/11/TcLicenseInfo"><LicenseInfo><SystemId>{52C4A619-551C-008A-DE5B-87C2D878314F}</SystemId><IssueTime>2019-05-14T13:08:00</IssueTime><ExpireTime>2019-05-22T00:00:00</ExpireTime><LicenseKey>7fb4b4047c0c0233876df9026c1106362df127501e8fc4ebfa2c2b01c4ab2b4f9f1b765d8974d1af6260643139b69e5ae7ad52ba3be25218df7cde630544f0bd6cb1137b38fdb67505e770577256d7fa7f5dbd438d76176734cb8252d2b0a1737832f8aaf3411d263823fcd30320ee3a4d1a4772572ca014c85dac60d064898cfdd03f5069b6ef13927a1a3aa6acaf7558f21949780efdf7e4e5deccb3e763f0b6662d83eac91498422fdbea343d391853d34dd30e1f6681415dd3c26316d5551f7c35a30cd4e7671b35a1e9d5447ab5bf03cfe0f29e2abb4df13b4972ae6254f25456c23650f2f9a2faa9891d2f591ea109ab213f45fbec510fd24f3aa97c17</LicenseKey><License><LicenseId>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</LicenseId><Name>TC3 TCP/IP</Name><OrderNo>TF6310</OrderNo></License><License><LicenseId>{4C256767-E6E6-4AF5-BD68-9F7ABAD0C200}</LicenseId><Name>TC3 ADS</Name><OrderNo>TC1000</OrderNo></License><License><LicenseId>{A19036CF-A53B-4E3A-99FF-023EF5C4798B}</LicenseId><Name>TC3 NC PTP Axis</Name><Instances>10</Instances></License><License><LicenseId>{66689887-CCBD-452C-AC9A-039D997C6E66}</LicenseId><Name>TC3 PLC</Name><OrderNo>TC1200</OrderNo></License><License><LicenseId>{520DE751-9DB6-47CB-8240-BD5C466E7E64}</LicenseId><Name>TC3 NC PTP</Name><OrderNo>TF5000</OrderNo></License><License><LicenseId>{3FF18E97-7754-401B-93FB-70544DE28A13}</LicenseId><Name>TC3 IO</Name><OrderNo>TC1100</OrderNo></License></LicenseInfo></TcLicenseInfo>
+<TcLicenseInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2011/11/TcLicenseInfo"><LicenseInfo><SystemId>{21469191-0300-E1C0-C3DD-62104774D30F}</SystemId><IssueTime>2019-06-03T12:43:00</IssueTime><ExpireTime>2019-06-11T00:00:00</ExpireTime><LicenseKey>5dacefa756b5b013c66d6344cb3a48465bb45514e5c4843f450ae665865ca7f65dd3c43a441f54f73922566091c85994675624132e35c097ba119913df9734d50327dbecad56613840e7e38439426704b79e4a45f0616e6096c1d8ae2594a5af4cd72070b662221015adef28225406c0a0b2aca146def4e9ae8c381fc4a8cbf845f1aa682d50e5d2617f8b6cdada65077ff089d724e93ff3f27bf79e6ca7b0f9be83228413878fb58d6dde3383c68e07fe3341e104beb70d43bdbc744d9d1e3f35e1f99ed2c1d245d424c48efdd6c78f4dded487338a7d8a795a51d622af66aab1a78a6bfe5fcaf4df00a8be43e3739d4aa2ad6c81dc8e668033efed76727ba7</LicenseKey><License><LicenseId>{4C256767-E6E6-4AF5-BD68-9F7ABAD0C200}</LicenseId><Name>TC3 ADS</Name><OrderNo>TC1000</OrderNo></License><License><LicenseId>{3FF18E97-7754-401B-93FB-70544DE28A13}</LicenseId><Name>TC3 IO</Name><OrderNo>TC1100</OrderNo></License><License><LicenseId>{66689887-CCBD-452C-AC9A-039D997C6E66}</LicenseId><Name>TC3 PLC</Name><OrderNo>TC1200</OrderNo></License><License><LicenseId>{A19036CF-A53B-4E3A-99FF-023EF5C4798B}</LicenseId><Name>TC3 NC PTP Axis</Name><Instances>10</Instances></License><License><LicenseId>{520DE751-9DB6-47CB-8240-BD5C466E7E64}</LicenseId><Name>TC3 NC PTP</Name><OrderNo>TF5000</OrderNo></License><License><LicenseId>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</LicenseId><Name>TC3 TCP/IP</Name><OrderNo>TF6310</OrderNo></License></LicenseInfo></TcLicenseInfo>
diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 7a1623e..bba7a7b 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -932,28 +932,28 @@ External Setpoint Generation:
 					<Vars VarGrpType="1">
 						<Name>PlcTask Inputs</Name>
 						<Var>
-							<Name>GVL.axes[1].bLimitFwd</Name>
+							<Name>GVL.axes[1].inputs.bLimitFwd</Name>
 							<Comment>
 								<![CDATA[////Axis Inputs///////]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bLimitBwd</Name>
+							<Name>GVL.axes[1].inputs.bLimitBwd</Name>
 							<Comment>
 								<![CDATA[Backward limit switch]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bHomeSensor</Name>
+							<Name>GVL.axes[1].inputs.bHomeSensor</Name>
 							<Comment>
 								<![CDATA[Reference siganl for homing]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bEncLAtch</Name>
+							<Name>GVL.axes[1].inputs.bEncLAtch</Name>
 							<Comment>
 								<![CDATA[Reference index signal from inc. enconder]]>
 							</Comment>
@@ -1004,83 +1004,6 @@ External Setpoint Generation:
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]>
-								</Comment>
-							</SubVar>
-						</Var>
-						<Var>
-							<Name>GVL.axes[2].bLimitFwd</Name>
-							<Comment>
-								<![CDATA[////Axis Inputs///////]]>
-							</Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>GVL.axes[2].bLimitBwd</Name>
-							<Comment>
-								<![CDATA[Backward limit switch]]>
-							</Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>GVL.axes[2].bHomeSensor</Name>
-							<Comment>
-								<![CDATA[Reference siganl for homing]]>
-							</Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>GVL.axes[2].bEncLAtch</Name>
-							<Comment>
-								<![CDATA[Reference index signal from inc. enconder]]>
-							</Comment>
-							<Type>BOOL</Type>
-						</Var>
-						<Var>
-							<Name>GVL.axes[2].Axis.NcToPlc</Name>
-							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
-							<SubVar>
-								<Name>AxisState</Name>
-								<Comment>
-									<![CDATA[Present State Of The Axis Movement (continuous axis):
-0  = INACTIVE:		axis has no job
-1  = RUNNING:		axis is executing a motion job
-2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
-3  = PHASE_VELOCONST:	axis is moving at constant velocity
-4  = PHASE_ACCPOS:	axis is accelerating
-5  = PHASE_ACCNEG:	axis is decelerating
-Slaves only:
-11 = PREPHASE:		slave axis is in a motion pre-phase
-12 = SYNCHRONIZING:	slave axis is synchronizing
-13 = SYNCHRONOUS:	slave axis is moving synchronously
-External Setpoint Generation:
-41 = EXTSETGEN_MODE1:	external setpoint generation active
-42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]>
-								</Comment>
-							</SubVar>
-							<SubVar>
-								<Name>HomingState</Name>
-								<Comment>
-									<![CDATA[Axis Homing Status:
-0: idle
-1: start homing
-2: searching home switch
-3: stopping on home switch
-4: moving off home switch
-5: searching sync pulse
-6: stopping after homing
-]]>
-								</Comment>
-							</SubVar>
-							<SubVar>
-								<Name>CoupleState</Name>
-								<Comment>
-									<![CDATA[Axis Coupling Status:
-0: axis is a single axis (not coupled)
-1: axis is a master axis
-2: axis is master and slave
-3: axis is a slave axis
 ]]>
 								</Comment>
 							</SubVar>
@@ -1099,10 +1022,6 @@ External Setpoint Generation:
 							<Name>GVL.axes[1].Axis.PlcToNc</Name>
 							<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
 						</Var>
-						<Var>
-							<Name>GVL.axes[2].Axis.PlcToNc</Name>
-							<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
-						</Var>
 					</Vars>
 					<TaskPouOids>
 						<TaskPouOid Prio="20" OTCID="#x08502041"/>
diff --git a/solution/tc_project_app/VISUs/MainVisu.TcVIS b/solution/tc_project_app/VISUs/MainVisu.TcVIS
index 077e8cc..8277574 100644
--- a/solution/tc_project_app/VISUs/MainVisu.TcVIS
+++ b/solution/tc_project_app/VISUs/MainVisu.TcVIS
@@ -274,7 +274,7 @@
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bEnable"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].control.bEnable"</v>
                         </o>
                       </l>
                     </o>
@@ -542,7 +542,7 @@
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bLimitFwd"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].inputs.bLimitFwd"</v>
                         </o>
                       </l>
                     </o>
@@ -810,7 +810,7 @@
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bLimitBwd"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].inputs.bLimitBwd"</v>
                         </o>
                       </l>
                     </o>
@@ -2176,8 +2176,8 @@
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.MoveAbsolute;
-GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.MoveAbsolute;
+GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -2352,8 +2352,8 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.MoveVelocity;
-GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.MoveVelocity;
+GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -2528,8 +2528,8 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.MoveRelative;
-GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.MoveRelative;
+GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -2704,8 +2704,8 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.MoveModulo;
-GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.MoveModulo;
+GVL.axes[Main.hmiAxisSelection].control.bExecute:=TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -2724,7 +2724,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <l n="VisualElemMemberList" t="VisualElemMemberCollection" cet="VisualElemMember">
                         <o>
                           <v n="Id">1186196937L</v>
-                          <v n="Value">"GVL.axes[Main.hmiAxisSelection].bStop"</v>
+                          <v n="Value">"GVL.axes[Main.hmiAxisSelection].control.bStop"</v>
                         </o>
                       </l>
                     </o>
@@ -2775,7 +2775,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                     </o>
                     <o>
                       <v n="Id">1647042231L</v>
-                      <v n="Value">"GVL.axes[Main.hmiAxisSelection].bStop"</v>
+                      <v n="Value">"GVL.axes[Main.hmiAxisSelection].control.bStop"</v>
                     </o>
                     <o>
                       <v n="Id">2812299069L</v>
@@ -3059,24 +3059,24 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                 <v n="VisualElementIdentifier">"GenElemInst_124"</v>
                 <n n="VisualElementOfflinePaintCommands" />
                 <n n="VisualElementFrameInformation" />
-                <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
-                  <v>OnMouseDown</v>
+                <d n="VisualElementInputActions" t="Hashtable" ckt="String">
+                  <v>OnMouseUp</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bJogBwd:= TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= FALSE;"</v>
                     </o>
                   </a>
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.Jog;
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.Jog;
 "</v>
                     </o>
                   </a>
-                  <v>OnMouseUp</v>
+                  <v>OnMouseDown</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bJogBwd:= FALSE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogBwd:= TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -3248,23 +3248,23 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                 <n n="VisualElementOfflinePaintCommands" />
                 <n n="VisualElementFrameInformation" />
                 <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
-                  <v>OnMouseDown</v>
+                  <v>OnMouseUp</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bJogFwd:= TRUE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= FALSE;"</v>
                     </o>
                   </a>
                   <v>OnMouseClick</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].eCommand:=MotionFunctions.Jog;
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.eCommand:=MotionFunctions.Jog;
 "</v>
                     </o>
                   </a>
-                  <v>OnMouseUp</v>
+                  <v>OnMouseDown</v>
                   <a cet="STSnippetInputAction">
                     <o>
-                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bJogFwd:= FALSE;"</v>
+                      <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].control.bJogFwd:= TRUE;"</v>
                     </o>
                   </a>
                 </d>
@@ -3757,7 +3757,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].nErrorID"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.nErrorID"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -3851,7 +3851,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bError"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bError"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -4087,7 +4087,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">1647042231L</v>
-                          <v n="Value">""</v>
+                          <v n="Value">"GVL.axes[Main.hmiAxisSelection].control.bReset"</v>
                         </o>
                         <o>
                           <v n="Id">2812299069L</v>
@@ -4203,17 +4203,12 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                     <v n="VisualElementIdentifier">"GenElemInst_120"</v>
                     <n n="VisualElementOfflinePaintCommands" />
                     <n n="VisualElementFrameInformation" />
-                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="STSnippetInputAction[]">
+                    <d n="VisualElementInputActions" t="Hashtable" ckt="String" cvt="IInputAction[]">
                       <v>OnMouseClick</v>
-                      <a cet="STSnippetInputAction">
+                      <a cet="ToggleVarInputAction">
                         <o>
-                          <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bReset:=TRUE;"</v>
-                        </o>
-                      </a>
-                      <v>OnMouseUp</v>
-                      <a cet="STSnippetInputAction">
-                        <o>
-                          <v n="STSnippet">"GVL.axes[Main.hmiAxisSelection].bReset:=FALSE;"</v>
+                          <v n="ToggleVariable">"GVL.axes[Main.hmiAxisSelection].control.bReset"</v>
+                          <n n="Error" />
                         </o>
                       </a>
                     </d>
@@ -4644,7 +4639,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bEnabled"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bEnabled"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -4904,7 +4899,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bWarning"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bWarning"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -5164,7 +5159,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bBusy"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bBusy"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -5424,7 +5419,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bDone"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bDone"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -5684,7 +5679,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bResetDone"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bResetDone"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -5774,7 +5769,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bHomed"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bHomed"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -6204,7 +6199,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bFwEnabled"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bFwEnabled"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -6294,7 +6289,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bBwEnabled"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.bBwEnabled"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -7134,7 +7129,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fActPosition"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.fActPosition"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -7626,7 +7621,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fActVelocity"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].status.fActVelocity"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -8300,7 +8295,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fVelocity"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].config.fVelocity"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -8322,7 +8317,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <v>OnMouseClick</v>
                       <a cet="InputBoxInputAction">
                         <o>
-                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].fVelocity"</v>
+                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].config.fVelocity"</v>
                           <v n="InputType">"Default"</v>
                           <v n="InputBoxMin">""</v>
                           <v n="InputBoxMax">""</v>
@@ -8638,7 +8633,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fAcceleration"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].config.fAcceleration"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -8660,7 +8655,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <v>OnMouseClick</v>
                       <a cet="InputBoxInputAction">
                         <o>
-                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].fAcceleration"</v>
+                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].config.fAcceleration"</v>
                           <v n="InputType">"Default"</v>
                           <v n="InputBoxMin">""</v>
                           <v n="InputBoxMax">""</v>
@@ -8976,7 +8971,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fDeceleration"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].config.fDeceleration"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -8998,7 +8993,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <v>OnMouseClick</v>
                       <a cet="InputBoxInputAction">
                         <o>
-                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].fDeceleration"</v>
+                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].config.fDeceleration"</v>
                           <v n="InputType">"Default"</v>
                           <v n="InputBoxMin">""</v>
                           <v n="InputBoxMax">""</v>
@@ -9314,7 +9309,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">2477733581L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].fPosition"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].config.fPosition"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -9336,7 +9331,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <v>OnMouseClick</v>
                       <a cet="InputBoxInputAction">
                         <o>
-                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].fPosition"</v>
+                          <v n="InputBoxVariable">"GVL.axes[MAIN.hmiAxisSelection].config.fPosition"</v>
                           <v n="InputType">"Default"</v>
                           <v n="InputBoxMin">""</v>
                           <v n="InputBoxMax">""</v>
@@ -9776,7 +9771,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                         </o>
                         <o>
                           <v n="Id">743958181L</v>
-                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].bExecute"</v>
+                          <v n="Value">"GVL.axes[MAIN.hmiAxisSelection].control.bExecute"</v>
                         </o>
                         <o>
                           <v n="Id">2597686782L</v>
@@ -10136,7 +10131,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
                       <v>OnMouseClick</v>
                       <a cet="ToggleVarInputAction">
                         <o>
-                          <v n="ToggleVariable">"GVL.axes[MAIN.hmiAxisSelection].bExecute"</v>
+                          <v n="ToggleVariable">"GVL.axes[MAIN.hmiAxisSelection].control.bExecute"</v>
                           <n n="Error" />
                         </o>
                       </a>
@@ -10414,10 +10409,10 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
               <d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
                 <v>FB_Init</v>
                 <v>13be6eec-7fc2-4282-abbf-b24b2da58ba8</v>
-                <v>FB_Exit</v>
-                <v>95930a16-400d-44f0-9930-76888846236f</v>
                 <v>FB_Reinit</v>
                 <v>639e5dca-e06b-4c9e-8c1b-9a863c3c34f7</v>
+                <v>FB_Exit</v>
+                <v>95930a16-400d-44f0-9930-76888846236f</v>
               </d>
               <v n="FbName">"NotImportant"</v>
               <v n="FbGuid">{a9f37f15-844b-497f-805b-d8708d84591d}</v>
@@ -10530,6 +10525,7 @@ GVL.axes[Main.hmiAxisSelection].bExecute:=TRUE;"</v>
         <Type n="Guid">System.Guid</Type>
         <Type n="Hashtable">System.Collections.Hashtable</Type>
         <Type n="HotkeyConfiguration">{6b108d46-58af-4e41-a3f4-174d8f160cc4}</Type>
+        <Type n="IInputAction[]">_3S.CoDeSys.VisualElem.IInputAction[], VisualElem, Version=3.5.10.0, Culture=neutral, PublicKeyToken=null</Type>
         <Type n="InputBoxInputAction">{e8e7e747-f76f-4dee-ab1c-b9637e41ac26}</Type>
         <Type n="InputBoxInputAction[]">_3S.CoDeSys.VisualElem.InputBoxInputAction[], VisualElem.plugin, Version=3.5.10.32, Culture=neutral, PublicKeyToken=null</Type>
         <Type n="Int16">System.Int16</Type>
diff --git a/solution/tc_project_app/VISUs/RecipeManager.TcRMO b/solution/tc_project_app/VISUs/RecipeManager.TcRMO
deleted file mode 100644
index fcce9bb..0000000
--- a/solution/tc_project_app/VISUs/RecipeManager.TcRMO
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.12">
-  <RecipeManager Name="RecipeManager" Id="{b7f7a54b-5a88-4cb3-a0b8-51cfcb83eea3}">
-    <XmlArchive>
-      <Data>
-        <o xml:space="preserve" t="RecipeManObject">
-          <o n="LMGuids" t="LanguageModelGuidHelper">
-            <d n="NamesAndGuids" t="Hashtable" ckt="String" cvt="Guid">
-              <v>GVL_RECIPEMANAGEMENT_3300</v>
-              <v>8f0b301a-1479-42c8-8ffd-a38dff637643</v>
-              <v>RECIPEFACTORY</v>
-              <v>a27510d2-2266-40b1-9622-5959c6103cf9</v>
-              <v>RECIPEMANAGEMENTINITFB_INIT</v>
-              <v>4f75d468-ad7c-44d9-a8fb-1b01547078ae</v>
-              <v>RECIPEFACTORYFREERECIPE</v>
-              <v>835c7ab6-825e-4eb4-87a2-c250ec48e077</v>
-              <v>RECIPEFACTORYFB_INIT</v>
-              <v>ca8b7701-464d-45a1-906c-b0553b019fbc</v>
-              <v>RECIPEMANAGEMENTINITFB_REINIT</v>
-              <v>56b7bd3b-03fc-4f06-8921-da60d23e38c5</v>
-              <v>RECIPEMANAGEMENTINIT</v>
-              <v>29d93734-f9f2-4d0d-a61b-6a22178e9b6d</v>
-              <v>RECIPEMANAGEMENTINITINITIALIZE</v>
-              <v>ec029522-de39-4c7a-9a12-4fc5289fe8e9</v>
-              <v>RECIPEFACTORYCREATERECIPE</v>
-              <v>dc98e06d-642e-4964-9112-a90d1f0bb7f3</v>
-            </d>
-          </o>
-          <n n="StorageSettings" />
-          <v n="RecipesInPlc">true</v>
-          <v n="RecipesInPlcAssigned">false</v>
-        </o>
-      </Data>
-      <TypeList>
-        <Type n="Boolean">System.Boolean</Type>
-        <Type n="Guid">System.Guid</Type>
-        <Type n="Hashtable">System.Collections.Hashtable</Type>
-        <Type n="LanguageModelGuidHelper">{3bce4913-f2c1-4b54-84e8-6d7ec1809176}</Type>
-        <Type n="RecipeManObject">{09ecc42e-586d-4a08-932f-5bdcac20bb55}</Type>
-        <Type n="String">System.String</Type>
-      </TypeList>
-    </XmlArchive>
-  </RecipeManager>
-</TcPlcObject>
\ No newline at end of file
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 936ed0e..5eb56db 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 936ed0e9d0f34f876c91cf857ee389ed8ea4eb61
+Subproject commit 5eb56db806fd52bae29f59bfb59f2a42328fb61d
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index d484150..522bbc5 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -28,6 +28,18 @@
     <Compile Include="tc_mca_std_lib\DUTs\MotionFunctions.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisConfig.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisControl.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisInputs.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStatus.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
       <SubType>Code</SubType>
     </Compile>
@@ -182,9 +194,6 @@
       <SubType>Code</SubType>
       <DependentUpon>Visualization Manager.TcVMO</DependentUpon>
     </Compile>
-    <Compile Include="VISUs\RecipeManager.TcRMO">
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="DUTs" />
@@ -213,11 +222,6 @@
     <Folder Include="POUs" />
   </ItemGroup>
   <ItemGroup>
-    <PlaceholderReference Include="RecipeManagement">
-      <DefaultResolution>Recipe Management, 3.3.1.0 (System)</DefaultResolution>
-      <Namespace>Recipe_Management</Namespace>
-      <SystemLibrary>true</SystemLibrary>
-    </PlaceholderReference>
     <PlaceholderReference Include="System_VisuElemMeter">
       <DefaultResolution>VisuElemMeter, 3.5.10.0 (System)</DefaultResolution>
       <Namespace>VisuElemMeter</Namespace>