diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti
index 39c6b73..9067711 100644
--- a/solution/_Config/PLC/tc_project_app.xti
+++ b/solution/_Config/PLC/tc_project_app.xti
@@ -4,107 +4,6 @@
 		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
-			<Vars VarGrpType="1">
-				<Name>PlcTask Inputs</Name>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bLimitFwd</Name>
-					<Comment><![CDATA[Limit Switch Fwd input]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bLimitBwd</Name>
-					<Comment><![CDATA[Limit Switch Bwd input]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bExtendValve</Name>
-					<Comment><![CDATA[Solenoid valve Extend Input (for single solenoid)]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bRetractValve</Name>
-					<Comment><![CDATA[Solenoid valve Retract Input (for double solenoid)]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bPSSPermit</Name>
-					<Comment><![CDATA[Input signal from PSS for the movement]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bInterlock</Name>
-					<Comment><![CDATA[Input interlock signal for the movement]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bPressureExtend</Name>
-					<Comment><![CDATA[Input signal of air pressure for cyclinder extraction]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bPressureRetract</Name>
-					<Comment><![CDATA[Input signal of air pressure for cylinder retraction]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.nAirPressureValve</Name>
-					<Comment><![CDATA[Input signal of air pressure for pneumatic valve]]></Comment>
-					<Type>REAL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bExtendManual</Name>
-					<Comment><![CDATA[Push button input to extend cylinder]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisInputs.bRetractManual</Name>
-					<Comment><![CDATA[Push button input to retract the cylinder]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-			</Vars>
-			<Vars VarGrpType="2" AreaNo="1">
-				<Name>PlcTask Outputs</Name>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bLimitFwdOn</Name>
-					<Comment><![CDATA[Limit Switch Fwd power output]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bLimitBwdOn</Name>
-					<Comment><![CDATA[Limit Switch Bwd power output]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bValveOn</Name>
-					<Comment><![CDATA[Output of the solenoid valve (for single solenoid)]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bPressureExtendOn</Name>
-					<Comment><![CDATA[Power output for air pressure switch]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bPressureRetractOn</Name>
-					<Comment><![CDATA[Power output for air pressure switch]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.fAirPressureOn</Name>
-					<Comment><![CDATA[Power output for analog pressure sensor]]></Comment>
-					<Type>REAL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bExtendManualOn</Name>
-					<Comment><![CDATA[Power output for push button (extend)]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astPneumaticAxes[1].stPneumaticAxisOutputs.bRetractManualOn</Name>
-					<Comment><![CDATA[Power output for push button (retract)]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-			</Vars>
 			<Contexts>
 				<Context>
 					<Id NeedCalleeCall="true">0</Id>
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index d862fd6..acdd64a 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -70,7 +70,7 @@
     <Compile Include="tc_mca_std_lib\DUTs\Pneumatics\ST_PneumaticAxisControl.TcDUT">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\DUTs\Pneumatics\ST_PneumaticAxisFBConfig.TcDUT">
+    <Compile Include="tc_mca_std_lib\DUTs\Pneumatics\ST_PneumaticAxisConfig.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\Pneumatics\ST_PneumaticAxisInputs.TcDUT">