diff --git a/Documentation/XML/VectoInputDeclaration.1.0.png b/Documentation/XML/VectoInputDeclaration.1.0.png
index 4bce6111838f948696a5568c56fc41918424117f..7a0079c6c67fd0e2226014b6a0809bf1a268eafa 100644
Binary files a/Documentation/XML/VectoInputDeclaration.1.0.png and b/Documentation/XML/VectoInputDeclaration.1.0.png differ
diff --git a/Documentation/XML/VectoParameters.html b/Documentation/XML/VectoParameters.html
index 9db3c812e6b37872549c9f294df063d7371c9ef2..2633e4e22c9a9ada609a76224dd5263d2a6cdff5 100644
--- a/Documentation/XML/VectoParameters.html
+++ b/Documentation/XML/VectoParameters.html
@@ -222,8 +222,8 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 &lt;!--/*--&gt;</root><!--*/--></style></head><body>
 		<h1>Vecto Input Parameters</h1>
 		<div class="schemaVersion">Schema Version: 0.6 1.0 1.0</div>
-		<div class="generated">Generated: 04.06.2018 14:04</div>
-		<div class="nextParameter">Next free parameter: 269</div>
+		<div class="generated">Generated: 19.12.2018 15:46</div>
+		<div class="nextParameter">Next free parameter: 281</div>
 		<table border="1" class="parameters">
 			<thead>
 				<tr>
@@ -286,6 +286,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Auxiliary</span>
 								<span class="attribute">id</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Auxiliaries</span>
+								<span class="element">Data</span>
+								<span class="element">Auxiliary</span>
+								<span class="attribute">id</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -301,16 +309,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#01#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">TwinTyres</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">TwinTyres TwinTyres TwinTyres TwinTyres</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -323,17 +331,43 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">TwinTyres</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">TwinTyres</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">TwinTyres</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">TwinTyres</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:AxleTwinTyresType</td>
+					<td class="xmltype">tns:AxleTwinTyresType tns:AxleTwinTyresType tns:AxleTwinTyresType tns:AxleTwinTyresType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
 					<td class="parameterId">P046</td>
 					<td class="component">Tyre</td>
 					<td class="name">
-						<div class="declaration">RRCDeclared</div>
-						<div class="engineering">RRCISO</div>
+						<div class="declaration">RRCDeclared RRCDeclared RRCDeclared RRCDeclared</div>
+						<div class="engineering">RRCISO RRCISO RRCISO RRCISO</div>
 					</td>
 					<td class="type">Double4</td>
 					<td class="unit">[-]</td>
@@ -342,18 +376,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#06#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#24#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">RRCDeclared</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">RRCDeclared RRCDeclared RRCDeclared RRCDeclared</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -372,9 +406,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">RRCISO</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">RRCISO</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">RRCISO</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">RRCISO</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:TyreRRCISOType</td>
+					<td class="xmltype">tns:TyreRRCISOType tns:TyreRRCISOType tns:TyreRRCISOType tns:TyreRRCISOType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -388,18 +448,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#07#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#28#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">FzISO</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">FzISO FzISO FzISO FzISO</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -418,9 +478,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">FzISO</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">FzISO</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">FzISO</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">FzISO</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:TyreFzISOType</td>
+					<td class="xmltype">tns:TyreFzISOType tns:TyreFzISOType tns:TyreFzISOType tns:TyreFzISOType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -434,24 +520,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#06#00#00#">
+					<td class="xmlpath" sorting="00#28#35#35#12#14#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">RetarderLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">retarderSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Retarder Retarder</span>
+							<span class="element">Retarder Data Retarder Data</span>
+							<span class="element">Data RetarderLossMap Data RetarderLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">retarderSpeed retarderSpeed retarderSpeed retarderSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">RetarderLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">retarderSpeed</span>
+							<span class="element">Retarder Data</span>
+							<span class="element">Data RetarderLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">retarderSpeed retarderSpeed</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -464,9 +550,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">retarderSpeed</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">retarderSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">RetarderLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">retarderSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">retarderSpeed</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:RetarderSpeedType</td>
+					<td class="xmltype">tns:RetarderSpeedType tns:RetarderSpeedType tns:RetarderSpeedType tns:RetarderSpeedType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -480,24 +592,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#06#00#01#">
+					<td class="xmlpath" sorting="00#28#35#35#12#14#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">RetarderLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Retarder Retarder</span>
+							<span class="element">Retarder Data Retarder Data</span>
+							<span class="element">Data RetarderLossMap Data RetarderLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss torqueLoss torqueLoss</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">RetarderLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Retarder Data</span>
+							<span class="element">Data RetarderLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -510,9 +622,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">torqueLoss</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">RetarderLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Retarder</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:RetarderTorqueLossType</td>
+					<td class="xmltype">tns:RetarderTorqueLossType tns:RetarderTorqueLossType tns:RetarderTorqueLossType tns:RetarderTorqueLossType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -526,24 +664,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#18#00#00#">
+					<td class="xmlpath" sorting="00#28#29#29#38#40#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">engineSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">engineSpeed engineSpeed engineSpeed engineSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">engineSpeed</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">engineSpeed engineSpeed</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -556,6 +694,32 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">engineSpeed</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FullLoadAndDragCurve</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -564,9 +728,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">engineSpeed</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:EngineSpeedType</td>
+					<td class="xmltype">tns:EngineSpeedType tns:EngineSpeedType tns:EngineSpeedType tns:EngineSpeedType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -580,24 +751,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#18#00#01#">
+					<td class="xmlpath" sorting="00#28#29#29#38#40#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">maxTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">maxTorque maxTorque maxTorque maxTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">maxTorque</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">maxTorque maxTorque</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -610,6 +781,32 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">maxTorque</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">maxTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FullLoadAndDragCurve</span>
+								<span class="element">Entry</span>
+								<span class="attribute">maxTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">maxTorque</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -618,9 +815,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">maxTorque</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">maxTorque</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:EngineFLDMaxTorqueType</td>
+					<td class="xmltype">tns:EngineFLDMaxTorqueType tns:EngineFLDMaxTorqueType tns:EngineFLDMaxTorqueType tns:EngineFLDMaxTorqueType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -634,24 +838,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#18#00#02#">
+					<td class="xmlpath" sorting="00#28#29#29#38#40#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">dragTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">dragTorque dragTorque dragTorque dragTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FullLoadAndDragCurve</span>
-							<span class="element">Entry</span>
-							<span class="attribute">dragTorque</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FullLoadAndDragCurve</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">dragTorque dragTorque</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -665,20 +869,53 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="attribute">dragTorque</span>
 							</div>
 							<div>
-								<span class="element">VectoComponentEngineering</span>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
 								<span class="element">Engine</span>
 								<span class="element">Data</span>
-								<span class="element">FullLoadAndDragCurve</span>
 								<span class="element">Entry</span>
 								<span class="attribute">dragTorque</span>
 							</div>
-						</div>
-					</td>
-					<td class="xmltype">tns:EngineFLDDragTorqueType</td>
-					<td class="comment"></td>
-				</tr>
-				<tr class="Declaration Engineering ">
-					<td class="parameterId">P072</td>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FullLoadAndDragCurve</span>
+								<span class="element">Entry</span>
+								<span class="attribute">dragTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">dragTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FullLoadAndDragCurve</span>
+								<span class="element">Entry</span>
+								<span class="attribute">dragTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">dragTorque</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype">tns:EngineFLDDragTorqueType tns:EngineFLDDragTorqueType tns:EngineFLDDragTorqueType tns:EngineFLDDragTorqueType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration Engineering ">
+					<td class="parameterId">P072</td>
 					<td class="component">Engine/FC-map</td>
 					<td class="name">engineSpeed</td>
 					<td class="type">Double2</td>
@@ -688,24 +925,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#17#00#00#">
+					<td class="xmlpath" sorting="00#28#29#29#34#36#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">engineSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FuelConsumptionMap Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">engineSpeed engineSpeed engineSpeed engineSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">engineSpeed</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">engineSpeed engineSpeed</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -718,6 +955,32 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">engineSpeed</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FuelConsumptionMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -726,9 +989,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">engineSpeed</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">engineSpeed</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:EngineSpeedType</td>
+					<td class="xmltype">tns:EngineSpeedType tns:EngineSpeedType tns:EngineSpeedType tns:EngineSpeedType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -741,24 +1011,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#17#00#01#">
+					<td class="xmlpath" sorting="00#28#29#29#34#36#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FuelConsumptionMap Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torque torque torque torque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torque</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">torque torque</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -771,6 +1041,32 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">torque</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FuelConsumptionMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torque</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -779,9 +1075,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">torque</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torque</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:EngineFuelConsumptionMapTorqueType</td>
+					<td class="xmltype">tns:EngineFuelConsumptionMapTorqueType tns:EngineFuelConsumptionMapTorqueType tns:EngineFuelConsumptionMapTorqueType tns:EngineFuelConsumptionMapTorqueType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -795,24 +1098,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#17#00#02#">
+					<td class="xmlpath" sorting="00#28#29#29#34#36#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">fuelConsumption</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Engine Engine</span>
+							<span class="element">Engine Data Engine Data</span>
+							<span class="element">Data FuelConsumptionMap Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">fuelConsumption fuelConsumption fuelConsumption fuelConsumption</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelConsumptionMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">fuelConsumption</span>
+							<span class="element">Engine Data</span>
+							<span class="element">Data FuelConsumptionMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">fuelConsumption fuelConsumption</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -825,6 +1128,32 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">fuelConsumption</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">fuelConsumption</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">FuelConsumptionMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">fuelConsumption</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">fuelConsumption</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -833,9 +1162,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">fuelConsumption</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">fuelConsumption</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:EngineFuelConsumptionMapFuelConsumptionType</td>
+					<td class="xmltype">tns:EngineFuelConsumptionMapFuelConsumptionType tns:EngineFuelConsumptionMapFuelConsumptionType tns:EngineFuelConsumptionMapFuelConsumptionType tns:EngineFuelConsumptionMapFuelConsumptionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -849,147 +1185,452 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#00#">
+					<td class="xmlpath" sorting="00#28#31#31#14#16#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">Ratio</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox Data Gearbox Data</span>
+							<span class="element">Data Gears Data Gears</span>
+							<span class="element">Gear Gear Gear Gear</span>
+							<span class="element">Ratio Ratio Ratio Ratio</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">Ratio</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Data Gears</span>
+							<span class="element">Gear Gear</span>
+							<span class="element">Ratio Ratio</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:GearboxGearRatioType</td>
+					<td class="xmltype">tns:GearboxGearRatioType tns:GearboxGearRatioType tns:GearboxGearRatioType tns:GearboxGearRatioType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
-					<td class="parameterId">P096</td>
-					<td class="component">Gearbox/Gear/Lossmap</td>
-					<td class="name">inputSpeed</td>
-					<td class="type">Double2</td>
+				<tr class="Engineering ">
+					<td class="parameterId">P092</td>
+					<td class="component">Torqueconverter</td>
+					<td class="name">ReferenceRPM</td>
+					<td class="type">double</td>
 					<td class="unit">[1/min]</td>
 					<td class="range">
-				≥ 0.00<span class="unit">1/min</span></td>
-					<td class="genericValues">
-						<span></span>
-					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#04#00#00#">
-						<div class="declaration">
-							<span class="element">VectoInputDeclaration</span>
-							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
-						</div>
-						<div class="declaration component">
-							<span class="element">VectoInputDeclaration</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
-						</div>
-						<div class="engineering"></div>
-					</td>
-					<td class="xmltype">tns:GearboxGearInputSpeedType</td>
-					<td class="comment"></td>
-				</tr>
-				<tr class="Declaration ">
-					<td class="parameterId">P097</td>
-					<td class="component">Gearbox/Gear/Lossmap</td>
-					<td class="name">inputTorque</td>
-					<td class="type">Double2</td>
-					<td class="unit">[Nm]</td>
-					<td class="range"></td>
+				≥ 0<span class="unit">1/min</span></td>
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#04#00#01#">
-						<div class="declaration">
-							<span class="element">VectoInputDeclaration</span>
-							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
-						</div>
-						<div class="declaration component">
-							<span class="element">VectoInputDeclaration</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">ReferenceRPM</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">ReferenceRPM</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">ReferenceRPM</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">ReferenceRPM</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:GearboxGearInputTorqueType</td>
+					<td class="xmltype"></td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
-					<td class="parameterId">P098</td>
+				<tr class="Declaration Engineering ">
+					<td class="parameterId">P096</td>
 					<td class="component">Gearbox/Gear/Lossmap</td>
-					<td class="name">torqueLoss</td>
+					<td class="name">inputSpeed</td>
 					<td class="type">Double2</td>
-					<td class="unit">[Nm]</td>
+					<td class="unit">[1/min]</td>
 					<td class="range">
-				≥ 0.00<span class="unit">Nm</span></td>
+				≥ 0.00<span class="unit">1/min</span></td>
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#04#00#02#">
+					<td class="xmlpath" sorting="00#28#31#31#45#16#32#20#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Vehicle Components Gearbox Data Gearbox Data</span>
+							<span class="element">Gearbox Data Gears Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry Entry Entry Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed inputSpeed inputSpeed inputSpeed inputSpeed inputSpeed inputSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed inputSpeed inputSpeed</span>
 						</div>
-						<div class="engineering"></div>
-					</td>
-					<td class="xmltype">tns:GearboxGearTorqueLossType</td>
-					<td class="comment"></td>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype">tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType tns:GearboxGearInputSpeedType</td>
+					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
+					<td class="parameterId">P097</td>
+					<td class="component">Gearbox/Gear/Lossmap</td>
+					<td class="name">inputTorque</td>
+					<td class="type">Double2</td>
+					<td class="unit">[Nm]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#28#31#31#45#16#32#20#08#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Vehicle Components Gearbox Data Gearbox Data</span>
+							<span class="element">Gearbox Data Gears Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque inputTorque inputTorque inputTorque inputTorque inputTorque inputTorque</span>
+						</div>
+						<div class="declaration component">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Gearbox</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque inputTorque inputTorque</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype">tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType tns:GearboxGearInputTorqueType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration Engineering ">
+					<td class="parameterId">P098</td>
+					<td class="component">Gearbox/Gear/Lossmap</td>
+					<td class="name">torqueLoss</td>
+					<td class="type">Double2</td>
+					<td class="unit">[Nm]</td>
+					<td class="range">
+				≥ 0.00<span class="unit">Nm</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#28#31#31#45#16#32#20#16#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Vehicle Components Gearbox Data Gearbox Data</span>
+							<span class="element">Gearbox Data Gears Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry Entry Entry Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss torqueLoss torqueLoss torqueLoss torqueLoss torqueLoss torqueLoss</span>
+						</div>
+						<div class="declaration component">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Gearbox</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Gearbox Data Gears</span>
+							<span class="element">Data Gears Gear Gear</span>
+							<span class="element">Gear TorqueLossMap Gear TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss torqueLoss torqueLoss</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype">tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType tns:GearboxGearTorqueLossType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P099</td>
 					<td class="component">Torqueconverter/Characteristics</td>
 					<td class="name">speedRatio</td>
@@ -1000,33 +1641,110 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#06#00#00#">
+					<td class="xmlpath" sorting="00#28#31#35#04#12#14#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Characteristics</span>
-							<span class="element">Entry</span>
-							<span class="attribute">speedRatio</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox TorqueConverter Gearbox TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">speedRatio speedRatio speedRatio speedRatio</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter TorqueConverter</span>
-							<span class="element">Data Data</span>
-							<span class="element">Characteristics Characteristics</span>
-							<span class="element">Entry Entry</span>
-							<span class="attribute">speedRatio speedRatio</span>
+							<span class="element">Gearbox TorqueConverter TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">speedRatio speedRatio speedRatio speedRatio</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">speedRatio</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:TorqueConverterSpeedRatioType</td>
+					<td class="xmltype">tns:TorqueConverterSpeedRatioType tns:TorqueConverterSpeedRatioType tns:TorqueConverterSpeedRatioType tns:TorqueConverterSpeedRatioType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P100</td>
 					<td class="component">Torqueconverter/Characteristics</td>
 					<td class="name">torqueRatio</td>
@@ -1037,33 +1755,110 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#06#00#01#">
+					<td class="xmlpath" sorting="00#28#31#35#04#12#14#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Characteristics</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueRatio</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox TorqueConverter Gearbox TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueRatio torqueRatio torqueRatio torqueRatio</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter TorqueConverter</span>
-							<span class="element">Data Data</span>
-							<span class="element">Characteristics Characteristics</span>
-							<span class="element">Entry Entry</span>
-							<span class="attribute">torqueRatio torqueRatio</span>
+							<span class="element">Gearbox TorqueConverter TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueRatio torqueRatio torqueRatio torqueRatio</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueRatio</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:TorqueConverterTorqueRatioType</td>
+					<td class="xmltype">tns:TorqueConverterTorqueRatioType tns:TorqueConverterTorqueRatioType tns:TorqueConverterTorqueRatioType tns:TorqueConverterTorqueRatioType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P101</td>
 					<td class="component">Torqueconverter/Characteristics</td>
 					<td class="name">inputTorqueRef</td>
@@ -1073,30 +1868,107 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#06#00#02#">
+					<td class="xmlpath" sorting="00#28#31#35#04#12#14#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Characteristics</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorqueRef</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox TorqueConverter Gearbox TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorqueRef inputTorqueRef inputTorqueRef inputTorqueRef</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter TorqueConverter</span>
-							<span class="element">Data Data</span>
-							<span class="element">Characteristics Characteristics</span>
-							<span class="element">Entry Entry</span>
-							<span class="attribute">inputTorqueRef inputTorqueRef</span>
+							<span class="element">Gearbox TorqueConverter TorqueConverter</span>
+							<span class="element">TorqueConverter Data TorqueConverter Data</span>
+							<span class="element">Data Characteristics Data Characteristics</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorqueRef inputTorqueRef inputTorqueRef inputTorqueRef</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Characteristics</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorqueRef</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:TorqueConverterInputTorqueRefType</td>
+					<td class="xmltype">tns:TorqueConverterInputTorqueRefType tns:TorqueConverterInputTorqueRefType tns:TorqueConverterInputTorqueRefType tns:TorqueConverterInputTorqueRefType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -1109,18 +1981,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#05#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#20#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">Dimension</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">Dimension Dimension Dimension Dimension</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -1139,24 +2011,100 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">Dimension</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">Dimension</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">Dimension</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">Dimension</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:TyreDimensionType</td>
+					<td class="xmltype">tns:TyreDimensionType tns:TyreDimensionType tns:TyreDimensionType tns:TyreDimensionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span></div>
+					Allowed values: <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span></div>
+					Allowed values: <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span>, <span class="enumEntry">"9 R22.5"</span>, <span class="enumEntry">"9.00 R20"</span>, <span class="enumEntry">"9.5 R17.5"</span>, <span class="enumEntry">"10 R17.5"</span>, <span class="enumEntry">"10 R22.5"</span>, <span class="enumEntry">"10.00 R20"</span>, <span class="enumEntry">"11 R22.5"</span>, <span class="enumEntry">"11.00 R20"</span>, <span class="enumEntry">"12 R22.5"</span>, <span class="enumEntry">"12.00 R20"</span>, <span class="enumEntry">"12.00 R24"</span>, <span class="enumEntry">"12.5 R20"</span>, <span class="enumEntry">"13 R22.5"</span>, <span class="enumEntry">"14.00 R20"</span>, <span class="enumEntry">"14.5 R20"</span>, <span class="enumEntry">"16.00 R20"</span>, <span class="enumEntry">"205/75 R17.5"</span>, <span class="enumEntry">"215/75 R17.5"</span>, <span class="enumEntry">"225/70 R17.5"</span>, <span class="enumEntry">"225/75 R17.5"</span>, <span class="enumEntry">"235/75 R17.5"</span>, <span class="enumEntry">"245/70 R17.5"</span>, <span class="enumEntry">"245/70 R19.5"</span>, <span class="enumEntry">"255/70 R22.5"</span>, <span class="enumEntry">"265/70 R17.5"</span>, <span class="enumEntry">"265/70 R19.5"</span>, <span class="enumEntry">"275/70 R22.5"</span>, <span class="enumEntry">"275/80 R22.5"</span>, <span class="enumEntry">"285/60 R22.5"</span>, <span class="enumEntry">"285/70 R19.5"</span>, <span class="enumEntry">"295/55 R22.5"</span>, <span class="enumEntry">"295/60 R22.5"</span>, <span class="enumEntry">"295/80 R22.5"</span>, <span class="enumEntry">"305/60 R22.5"</span>, <span class="enumEntry">"305/70 R19.5"</span>, <span class="enumEntry">"305/70 R22.5"</span>, <span class="enumEntry">"305/75 R24.5"</span>, <span class="enumEntry">"315/45 R22.5"</span>, <span class="enumEntry">"315/60 R22.5"</span>, <span class="enumEntry">"315/70 R22.5"</span>, <span class="enumEntry">"315/80 R22.5"</span>, <span class="enumEntry">"325/95 R24"</span>, <span class="enumEntry">"335/80 R20"</span>, <span class="enumEntry">"355/50 R22.5"</span>, <span class="enumEntry">"365/70 R22.5"</span>, <span class="enumEntry">"365/80 R20"</span>, <span class="enumEntry">"365/85 R20"</span>, <span class="enumEntry">"375/45 R22.5"</span>, <span class="enumEntry">"375/50 R22.5"</span>, <span class="enumEntry">"375/90 R22.5"</span>, <span class="enumEntry">"385/55 R22.5"</span>, <span class="enumEntry">"385/65 R22.5"</span>, <span class="enumEntry">"395/85 R20"</span>, <span class="enumEntry">"425/65 R22.5"</span>, <span class="enumEntry">"495/45 R22.5"</span>, <span class="enumEntry">"525/65 R20.5"</span>, <span class="enumEntry">"11.00 R16"</span>, <span class="enumEntry">"6.00 R9"</span>, <span class="enumEntry">"205/65 R17.5"</span>, <span class="enumEntry">"225/75 R16C"</span>, <span class="enumEntry">"255/100 R16"</span>, <span class="enumEntry">"255/60 R19.5"</span>, <span class="enumEntry">"265/55 R19.5"</span>, <span class="enumEntry">"275/60 R19.5"</span>, <span class="enumEntry">"275/80 R20"</span>, <span class="enumEntry">"285/65 R16C"</span>, <span class="enumEntry">"295/75 R22.5"</span>, <span class="enumEntry">"325/85 R16"</span>, <span class="enumEntry">"435/50 R19.5"</span>, <span class="enumEntry">"435/50 R22.5"</span>, <span class="enumEntry">"445/40 R22.5"</span>, <span class="enumEntry">"445/45 R19.5"</span>, <span class="enumEntry">"445/65 R22.5"</span>, <span class="enumEntry">"445/75 R22.5"</span>, <span class="enumEntry">"455/40 R22.5"</span>, <span class="enumEntry">"455/45 R22.5"</span>, <span class="enumEntry">"475/80 R20"</span>, <span class="enumEntry">"7.00 R16C"</span>, <span class="enumEntry">"7.50 R15"</span>, <span class="enumEntry">"7.50 R16"</span>, <span class="enumEntry">"7.50 R16C"</span>, <span class="enumEntry">"8.25 R15"</span>, <span class="enumEntry">"8.25 R16C"</span>, <span class="enumEntry">"8.5 R17.5"</span>, <span class="enumEntry">"8 R17.5"</span>, <span class="enumEntry">"LT265/75 R16"</span>, <span class="enumEntry">"385/55 R19.5"</span></div>
 						<br>
 						<span class="optionalEngineering">optional in Engineering mode</span>
 					</td>
 				</tr>
+				<tr class="Engineering ">
+					<td class="parameterId">P127</td>
+					<td class="component">Torqueconverter</td>
+					<td class="name">Inertia</td>
+					<td class="type">double</td>
+					<td class="unit">[kgm²]</td>
+					<td class="range">
+				≥ 0<span class="unit">kgm²</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Inertia</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Inertia</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">Inertia</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Inertia</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype"></td>
+					<td class="comment"></td>
+				</tr>
 				<tr class="Declaration Engineering ">
 					<td class="parameterId">P146</td>
 					<td class="component">Airdrag</td>
 					<td class="name">
-						<div class="declaration">DeclaredCdxA</div>
-						<div class="engineering">CdxA</div>
+						<div class="declaration">DeclaredCdxA DeclaredCdxA</div>
+						<div class="engineering">CdxA CdxA</div>
 					</td>
 					<td class="type">Double2</td>
 					<td class="unit">[m²]</td>
@@ -1165,14 +2113,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#07#">
+					<td class="xmlpath" sorting="00#28#43#00#14#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">DeclaredCdxA</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">DeclaredCdxA DeclaredCdxA</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -1189,12 +2137,19 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Data</span>
 								<span class="element">CdxA</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AirDrag</span>
+								<span class="element">Data</span>
+								<span class="element">CdxA</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:AirdragCdxAType</td>
+					<td class="xmltype">tns:AirdragCdxAType tns:AirdragCdxAType</td>
 					<td class="comment">In Declaration Mode a fixed amound is added for cycles simulated with trailer</td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P151</td>
 					<td class="component">Axlegear/Lossmap</td>
 					<td class="name">inputSpeed</td>
@@ -1205,31 +2160,68 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#08#00#00#">
+					<td class="xmlpath" sorting="00#28#37#37#16#18#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Axlegear Axlegear</span>
+							<span class="element">Axlegear Data Axlegear Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed inputSpeed inputSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
+							<span class="element">Axlegear Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AxlegearInputSpeedType</td>
+					<td class="xmltype">tns:AxlegearInputSpeedType tns:AxlegearInputSpeedType tns:AxlegearInputSpeedType tns:AxlegearInputSpeedType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P152</td>
 					<td class="component">Axlegear/Lossmap</td>
 					<td class="name">inputTorque</td>
@@ -1239,31 +2231,68 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#08#00#01#">
+					<td class="xmlpath" sorting="00#28#37#37#16#18#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Axlegear Axlegear</span>
+							<span class="element">Axlegear Data Axlegear Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque inputTorque inputTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
+							<span class="element">Axlegear Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AxlegearInputTorqueType</td>
+					<td class="xmltype">tns:AxlegearInputTorqueType tns:AxlegearInputTorqueType tns:AxlegearInputTorqueType tns:AxlegearInputTorqueType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P153</td>
 					<td class="component">Axlegear/Lossmap</td>
 					<td class="name">torqueLoss</td>
@@ -1274,28 +2303,65 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#08#00#02#">
+					<td class="xmlpath" sorting="00#28#37#37#16#18#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Axlegear Axlegear</span>
+							<span class="element">Axlegear Data Axlegear Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss torqueLoss torqueLoss</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Axlegear Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AxlegearTorqueLossType</td>
+					<td class="xmltype">tns:AxlegearTorqueLossType tns:AxlegearTorqueLossType tns:AxlegearTorqueLossType tns:AxlegearTorqueLossType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -1308,16 +2374,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#00#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">AxleType</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">AxleType AxleType AxleType AxleType</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -1330,14 +2396,40 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">AxleType</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">AxleType</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">AxleType</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">AxleType</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:AxleTypeDeclarationType</td>
+					<td class="xmltype">tns:AxleTypeDeclarationType tns:AxleTypeDeclarationType tns:AxleTypeDeclarationType tns:AxleTypeDeclarationType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span></div>
+					Allowed values: <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"Trailer"</span></div>
+					Allowed values: <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"Trailer"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"Trailer"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"Trailer"</span>, <span class="enumEntry">"VehicleNonDriven"</span>, <span class="enumEntry">"VehicleDriven"</span>, <span class="enumEntry">"Trailer"</span></div>
 						<br>Trailer axles must not be specified in declaration mode!</td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -1351,24 +2443,24 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#02#">
+					<td class="xmlpath" sorting="00#28#31#31#14#16#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">MaxTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox Data Gearbox Data</span>
+							<span class="element">Data Gears Data Gears</span>
+							<span class="element">Gear Gear Gear Gear</span>
+							<span class="element">MaxTorque MaxTorque MaxTorque MaxTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">MaxTorque</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Data Gears</span>
+							<span class="element">Gear Gear</span>
+							<span class="element">MaxTorque MaxTorque</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -1381,9 +2473,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Gear</span>
 								<span class="element">MaxTorque</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">MaxTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">MaxTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">MaxTorque</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:GearboxGearMaxTorqueType</td>
+					<td class="xmltype">tns:GearboxGearMaxTorqueType tns:GearboxGearMaxTorqueType tns:GearboxGearMaxTorqueType tns:GearboxGearMaxTorqueType</td>
 					<td class="comment">
 						<span class="optionalDeclaration">optional in Declaration mode</span>
 						<span class="optionalEngineering">optional in Engineering mode</span>
@@ -1403,34 +2521,195 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="xmlpath" sorting="">
 						<div class="engineering">
 							<div>
-								<span class="element">VectoComponentEngineering</span>
-								<span class="element">DriverModel</span>
-								<span class="element">ShiftStrategyParameters</span>
-								<span class="element">UpshiftMinAcceleration</span>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">UpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">UpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">UpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">UpshiftMinAcceleration</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype"></td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Engineering ">
+					<td class="parameterId">P168</td>
+					<td class="component">Gearshiftstrategy</td>
+					<td class="name">DownshiftAfterUpshiftDelay</td>
+					<td class="type">double</td>
+					<td class="unit">[s]</td>
+					<td class="range">
+				≥ 0<span class="unit">s</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">DownshiftAfterUpshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">DownshiftAfterUpshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">DownshiftAfterUpshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DownshiftAfterUpshiftDelay</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype"></td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Engineering ">
+					<td class="parameterId">P169</td>
+					<td class="component">Gearshiftstrategy</td>
+					<td class="name">UpshiftAfterDownshiftDelay</td>
+					<td class="type">double</td>
+					<td class="unit">[s]</td>
+					<td class="range">
+				≥ 0<span class="unit">s</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">UpshiftAfterDownshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">UpshiftAfterDownshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">UpshiftAfterDownshiftDelay</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">UpshiftAfterDownshiftDelay</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype"></td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Engineering ">
+					<td class="parameterId">P171</td>
+					<td class="component">Gearbox/Gear/Lossmap</td>
+					<td class="name">Efficiency</td>
+					<td class="type">double</td>
+					<td class="unit">[-]</td>
+					<td class="range">
+				≥ 0
+				≤ 1</td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gears</span>
+								<span class="element">Gear</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
 							</div>
-						</div>
-					</td>
-					<td class="xmltype"></td>
-					<td class="comment"></td>
-				</tr>
-				<tr class="Engineering ">
-					<td class="parameterId">P168</td>
-					<td class="component">Gearshiftstrategy</td>
-					<td class="name">DownshiftAfterUpshiftDelay</td>
-					<td class="type">double</td>
-					<td class="unit">[s]</td>
-					<td class="range">
-				≥ 0<span class="unit">s</span></td>
-					<td class="genericValues">
-						<span></span>
-					</td>
-					<td class="xmlpath" sorting="">
-						<div class="engineering">
 							<div>
-								<span class="element">VectoComponentEngineering</span>
-								<span class="element">DriverModel</span>
-								<span class="element">ShiftStrategyParameters</span>
-								<span class="element">DownshiftAfterUpshiftDelay</span>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">Gear</span>
+								<span class="element">Efficiency</span>
 							</div>
 						</div>
 					</td>
@@ -1438,30 +2717,57 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="comment"></td>
 				</tr>
 				<tr class="Engineering ">
-					<td class="parameterId">P169</td>
-					<td class="component">Gearshiftstrategy</td>
-					<td class="name">UpshiftAfterDownshiftDelay</td>
+					<td class="parameterId">P172</td>
+					<td class="component">Axlegear/Lossmap</td>
+					<td class="name">Efficiency</td>
 					<td class="type">double</td>
-					<td class="unit">[s]</td>
+					<td class="unit">[-]</td>
 					<td class="range">
-				≥ 0<span class="unit">s</span></td>
+				≥ 0
+				≤ 1</td>
 					<td class="genericValues">
 						<span></span>
 					</td>
 					<td class="xmlpath" sorting="">
 						<div class="engineering">
 							<div>
-								<span class="element">VectoComponentEngineering</span>
-								<span class="element">DriverModel</span>
-								<span class="element">ShiftStrategyParameters</span>
-								<span class="element">UpshiftAfterDownshiftDelay</span>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Efficiency</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Efficiency</span>
 							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P173</td>
 					<td class="component">Angledrive/Lossmap</td>
 					<td class="name">inputSpeed</td>
@@ -1472,31 +2778,68 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#07#00#00#">
+					<td class="xmlpath" sorting="00#28#33#33#14#16#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Angledrive Angledrive</span>
+							<span class="element">Angledrive Data Angledrive Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed inputSpeed inputSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputSpeed</span>
+							<span class="element">Angledrive Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">inputSpeed inputSpeed</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputSpeed</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AngledriveInputSpeedType</td>
+					<td class="xmltype">tns:AngledriveInputSpeedType tns:AngledriveInputSpeedType tns:AngledriveInputSpeedType tns:AngledriveInputSpeedType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P174</td>
 					<td class="component">Angledrive/Lossmap</td>
 					<td class="name">inputTorque</td>
@@ -1506,31 +2849,68 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#07#00#01#">
+					<td class="xmlpath" sorting="00#28#33#33#14#16#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Angledrive Angledrive</span>
+							<span class="element">Angledrive Data Angledrive Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque inputTorque inputTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">inputTorque</span>
+							<span class="element">Angledrive Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">inputTorque inputTorque</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">inputTorque</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AngledriveInputTorqueType</td>
+					<td class="xmltype">tns:AngledriveInputTorqueType tns:AngledriveInputTorqueType tns:AngledriveInputTorqueType tns:AngledriveInputTorqueType</td>
 					<td class="comment"></td>
 				</tr>
-				<tr class="Declaration ">
+				<tr class="Declaration Engineering ">
 					<td class="parameterId">P175</td>
 					<td class="component">Angledrive/Lossmap</td>
 					<td class="name">torqueLoss</td>
@@ -1541,28 +2921,65 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#07#00#02#">
+					<td class="xmlpath" sorting="00#28#33#33#14#16#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Angledrive Angledrive</span>
+							<span class="element">Angledrive Data Angledrive Data</span>
+							<span class="element">Data TorqueLossMap Data TorqueLossMap</span>
+							<span class="element">Entry Entry Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss torqueLoss torqueLoss</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">TorqueLossMap</span>
-							<span class="element">Entry</span>
-							<span class="attribute">torqueLoss</span>
+							<span class="element">Angledrive Data</span>
+							<span class="element">Data TorqueLossMap</span>
+							<span class="element">Entry Entry</span>
+							<span class="attribute">torqueLoss torqueLoss</span>
+						</div>
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">TorqueLossMap</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Angledrive</span>
+								<span class="element">Data</span>
+								<span class="element">Entry</span>
+								<span class="attribute">torqueLoss</span>
+							</div>
 						</div>
-						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AngledriveTorqueLossType</td>
+					<td class="xmltype">tns:AngledriveTorqueLossType tns:AngledriveTorqueLossType tns:AngledriveTorqueLossType tns:AngledriveTorqueLossType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -1576,14 +2993,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#05#">
+					<td class="xmlpath" sorting="00#28#33#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">Ratio</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">Ratio Ratio</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -1593,7 +3010,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AngledriveRatioType</td>
+					<td class="xmltype">tns:AngledriveRatioType tns:AngledriveRatioType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Engineering ">
@@ -1618,6 +3035,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Auxiliary</span>
 								<span class="element">ConstantAuxLoad</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Auxiliaries</span>
+								<span class="element">Data</span>
+								<span class="element">Auxiliary</span>
+								<span class="element">ConstantAuxLoad</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -1633,29 +3058,29 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#06#00#00#00#">
+					<td class="xmlpath" sorting="00#28#41#41#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">Fan</span>
-							<span class="element">Technology</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Auxiliaries Auxiliaries</span>
+							<span class="element">Auxiliaries Data Auxiliaries Data</span>
+							<span class="element">Data Fan Data Fan</span>
+							<span class="element">Technology Technology Technology Technology</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">Fan</span>
-							<span class="element">Technology</span>
+							<span class="element">Auxiliaries Data</span>
+							<span class="element">Data Fan</span>
+							<span class="element">Technology Technology</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AuxFanTechnologyType</td>
+					<td class="xmltype">tns:AuxFanTechnologyType tns:AuxFanTechnologyType tns:AuxFanTechnologyType tns:AuxFanTechnologyType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Crankshaft mounted - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Discrete step clutch"</span>, <span class="enumEntry">"Crankshaft mounted - On/off clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Discrete step clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - On/off clutch"</span>, <span class="enumEntry">"Hydraulic driven - Variable displacement pump"</span>, <span class="enumEntry">"Hydraulic driven - Constant displacement pump"</span>, <span class="enumEntry">"Electrically driven - Electronically controlled"</span></div>
+					Allowed values: <span class="enumEntry">"Crankshaft mounted - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Discrete step clutch"</span>, <span class="enumEntry">"Crankshaft mounted - On/off clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Discrete step clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - On/off clutch"</span>, <span class="enumEntry">"Hydraulic driven - Variable displacement pump"</span>, <span class="enumEntry">"Hydraulic driven - Constant displacement pump"</span>, <span class="enumEntry">"Electrically driven - Electronically controlled"</span>, <span class="enumEntry">"Crankshaft mounted - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Discrete step clutch"</span>, <span class="enumEntry">"Crankshaft mounted - On/off clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Discrete step clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - On/off clutch"</span>, <span class="enumEntry">"Hydraulic driven - Variable displacement pump"</span>, <span class="enumEntry">"Hydraulic driven - Constant displacement pump"</span>, <span class="enumEntry">"Electrically driven - Electronically controlled"</span>, <span class="enumEntry">"Crankshaft mounted - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Discrete step clutch"</span>, <span class="enumEntry">"Crankshaft mounted - On/off clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Discrete step clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - On/off clutch"</span>, <span class="enumEntry">"Hydraulic driven - Variable displacement pump"</span>, <span class="enumEntry">"Hydraulic driven - Constant displacement pump"</span>, <span class="enumEntry">"Electrically driven - Electronically controlled"</span>, <span class="enumEntry">"Crankshaft mounted - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Crankshaft mounted - Discrete step clutch"</span>, <span class="enumEntry">"Crankshaft mounted - On/off clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Electronically controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Bimetallic controlled visco clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - Discrete step clutch"</span>, <span class="enumEntry">"Belt driven or driven via transm. - On/off clutch"</span>, <span class="enumEntry">"Hydraulic driven - Variable displacement pump"</span>, <span class="enumEntry">"Hydraulic driven - Constant displacement pump"</span>, <span class="enumEntry">"Electrically driven - Electronically controlled"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -1670,29 +3095,29 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#06#00#01#00#">
+					<td class="xmlpath" sorting="00#28#41#41#04#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">SteeringPump</span>
-							<span class="element">Technology</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Auxiliaries Auxiliaries</span>
+							<span class="element">Auxiliaries Data Auxiliaries Data</span>
+							<span class="element">Data SteeringPump Data SteeringPump</span>
+							<span class="element">Technology Technology Technology Technology</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">SteeringPump</span>
-							<span class="element">Technology</span>
+							<span class="element">Auxiliaries Data</span>
+							<span class="element">Data SteeringPump</span>
+							<span class="element">Technology Technology</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AuxSPTechnologyType</td>
+					<td class="xmltype">tns:AuxSPTechnologyType tns:AuxSPTechnologyType tns:AuxSPTechnologyType tns:AuxSPTechnologyType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Fixed displacement"</span>, <span class="enumEntry">"Fixed displacement with elec. control"</span>, <span class="enumEntry">"Dual displacement"</span>, <span class="enumEntry">"Variable displacement mech. controlled"</span>, <span class="enumEntry">"Variable displacement elec. controlled"</span>, <span class="enumEntry">"Electric"</span></div>
+					Allowed values: <span class="enumEntry">"Fixed displacement"</span>, <span class="enumEntry">"Fixed displacement with elec. control"</span>, <span class="enumEntry">"Dual displacement"</span>, <span class="enumEntry">"Variable displacement mech. controlled"</span>, <span class="enumEntry">"Variable displacement elec. controlled"</span>, <span class="enumEntry">"Electric"</span>, <span class="enumEntry">"Fixed displacement"</span>, <span class="enumEntry">"Fixed displacement with elec. control"</span>, <span class="enumEntry">"Dual displacement"</span>, <span class="enumEntry">"Variable displacement mech. controlled"</span>, <span class="enumEntry">"Variable displacement elec. controlled"</span>, <span class="enumEntry">"Electric"</span>, <span class="enumEntry">"Fixed displacement"</span>, <span class="enumEntry">"Fixed displacement with elec. control"</span>, <span class="enumEntry">"Dual displacement"</span>, <span class="enumEntry">"Variable displacement mech. controlled"</span>, <span class="enumEntry">"Variable displacement elec. controlled"</span>, <span class="enumEntry">"Electric"</span>, <span class="enumEntry">"Fixed displacement"</span>, <span class="enumEntry">"Fixed displacement with elec. control"</span>, <span class="enumEntry">"Dual displacement"</span>, <span class="enumEntry">"Variable displacement mech. controlled"</span>, <span class="enumEntry">"Variable displacement elec. controlled"</span>, <span class="enumEntry">"Electric"</span></div>
 						<div class="engineering"></div>
 						<br>Multiple entires allowed, one per steered axle</td>
 				</tr>
@@ -1706,29 +3131,29 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#06#00#02#00#">
+					<td class="xmlpath" sorting="00#28#41#41#08#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">ElectricSystem</span>
-							<span class="element">Technology</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Auxiliaries Auxiliaries</span>
+							<span class="element">Auxiliaries Data Auxiliaries Data</span>
+							<span class="element">Data ElectricSystem Data ElectricSystem</span>
+							<span class="element">Technology Technology Technology Technology</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">ElectricSystem</span>
-							<span class="element">Technology</span>
+							<span class="element">Auxiliaries Data</span>
+							<span class="element">Data ElectricSystem</span>
+							<span class="element">Technology Technology</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AuxESTechnologyType</td>
+					<td class="xmltype">tns:AuxESTechnologyType tns:AuxESTechnologyType tns:AuxESTechnologyType tns:AuxESTechnologyType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Standard technology"</span>, <span class="enumEntry">"Standard technology - LED headlights, all"</span></div>
+					Allowed values: <span class="enumEntry">"Standard technology"</span>, <span class="enumEntry">"Standard technology - LED headlights, all"</span>, <span class="enumEntry">"Standard technology"</span>, <span class="enumEntry">"Standard technology - LED headlights, all"</span>, <span class="enumEntry">"Standard technology"</span>, <span class="enumEntry">"Standard technology - LED headlights, all"</span>, <span class="enumEntry">"Standard technology"</span>, <span class="enumEntry">"Standard technology - LED headlights, all"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -1743,29 +3168,29 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#06#00#03#00#">
+					<td class="xmlpath" sorting="00#28#41#41#12#14#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">PneumaticSystem</span>
-							<span class="element">Technology</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Auxiliaries Auxiliaries</span>
+							<span class="element">Auxiliaries Data Auxiliaries Data</span>
+							<span class="element">Data PneumaticSystem Data PneumaticSystem</span>
+							<span class="element">Technology Technology Technology Technology</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">PneumaticSystem</span>
-							<span class="element">Technology</span>
+							<span class="element">Auxiliaries Data</span>
+							<span class="element">Data PneumaticSystem</span>
+							<span class="element">Technology Technology</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AuxPSTechnologyType</td>
+					<td class="xmltype">tns:AuxPSTechnologyType tns:AuxPSTechnologyType tns:AuxPSTechnologyType tns:AuxPSTechnologyType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Small"</span>, <span class="enumEntry">"Small + ESS"</span>, <span class="enumEntry">"Small + visco clutch"</span>, <span class="enumEntry">"Small + mech. clutch"</span>, <span class="enumEntry">"Small + ESS + AMS"</span>, <span class="enumEntry">"Small + visco clutch + AMS"</span>, <span class="enumEntry">"Small + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Large Supply"</span>, <span class="enumEntry">"Large Supply + ESS"</span>, <span class="enumEntry">"Large Supply + visco clutch"</span>, <span class="enumEntry">"Large Supply + mech. clutch"</span>, <span class="enumEntry">"Large Supply + ESS + AMS"</span>, <span class="enumEntry">"Large Supply + visco clutch + AMS"</span>, <span class="enumEntry">"Large Supply + mech. clutch + AMS"</span>, <span class="enumEntry">"Vacuum pump"</span></div>
+					Allowed values: <span class="enumEntry">"Small"</span>, <span class="enumEntry">"Small + ESS"</span>, <span class="enumEntry">"Small + visco clutch"</span>, <span class="enumEntry">"Small + mech. clutch"</span>, <span class="enumEntry">"Small + ESS + AMS"</span>, <span class="enumEntry">"Small + visco clutch + AMS"</span>, <span class="enumEntry">"Small + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Large Supply"</span>, <span class="enumEntry">"Large Supply + ESS"</span>, <span class="enumEntry">"Large Supply + visco clutch"</span>, <span class="enumEntry">"Large Supply + mech. clutch"</span>, <span class="enumEntry">"Large Supply + ESS + AMS"</span>, <span class="enumEntry">"Large Supply + visco clutch + AMS"</span>, <span class="enumEntry">"Large Supply + mech. clutch + AMS"</span>, <span class="enumEntry">"Vacuum pump"</span>, <span class="enumEntry">"Small"</span>, <span class="enumEntry">"Small + ESS"</span>, <span class="enumEntry">"Small + visco clutch"</span>, <span class="enumEntry">"Small + mech. clutch"</span>, <span class="enumEntry">"Small + ESS + AMS"</span>, <span class="enumEntry">"Small + visco clutch + AMS"</span>, <span class="enumEntry">"Small + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Large Supply"</span>, <span class="enumEntry">"Large Supply + ESS"</span>, <span class="enumEntry">"Large Supply + visco clutch"</span>, <span class="enumEntry">"Large Supply + mech. clutch"</span>, <span class="enumEntry">"Large Supply + ESS + AMS"</span>, <span class="enumEntry">"Large Supply + visco clutch + AMS"</span>, <span class="enumEntry">"Large Supply + mech. clutch + AMS"</span>, <span class="enumEntry">"Vacuum pump"</span>, <span class="enumEntry">"Small"</span>, <span class="enumEntry">"Small + ESS"</span>, <span class="enumEntry">"Small + visco clutch"</span>, <span class="enumEntry">"Small + mech. clutch"</span>, <span class="enumEntry">"Small + ESS + AMS"</span>, <span class="enumEntry">"Small + visco clutch + AMS"</span>, <span class="enumEntry">"Small + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Large Supply"</span>, <span class="enumEntry">"Large Supply + ESS"</span>, <span class="enumEntry">"Large Supply + visco clutch"</span>, <span class="enumEntry">"Large Supply + mech. clutch"</span>, <span class="enumEntry">"Large Supply + ESS + AMS"</span>, <span class="enumEntry">"Large Supply + visco clutch + AMS"</span>, <span class="enumEntry">"Large Supply + mech. clutch + AMS"</span>, <span class="enumEntry">"Vacuum pump"</span>, <span class="enumEntry">"Small"</span>, <span class="enumEntry">"Small + ESS"</span>, <span class="enumEntry">"Small + visco clutch"</span>, <span class="enumEntry">"Small + mech. clutch"</span>, <span class="enumEntry">"Small + ESS + AMS"</span>, <span class="enumEntry">"Small + visco clutch + AMS"</span>, <span class="enumEntry">"Small + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 1-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 1-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch"</span>, <span class="enumEntry">"Medium Supply 2-stage + ESS + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + visco clutch + AMS"</span>, <span class="enumEntry">"Medium Supply 2-stage + mech. clutch + AMS"</span>, <span class="enumEntry">"Large Supply"</span>, <span class="enumEntry">"Large Supply + ESS"</span>, <span class="enumEntry">"Large Supply + visco clutch"</span>, <span class="enumEntry">"Large Supply + mech. clutch"</span>, <span class="enumEntry">"Large Supply + ESS + AMS"</span>, <span class="enumEntry">"Large Supply + visco clutch + AMS"</span>, <span class="enumEntry">"Large Supply + mech. clutch + AMS"</span>, <span class="enumEntry">"Vacuum pump"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -1780,33 +3205,84 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#06#00#04#00#">
+					<td class="xmlpath" sorting="00#28#41#41#16#18#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">HVAC</span>
-							<span class="element">Technology</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Auxiliaries Auxiliaries</span>
+							<span class="element">Auxiliaries Data Auxiliaries Data</span>
+							<span class="element">Data HVAC Data HVAC</span>
+							<span class="element">Technology Technology Technology Technology</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Auxiliaries</span>
-							<span class="element">Data</span>
-							<span class="element">HVAC</span>
-							<span class="element">Technology</span>
+							<span class="element">Auxiliaries Data</span>
+							<span class="element">Data HVAC</span>
+							<span class="element">Technology Technology</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AuxHVACTechnologyType</td>
+					<td class="xmltype">tns:AuxHVACTechnologyType tns:AuxHVACTechnologyType tns:AuxHVACTechnologyType tns:AuxHVACTechnologyType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"None"</span>, <span class="enumEntry">"Default"</span></div>
+					Allowed values: <span class="enumEntry">"None"</span>, <span class="enumEntry">"Default"</span>, <span class="enumEntry">"None"</span>, <span class="enumEntry">"Default"</span>, <span class="enumEntry">"None"</span>, <span class="enumEntry">"Default"</span>, <span class="enumEntry">"None"</span>, <span class="enumEntry">"Default"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
 				</tr>
+				<tr class="Engineering ">
+					<td class="parameterId">P187</td>
+					<td class="component">Torqueconverter</td>
+					<td class="name">MaxInputSpeed</td>
+					<td class="type">double</td>
+					<td class="unit">[1/min]</td>
+					<td class="range">
+				≥ 1000<span class="unit">1/min</span>
+				≤ 5000<span class="unit">1/min</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="">
+						<div class="engineering">
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">MaxInputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">MaxInputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">TorqueConverter</span>
+								<span class="element">Data</span>
+								<span class="element">MaxInputSpeed</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">MaxInputSpeed</span>
+							</div>
+						</div>
+					</td>
+					<td class="xmltype"></td>
+					<td class="comment">Limits the input speed in case a torque converter is present<span class="optionalEngineering">optional in Engineering mode</span></td>
+				</tr>
 				<tr class="Engineering ">
 					<td class="parameterId">P190</td>
 					<td class="component">Gearshiftstrategy</td>
@@ -1826,6 +3302,20 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">ShiftStrategyParameters</span>
 								<span class="element">CLUpshiftMinAcceleration</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">CLUpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">CLUpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">CLUpshiftMinAcceleration</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -1850,6 +3340,20 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">ShiftStrategyParameters</span>
 								<span class="element">CCUpshiftMinAcceleration</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">CCUpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">CCUpshiftMinAcceleration</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">CCUpshiftMinAcceleration</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -1866,28 +3370,28 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#03#">
+					<td class="xmlpath" sorting="00#28#31#31#14#16#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">MaxSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox Data Gearbox Data</span>
+							<span class="element">Data Gears Data Gears</span>
+							<span class="element">Gear Gear Gear Gear</span>
+							<span class="element">MaxSpeed MaxSpeed MaxSpeed MaxSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="element">MaxSpeed</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Data Gears</span>
+							<span class="element">Gear Gear</span>
+							<span class="element">MaxSpeed MaxSpeed</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:GearboxGearMaxSpeedType</td>
+					<td class="xmltype">tns:GearboxGearMaxSpeedType tns:GearboxGearMaxSpeedType tns:GearboxGearMaxSpeedType tns:GearboxGearMaxSpeedType</td>
 					<td class="comment">
 						<span class="optionalDeclaration">optional in Declaration mode</span>
 					</td>
@@ -1902,16 +3406,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#02#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Steered</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Steered Steered Steered Steered</span>
 						</div>
 						<div class="engineering">
 							<div>
@@ -1924,9 +3428,35 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Axle</span>
 								<span class="element">Steered</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Components</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">Steered</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axles</span>
+								<span class="element">Axle</span>
+								<span class="element">Steered</span>
+							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">AxleWheels</span>
+								<span class="element">Data</span>
+								<span class="element">Axle</span>
+								<span class="element">Steered</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:AxleSteeredType</td>
+					<td class="xmltype">tns:AxleSteeredType tns:AxleSteeredType tns:AxleSteeredType tns:AxleSteeredType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -1940,7 +3470,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#16#00#00#">
+					<td class="xmlpath" sorting="00#27#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
@@ -1964,7 +3494,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#16#00#01#">
+					<td class="xmlpath" sorting="00#27#00#01#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
@@ -1988,28 +3518,28 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#07#00#01#">
+					<td class="xmlpath" sorting="00#28#31#31#14#16#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="attribute">number</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components Gearbox Gearbox</span>
+							<span class="element">Gearbox Data Gearbox Data</span>
+							<span class="element">Data Gears Data Gears</span>
+							<span class="element">Gear Gear Gear Gear</span>
+							<span class="attribute">number number number number</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Gears</span>
-							<span class="element">Gear</span>
-							<span class="attribute">number</span>
+							<span class="element">Gearbox Data</span>
+							<span class="element">Data Gears</span>
+							<span class="element">Gear Gear</span>
+							<span class="attribute">number number</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:GearboxGearNumberType</td>
+					<td class="xmltype">tns:GearboxGearNumberType tns:GearboxGearNumberType tns:GearboxGearNumberType tns:GearboxGearNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2022,15 +3552,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#00#">
+					<td class="xmlpath" sorting="00#28#31#04#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2041,7 +3571,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2054,15 +3584,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#01#">
+					<td class="xmlpath" sorting="00#28#31#04#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2073,7 +3603,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2086,15 +3616,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#03#">
+					<td class="xmlpath" sorting="00#28#31#04#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2105,7 +3635,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2118,15 +3648,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#04#">
+					<td class="xmlpath" sorting="00#28#31#04#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2137,7 +3667,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2150,14 +3680,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#00#">
+					<td class="xmlpath" sorting="00#28#33#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2167,7 +3697,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2180,14 +3710,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#01#">
+					<td class="xmlpath" sorting="00#28#33#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2197,7 +3727,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2210,14 +3740,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#03#">
+					<td class="xmlpath" sorting="00#28#33#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2227,7 +3757,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2240,14 +3770,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#04#">
+					<td class="xmlpath" sorting="00#28#33#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2257,7 +3787,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2270,18 +3800,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#00#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">Manufacturer Manufacturer Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2291,7 +3821,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2304,18 +3834,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#01#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">Model Model Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2325,7 +3855,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2338,18 +3868,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#03#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">Date Date Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2359,7 +3889,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2372,18 +3902,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#04#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#16#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">AppVersion AppVersion AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2393,7 +3923,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2406,14 +3936,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#00#">
+					<td class="xmlpath" sorting="00#28#43#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2423,7 +3953,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2436,14 +3966,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#01#">
+					<td class="xmlpath" sorting="00#28#43#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2453,7 +3983,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2466,14 +3996,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#03#">
+					<td class="xmlpath" sorting="00#28#43#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2483,7 +4013,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2496,14 +4026,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#04#">
+					<td class="xmlpath" sorting="00#28#43#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2513,7 +4043,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2527,14 +4057,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#05#">
+					<td class="xmlpath" sorting="00#28#43#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">CdxA_0</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">CdxA_0 CdxA_0</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2544,7 +4074,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AirdragCdxAType</td>
+					<td class="xmltype">tns:AirdragCdxAType tns:AirdragCdxAType</td>
 					<td class="comment">In Declaration Mode a fixed amound is added for cycles simulated with trailer</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2558,14 +4088,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#06#">
+					<td class="xmlpath" sorting="00#28#43#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">TransferredCdxA</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">TransferredCdxA TransferredCdxA</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2575,7 +4105,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AirdragCdxAType</td>
+					<td class="xmltype">tns:AirdragCdxAType tns:AirdragCdxAType</td>
 					<td class="comment">In Declaration Mode a fixed amound is added for cycles simulated with trailer</td>
 				</tr>
 				<tr class="Declaration ">
@@ -2588,15 +4118,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#05#">
+					<td class="xmlpath" sorting="00#28#31#04#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationMethod</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationMethod CertificationMethod</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2607,10 +4137,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:TorqueConverterCertificationOptionType</td>
+					<td class="xmltype">tns:TorqueConverterCertificationOptionType tns:TorqueConverterCertificationOptionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
+					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span>, <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -2625,14 +4155,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#06#">
+					<td class="xmlpath" sorting="00#28#33#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationMethod</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationMethod CertificationMethod</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2642,10 +4172,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AngledriveCertificationOptionType</td>
+					<td class="xmltype">tns:AngledriveCertificationOptionType tns:AngledriveCertificationOptionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span></div>
+					Allowed values: <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span>, <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -2660,15 +4190,15 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#02#00#02#">
+					<td class="xmlpath" sorting="00#28#31#04#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">TorqueConverter</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">TorqueConverter TorqueConverter</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2679,7 +4209,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2692,14 +4222,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#02#00#02#">
+					<td class="xmlpath" sorting="00#28#33#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Angledrive</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Angledrive Angledrive</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -2709,7 +4239,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -2722,59 +4252,152 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#05#00#00#00#03#00#02#">
+					<td class="xmlpath" sorting="00#28#39#39#00#02#12#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AxleWheels</span>
-							<span class="element">Data</span>
-							<span class="element">Axles</span>
-							<span class="element">Axle</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Vehicle Components AxleWheels AxleWheels</span>
+							<span class="element">AxleWheels Data AxleWheels Data</span>
+							<span class="element">Data Axles Data Axles</span>
+							<span class="element">Axle Axle Axle Axle</span>
+							<span class="element">Tyre Tyre Tyre Tyre</span>
+							<span class="element">Data Data Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber CertificationNumber CertificationNumber</span>
+						</div>
+						<div class="declaration component">
+							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Tyre</span>
 							<span class="element">Data</span>
 							<span class="element">CertificationNumber</span>
 						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType tns:CertificationNumberType tns:CertificationNumberType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P268</td>
+					<td class="component">Airdrag</td>
+					<td class="name">CertificationNumber</td>
+					<td class="type">token</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#28#43#00#04#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">AirDrag AirDrag</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
+						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
-							<span class="element">Tyre</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">AirDrag</span>
+							<span class="element">Data</span>
+							<span class="element">CertificationNumber</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P271</td>
+					<td class="component">Vehicle/ADAS</td>
+					<td class="name">EngineStopStart</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#22#23#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle ADAS</span>
+							<span class="element">EngineStopStart EngineStopStart</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:EngineStopStartType tns:EngineStopStartType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P272</td>
+					<td class="component">Vehicle/ADAS</td>
+					<td class="name">EcoRollWithoutEngineStop</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#22#25#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle ADAS</span>
+							<span class="element">EcoRollWithoutEngineStop EcoRollWithoutEngineStop</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:EcoRollWithoutEngineStopType tns:EcoRollWithoutEngineStopType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P273</td>
+					<td class="component">Vehicle/ADAS</td>
+					<td class="name">EcoRollWithEngineStop</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#22#27#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">Vehicle ADAS</span>
+							<span class="element">EcoRollWithEngineStop EcoRollWithEngineStop</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:EcoRollWithEngineStopType tns:EcoRollWithEngineStopType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
-					<td class="parameterId">P268</td>
-					<td class="component">Airdrag</td>
-					<td class="name">CertificationNumber</td>
-					<td class="type">token</td>
+					<td class="parameterId">P274</td>
+					<td class="component">Vehicle/ADAS</td>
+					<td class="name">PredictiveCruiseControl</td>
+					<td class="type">string</td>
 					<td class="unit">[-]</td>
 					<td class="range"></td>
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#07#00#02#">
+					<td class="xmlpath" sorting="00#22#29#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
-						</div>
-						<div class="declaration component">
-							<span class="element">VectoInputDeclaration</span>
-							<span class="element">AirDrag</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle ADAS</span>
+							<span class="element">PredictiveCruiseControl PredictiveCruiseControl</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
-					<td class="comment"></td>
+					<td class="xmltype">tns:PredictiveCruiseControlType tns:PredictiveCruiseControlType</td>
+					<td class="comment">
+						<div class="declaration">
+					Allowed values: <span class="enumEntry">"none"</span>, <span class="enumEntry">"1,2"</span>, <span class="enumEntry">"1,2,3"</span>, <span class="enumEntry">"none"</span>, <span class="enumEntry">"1,2"</span>, <span class="enumEntry">"1,2,3"</span></div>
+						<div class="engineering"></div>
+						<br>
+					</td>
 				</tr>
 				<tr class="Engineering ">
 					<td class="parameterId">P003</td>
@@ -2794,13 +4417,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Components</span>
 								<span class="element">Resource</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Resource</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
 					<td class="comment">
 						<div class="declaration"></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span></div>
+					Allowed values: <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span>, <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span></div>
 						<br>Only for file-based input data</td>
 				</tr>
 				<tr class="Engineering ">
@@ -2821,13 +4449,18 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Components</span>
 								<span class="element">Resource</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Resource</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
 					<td class="comment">
 						<div class="declaration"></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span></div>
+					Allowed values: <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span>, <span class="enumEntry">"Engine"</span>, <span class="enumEntry">"Gearbox"</span>, <span class="enumEntry">"Retarder"</span>, <span class="enumEntry">"Axlegear"</span>, <span class="enumEntry">"AxleWheels"</span>, <span class="enumEntry">"Auxiliaries"</span>, <span class="enumEntry">"Vehicle"</span>, <span class="enumEntry">"TorqueConverter"</span>, <span class="enumEntry">"Airdrag"</span>, <span class="enumEntry">"xml"</span>, <span class="enumEntry">"json"</span></div>
 						<br>Only for file-based input data</td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -2857,9 +4490,9 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="xmltype">tns:VehicleCategoryDeclarationType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Rigid Truck"</span>, <span class="enumEntry">"Tractor"</span></div>
+					Allowed values: <span class="enumEntry">"Rigid Truck"</span>, <span class="enumEntry">"Tractor"</span>, <span class="enumEntry">"Rigid Lorry"</span></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"Rigid Truck"</span>, <span class="enumEntry">"Tractor"</span>, <span class="enumEntry">"City Bus"</span>, <span class="enumEntry">"Interurban Bus"</span>, <span class="enumEntry">"Coach"</span></div>
+					Allowed values: <span class="enumEntry">"Rigid Truck"</span>, <span class="enumEntry">"Tractor"</span>, <span class="enumEntry">"City Bus"</span>, <span class="enumEntry">"Interurban Bus"</span>, <span class="enumEntry">"Coach"</span>, <span class="enumEntry">"Rigid Lorry"</span></div>
 						<br>
 						<span class="optionalEngineering">optional in Engineering mode</span>
 					</td>
@@ -2895,6 +4528,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						<div class="engineering">
 					Allowed values: <span class="enumEntry">"4x2"</span>, <span class="enumEntry">"4x4"</span>, <span class="enumEntry">"6x2"</span>, <span class="enumEntry">"6x4"</span>, <span class="enumEntry">"6x6"</span>, <span class="enumEntry">"8x2"</span>, <span class="enumEntry">"8x4"</span>, <span class="enumEntry">"8x6"</span>, <span class="enumEntry">"8x8"</span></div>
 						<br>
+						<span class="optionalDeclaration">optional in Declaration mode</span>
 					</td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -3182,19 +4816,19 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#15#00#">
+					<td class="xmlpath" sorting="00#15#16#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">PTO</span>
-							<span class="element">PTOShaftsGearWheels</span>
+							<span class="element">Vehicle PTO</span>
+							<span class="element">PTOShaftsGearWheels PTOShaftsGearWheels</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:PTOShaftsGearWheelsType</td>
+					<td class="xmltype">tns:PTOShaftsGearWheelsType tns:PTOShaftsGearWheelsType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"none"</span>, <span class="enumEntry">"only the drive shaft of the PTO"</span>, <span class="enumEntry">"drive shaft and/or up to 2 gear wheels"</span>, <span class="enumEntry">"drive shaft and/or more than 2 gear wheels"</span>, <span class="enumEntry">"only one engaged gearwheel above oil level"</span></div>
+					Allowed values: <span class="enumEntry">"none"</span>, <span class="enumEntry">"only the drive shaft of the PTO"</span>, <span class="enumEntry">"drive shaft and/or up to 2 gear wheels"</span>, <span class="enumEntry">"drive shaft and/or more than 2 gear wheels"</span>, <span class="enumEntry">"only one engaged gearwheel above oil level"</span>, <span class="enumEntry">"none"</span>, <span class="enumEntry">"only the drive shaft of the PTO"</span>, <span class="enumEntry">"drive shaft and/or up to 2 gear wheels"</span>, <span class="enumEntry">"drive shaft and/or more than 2 gear wheels"</span>, <span class="enumEntry">"only one engaged gearwheel above oil level"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -3209,19 +4843,19 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#15#01#">
+					<td class="xmlpath" sorting="00#15#18#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">PTO</span>
-							<span class="element">PTOOtherElements</span>
+							<span class="element">Vehicle PTO</span>
+							<span class="element">PTOOtherElements PTOOtherElements</span>
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:PTOOtherElementsType</td>
+					<td class="xmltype">tns:PTOOtherElementsType tns:PTOOtherElementsType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"none"</span>, <span class="enumEntry">"shift claw, synchronizer, sliding gearwheel"</span>, <span class="enumEntry">"multi-disc clutch"</span>, <span class="enumEntry">"multi-disc clutch, oil pump"</span></div>
+					Allowed values: <span class="enumEntry">"none"</span>, <span class="enumEntry">"shift claw, synchronizer, sliding gearwheel"</span>, <span class="enumEntry">"multi-disc clutch"</span>, <span class="enumEntry">"multi-disc clutch, oil pump"</span>, <span class="enumEntry">"none"</span>, <span class="enumEntry">"shift claw, synchronizer, sliding gearwheel"</span>, <span class="enumEntry">"multi-disc clutch"</span>, <span class="enumEntry">"multi-disc clutch, oil pump"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -3273,6 +4907,186 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="xmltype">tns:ManufacturerAddressType</td>
 					<td class="comment"></td>
 				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P269</td>
+					<td class="component">Vehicle</td>
+					<td class="name">ZeroEmissionVehicle</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#37#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">ZeroEmissionVehicle ZeroEmissionVehicle</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:ZeroEmissionVehicleType tns:ZeroEmissionVehicleType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P270</td>
+					<td class="component">Vehicle</td>
+					<td class="name">VocationalVehicle</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#19#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">VocationalVehicle</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:VocationalVehicleType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P275</td>
+					<td class="component">Vehicle</td>
+					<td class="name">NgTankSystem</td>
+					<td class="type">string</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#20#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">NgTankSystem</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:NgTankSystemType</td>
+					<td class="comment">
+						<div class="declaration">
+					Allowed values: <span class="enumEntry">"Compressed"</span>, <span class="enumEntry">"Liquefied"</span></div>
+						<div class="engineering"></div>
+						<br>
+						<span class="optionalDeclaration">optional in Declaration mode</span>
+					</td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P276</td>
+					<td class="component">Vehicle</td>
+					<td class="name">SleeperCab</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#21#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">SleeperCab</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:SleeperCabType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P277</td>
+					<td class="component">Vehicle</td>
+					<td class="name">MaxNetPower1</td>
+					<td class="type">int</td>
+					<td class="unit">[W]</td>
+					<td class="range">
+				≥ 0<span class="unit">W</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#38#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">MaxNetPower1</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:PowerType</td>
+					<td class="comment">
+						<span class="optionalDeclaration">optional in Declaration mode</span>
+					</td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P278</td>
+					<td class="component">Vehicle</td>
+					<td class="name">MaxNetPower2</td>
+					<td class="type">int</td>
+					<td class="unit">[W]</td>
+					<td class="range">
+				≥ 0<span class="unit">W</span></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#39#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">MaxNetPower2</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:PowerType</td>
+					<td class="comment">
+						<span class="optionalDeclaration">optional in Declaration mode</span>
+					</td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P279</td>
+					<td class="component">Vehicle</td>
+					<td class="name">HybridElectricHDV</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#40#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">HybridElectricHDV</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:HybridElectricHDVType</td>
+					<td class="comment"></td>
+				</tr>
+				<tr class="Declaration ">
+					<td class="parameterId">P280</td>
+					<td class="component">Vehicle</td>
+					<td class="name">DualFuelVehicle</td>
+					<td class="type">boolean</td>
+					<td class="unit">[-]</td>
+					<td class="range"></td>
+					<td class="genericValues">
+						<span></span>
+					</td>
+					<td class="xmlpath" sorting="00#41#">
+						<div class="declaration">
+							<span class="element">VectoInputDeclaration</span>
+							<span class="element">Vehicle</span>
+							<span class="element">DualFuelVehicle</span>
+						</div>
+						<div class="engineering"></div>
+					</td>
+					<td class="xmltype">tns:DualFuelType</td>
+					<td class="comment"></td>
+				</tr>
 				<tr class="Declaration ">
 					<td class="parameterId">P061</td>
 					<td class="component">Engine</td>
@@ -3284,14 +5098,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#05#">
+					<td class="xmlpath" sorting="00#28#29#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">Displacement</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">Displacement Displacement</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3301,7 +5115,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineDisplacementType</td>
+					<td class="xmltype">tns:EngineDisplacementType tns:EngineDisplacementType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3315,14 +5129,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#06#">
+					<td class="xmlpath" sorting="00#28#29#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">IdlingSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">IdlingSpeed IdlingSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3332,7 +5146,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineDeclaredSpeedType</td>
+					<td class="xmltype">tns:EngineDeclaredSpeedType tns:EngineDeclaredSpeedType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3346,14 +5160,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#10#">
+					<td class="xmlpath" sorting="00#28#29#00#20#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">WHTCUrban</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">WHTCUrban WHTCUrban</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3363,7 +5177,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineWHTCType</td>
+					<td class="xmltype">tns:EngineWHTCType tns:EngineWHTCType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3377,14 +5191,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#11#">
+					<td class="xmlpath" sorting="00#28#29#00#22#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">WHTCRural</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">WHTCRural WHTCRural</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3394,7 +5208,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineWHTCType</td>
+					<td class="xmltype">tns:EngineWHTCType tns:EngineWHTCType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3408,14 +5222,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#12#">
+					<td class="xmlpath" sorting="00#28#29#00#24#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">WHTCMotorway</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">WHTCMotorway WHTCMotorway</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3425,7 +5239,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineWHTCType</td>
+					<td class="xmltype">tns:EngineWHTCType tns:EngineWHTCType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3439,14 +5253,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#13#">
+					<td class="xmlpath" sorting="00#28#29#00#26#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">BFColdHot</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">BFColdHot BFColdHot</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3456,7 +5270,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineColdHotBalancingFactorType</td>
+					<td class="xmltype">tns:EngineColdHotBalancingFactorType tns:EngineColdHotBalancingFactorType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Engineering ">
@@ -3480,6 +5294,13 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Data</span>
 								<span class="element">WHTCEngineering</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Engine</span>
+								<span class="element">Data</span>
+								<span class="element">WHTCEngineering</span>
+							</div>
 							<div>
 								<span class="element">VectoComponentEngineering</span>
 								<span class="element">Engine</span>
@@ -3502,14 +5323,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#14#">
+					<td class="xmlpath" sorting="00#28#29#00#28#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">CFRegPer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">CFRegPer CFRegPer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3519,7 +5340,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineCFRegPerType</td>
+					<td class="xmltype">tns:EngineCFRegPerType tns:EngineCFRegPerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3532,14 +5353,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#16#">
+					<td class="xmlpath" sorting="00#28#29#00#32#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">FuelType</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">FuelType FuelType</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3549,10 +5370,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:FuelTypeType</td>
+					<td class="xmltype">tns:FuelTypeType tns:FuelTypeType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Diesel CI"</span>, <span class="enumEntry">"Ethanol CI"</span>, <span class="enumEntry">"Petrol PI"</span>, <span class="enumEntry">"Ethanol PI"</span>, <span class="enumEntry">"LPG"</span>, <span class="enumEntry">"NG"</span></div>
+					Allowed values: <span class="enumEntry">"Diesel CI"</span>, <span class="enumEntry">"Ethanol CI"</span>, <span class="enumEntry">"Petrol PI"</span>, <span class="enumEntry">"Ethanol PI"</span>, <span class="enumEntry">"LPG"</span>, <span class="enumEntry">"NG"</span>, <span class="enumEntry">"LPG PI"</span>, <span class="enumEntry">"NG PI"</span>, <span class="enumEntry">"NG CI"</span>, <span class="enumEntry">"Diesel CI"</span>, <span class="enumEntry">"Ethanol CI"</span>, <span class="enumEntry">"Petrol PI"</span>, <span class="enumEntry">"Ethanol PI"</span>, <span class="enumEntry">"LPG"</span>, <span class="enumEntry">"NG"</span>, <span class="enumEntry">"LPG PI"</span>, <span class="enumEntry">"NG PI"</span>, <span class="enumEntry">"NG CI"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -3567,14 +5388,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#00#">
+					<td class="xmlpath" sorting="00#28#29#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3584,7 +5405,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3597,14 +5418,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#01#">
+					<td class="xmlpath" sorting="00#28#29#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3614,7 +5435,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3627,14 +5448,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#03#">
+					<td class="xmlpath" sorting="00#28#29#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3644,7 +5465,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -3657,14 +5478,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#04#">
+					<td class="xmlpath" sorting="00#28#29#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3674,7 +5495,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3688,14 +5509,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#07#">
+					<td class="xmlpath" sorting="00#28#29#00#14#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">RatedSpeed</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">RatedSpeed RatedSpeed</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3705,7 +5526,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineDeclaredSpeedType</td>
+					<td class="xmltype">tns:EngineDeclaredSpeedType tns:EngineDeclaredSpeedType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3719,14 +5540,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#08#">
+					<td class="xmlpath" sorting="00#28#29#00#16#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">RatedPower</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">RatedPower RatedPower</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3736,7 +5557,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineRatedPower</td>
+					<td class="xmltype">tns:EngineRatedPower tns:EngineRatedPower</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3749,14 +5570,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#09#">
+					<td class="xmlpath" sorting="00#28#29#00#18#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">MaxEngineTorque</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">MaxEngineTorque MaxEngineTorque</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3766,7 +5587,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineMaxTorque</td>
+					<td class="xmltype">tns:EngineMaxTorque tns:EngineMaxTorque</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3779,14 +5600,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#15#">
+					<td class="xmlpath" sorting="00#28#29#00#30#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">CFNCV</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">CFNCV CFNCV</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3796,7 +5617,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:EngineNCVCFType</td>
+					<td class="xmltype">tns:EngineNCVCFType tns:EngineNCVCFType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3809,14 +5630,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#00#00#02#">
+					<td class="xmlpath" sorting="00#28#29#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Engine</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Engine Engine</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3826,7 +5647,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -3839,14 +5660,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#05#">
+					<td class="xmlpath" sorting="00#28#31#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">TransmissionType</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">TransmissionType TransmissionType</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3863,14 +5684,21 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Data</span>
 								<span class="element">TransmissionType</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Gearbox</span>
+								<span class="element">Data</span>
+								<span class="element">TransmissionType</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:GearboxTransmissionTypeType</td>
+					<td class="xmltype">tns:GearboxTransmissionTypeType tns:GearboxTransmissionTypeType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span></div>
+					Allowed values: <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span>, <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span></div>
 						<div class="engineering">
-					Allowed values: <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span></div>
+					Allowed values: <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span>, <span class="enumEntry">"SMT"</span>, <span class="enumEntry">"AMT"</span>, <span class="enumEntry">"APT-S"</span>, <span class="enumEntry">"APT-P"</span></div>
 						<br>
 					</td>
 				</tr>
@@ -3894,6 +5722,20 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">ShiftStrategyParameters</span>
 								<span class="element">PowershiftShiftTime</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">PowershiftShiftTime</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">PowershiftShiftTime</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">PowershiftShiftTime</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -3919,6 +5761,20 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">ShiftStrategyParameters</span>
 								<span class="element">PowershiftInertiaFactor</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">PowershiftInertiaFactor</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">ShiftStrategyParameters</span>
+								<span class="element">PowershiftInertiaFactor</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">PowershiftInertiaFactor</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -3934,14 +5790,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#00#">
+					<td class="xmlpath" sorting="00#28#31#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3951,7 +5807,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3964,14 +5820,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#01#">
+					<td class="xmlpath" sorting="00#28#31#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -3981,7 +5837,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -3994,14 +5850,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#03#">
+					<td class="xmlpath" sorting="00#28#31#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4011,7 +5867,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -4024,14 +5880,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#04#">
+					<td class="xmlpath" sorting="00#28#31#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4041,7 +5897,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4054,14 +5910,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#06#">
+					<td class="xmlpath" sorting="00#28#31#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">MainCertificationMethod</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">MainCertificationMethod MainCertificationMethod</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4071,10 +5927,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:GearboxCertificationOptionType</td>
+					<td class="xmltype">tns:GearboxCertificationOptionType tns:GearboxCertificationOptionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span></div>
+					Allowed values: <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span>, <span class="enumEntry">"Option 1"</span>, <span class="enumEntry">"Option 2"</span>, <span class="enumEntry">"Option 3"</span>, <span class="enumEntry">"Standard values"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -4089,14 +5945,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#01#00#02#">
+					<td class="xmlpath" sorting="00#28#31#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Gearbox</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Gearbox Gearbox</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4106,7 +5962,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4119,14 +5975,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#00#">
+					<td class="xmlpath" sorting="00#28#35#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4136,7 +5992,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4149,14 +6005,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#01#">
+					<td class="xmlpath" sorting="00#28#35#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4166,7 +6022,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4179,14 +6035,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#03#">
+					<td class="xmlpath" sorting="00#28#35#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4196,7 +6052,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -4209,14 +6065,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#04#">
+					<td class="xmlpath" sorting="00#28#35#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4226,7 +6082,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4239,14 +6095,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#05#">
+					<td class="xmlpath" sorting="00#28#35#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationMethod</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationMethod CertificationMethod</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4256,10 +6112,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:RetarderCertificationOptionType</td>
+					<td class="xmltype">tns:RetarderCertificationOptionType tns:RetarderCertificationOptionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
+					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span>, <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -4274,14 +6130,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#03#00#02#">
+					<td class="xmlpath" sorting="00#28#35#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Retarder</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Retarder Retarder</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4291,7 +6147,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration Engineering ">
@@ -4305,14 +6161,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#06#">
+					<td class="xmlpath" sorting="00#28#37#00#12#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">Ratio</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">Ratio Ratio</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4329,9 +6185,16 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Data</span>
 								<span class="element">Ratio</span>
 							</div>
+							<div>
+								<span class="element">VectoInputEngineering</span>
+								<span class="element">Vehicle</span>
+								<span class="element">Axlegear</span>
+								<span class="element">Data</span>
+								<span class="element">Ratio</span>
+							</div>
 						</div>
 					</td>
-					<td class="xmltype">tns:AxlegearRatioType</td>
+					<td class="xmltype">tns:AxlegearRatioType tns:AxlegearRatioType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4344,14 +6207,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#00#">
+					<td class="xmlpath" sorting="00#28#37#00#00#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">Manufacturer</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">Manufacturer Manufacturer</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4361,7 +6224,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ManufacturerType</td>
+					<td class="xmltype">tns:ManufacturerType tns:ManufacturerType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4374,14 +6237,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#01#">
+					<td class="xmlpath" sorting="00#28#37#00#02#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">Model</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">Model Model</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4391,7 +6254,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:ModelType</td>
+					<td class="xmltype">tns:ModelType tns:ModelType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4404,14 +6267,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#03#">
+					<td class="xmlpath" sorting="00#28#37#00#06#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">Date</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">Date Date</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4421,7 +6284,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:DateTimeWithTimezone</td>
+					<td class="xmltype">tns:DateTimeWithTimezone tns:DateTimeWithTimezone</td>
 					<td class="comment">Date and time when the component-hash is created</td>
 				</tr>
 				<tr class="Declaration ">
@@ -4434,14 +6297,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#04#">
+					<td class="xmlpath" sorting="00#28#37#00#08#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">AppVersion</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">AppVersion AppVersion</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4451,7 +6314,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AppVersionType</td>
+					<td class="xmltype">tns:AppVersionType tns:AppVersionType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Declaration ">
@@ -4464,14 +6327,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#05#">
+					<td class="xmlpath" sorting="00#28#37#00#10#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">LineType</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">LineType LineType</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4481,10 +6344,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AxlegearLineTypeType</td>
+					<td class="xmltype">tns:AxlegearLineTypeType tns:AxlegearLineTypeType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Single reduction axle"</span>, <span class="enumEntry">"Single portal axle"</span>, <span class="enumEntry">"Hub reduction axle"</span>, <span class="enumEntry">"Single reduction tandem axle"</span>, <span class="enumEntry">"Hub reduction tandem axle"</span></div>
+					Allowed values: <span class="enumEntry">"Single reduction axle"</span>, <span class="enumEntry">"Single portal axle"</span>, <span class="enumEntry">"Hub reduction axle"</span>, <span class="enumEntry">"Single reduction tandem axle"</span>, <span class="enumEntry">"Hub reduction tandem axle"</span>, <span class="enumEntry">"Single reduction axle"</span>, <span class="enumEntry">"Single portal axle"</span>, <span class="enumEntry">"Hub reduction axle"</span>, <span class="enumEntry">"Single reduction tandem axle"</span>, <span class="enumEntry">"Hub reduction tandem axle"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -4499,14 +6362,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#07#">
+					<td class="xmlpath" sorting="00#28#37#00#14#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationMethod</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationMethod CertificationMethod</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4516,10 +6379,10 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:AxlegearCertificationOptionType</td>
+					<td class="xmltype">tns:AxlegearCertificationOptionType tns:AxlegearCertificationOptionType</td>
 					<td class="comment">
 						<div class="declaration">
-					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
+					Allowed values: <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span>, <span class="enumEntry">"Measured"</span>, <span class="enumEntry">"Standard values"</span></div>
 						<div class="engineering"></div>
 						<br>
 					</td>
@@ -4534,14 +6397,14 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 					<td class="genericValues">
 						<span></span>
 					</td>
-					<td class="xmlpath" sorting="00#17#04#00#02#">
+					<td class="xmlpath" sorting="00#28#37#00#04#">
 						<div class="declaration">
 							<span class="element">VectoInputDeclaration</span>
 							<span class="element">Vehicle</span>
-							<span class="element">Components</span>
-							<span class="element">Axlegear</span>
-							<span class="element">Data</span>
-							<span class="element">CertificationNumber</span>
+							<span class="element">Vehicle Components</span>
+							<span class="element">Axlegear Axlegear</span>
+							<span class="element">Data Data</span>
+							<span class="element">CertificationNumber CertificationNumber</span>
 						</div>
 						<div class="declaration component">
 							<span class="element">VectoInputDeclaration</span>
@@ -4551,7 +6414,7 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 						</div>
 						<div class="engineering"></div>
 					</td>
-					<td class="xmltype">tns:CertificationNumberType</td>
+					<td class="xmltype">tns:CertificationNumberType tns:CertificationNumberType</td>
 					<td class="comment"></td>
 				</tr>
 				<tr class="Engineering ">
@@ -4572,6 +6435,11 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">LookAheadCoasting</span>
 								<span class="element">PreviewDistanceFactor</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">PreviewDistanceFactor</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4597,6 +6465,11 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">LookAheadCoasting</span>
 								<span class="element">DecisionFactorOffset</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">DecisionFactorOffset</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4622,6 +6495,11 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">LookAheadCoasting</span>
 								<span class="element">DecisionFactorScaling</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">DecisionFactorScaling</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4651,6 +6529,26 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">targetVelocity</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">targetVelocity</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">SpeedDependentDecisionFactor</span>
+								<span class="element">Entry</span>
+								<span class="attribute">targetVelocity</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">targetVelocity</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4676,6 +6574,26 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">decisionFactorVel</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorVel</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">SpeedDependentDecisionFactor</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorVel</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorVel</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4703,6 +6621,26 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">velocityDrop</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">velocityDrop</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">VelocityDropDecisionFactor</span>
+								<span class="element">Entry</span>
+								<span class="attribute">velocityDrop</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">velocityDrop</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
@@ -4728,6 +6666,26 @@ div.filter span.hidden span.icon {max-width: 256px;max-height: 256px;background-
 								<span class="element">Entry</span>
 								<span class="attribute">decisionFactorDrop</span>
 							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">DriverModel</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorDrop</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">VelocityDropDecisionFactor</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorDrop</span>
+							</div>
+							<div>
+								<span class="element">VectoComponentEngineering</span>
+								<span class="element">LookAheadCoasting</span>
+								<span class="element">Entry</span>
+								<span class="attribute">decisionFactorDrop</span>
+							</div>
 						</div>
 					</td>
 					<td class="xmltype"></td>
diff --git a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
index 243d9e7d2c2248ea7856bcfbe793c156f0bf1aec..b0ec9347972f13f506276671f3bb54dcdbc1a48d 100644
--- a/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/ParameterDocumentation.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
 <xs:schema xmlns:tns="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="description">
 		<xs:complexType>
@@ -38,6 +38,7 @@
 											<xs:enumeration value="Vehicle/Axle"/>
 											<xs:enumeration value="Vehicle/TorqueLimits"/>
 											<xs:enumeration value="Gearshiftstrategy"/>
+											<xs:enumeration value="Vehicle/ADAS"/>
 										</xs:restriction>
 									</xs:simpleType>
 								</xs:attribute>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
index 4c43efd165312e870b4e11b2f38dba8c9258e5e2..09eb143304f6a27edf79d5f3b3051740e0928ca0 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd
@@ -962,12 +962,12 @@
 								</xs:complexType>
 							</xs:element>
 							<xs:sequence minOccurs="0">
-								<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+								<xs:element name="ZeroEmissionVehicle" type="tns:ZeroEmissionVehicleType">
 									<xs:annotation>
 										<xs:documentation>P269 - bool</xs:documentation>
 									</xs:annotation>
 								</xs:element>
-								<xs:element name="VocationalVehicle" type="xs:boolean">
+								<xs:element name="VocationalVehicle" type="tns:VocationalVehicleType">
 									<xs:annotation>
 										<xs:documentation>P270 - bool</xs:documentation>
 									</xs:annotation>
@@ -977,7 +977,7 @@
 										<xs:documentation>P275 - enum</xs:documentation>
 									</xs:annotation>
 								</xs:element>
-								<xs:element name="SleeperCab" type="xs:boolean">
+								<xs:element name="SleeperCab" type="tns:SleeperCabType">
 									<xs:annotation>
 										<xs:documentation>P276 - bool</xs:documentation>
 									</xs:annotation>
@@ -985,17 +985,17 @@
 								<xs:element name="ADAS">
 									<xs:complexType>
 										<xs:sequence>
-											<xs:element name="EngineStopStart" type="xs:boolean">
+											<xs:element name="EngineStopStart" type="tns:EngineStopStartType">
 												<xs:annotation>
 													<xs:documentation>P271 - bool</xs:documentation>
 												</xs:annotation>
 											</xs:element>
-											<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
+											<xs:element name="EcoRollWithoutEngineStop" type="tns:EcoRollWithoutEngineStopType">
 												<xs:annotation>
 													<xs:documentation>P272 - bool</xs:documentation>
 												</xs:annotation>
 											</xs:element>
-											<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
+											<xs:element name="EcoRollWithEngineStop" type="tns:EcoRollWithEngineStopType">
 												<xs:annotation>
 													<xs:documentation>P273 - bool</xs:documentation>
 												</xs:annotation>
@@ -1031,7 +1031,7 @@
 							</xs:sequence>
 						</xs:sequence>
 						<xs:sequence>
-							<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
+							<xs:element name="ZeroEmissionVehicle" type="tns:ZeroEmissionVehicleType">
 								<xs:annotation>
 									<xs:documentation>P269 - bool</xs:documentation>
 								</xs:annotation>
@@ -1046,12 +1046,12 @@
 									<xs:documentation>P278 - [W]</xs:documentation>
 								</xs:annotation>
 							</xs:element>
-							<xs:element name="HybridElectricHDV" type="xs:boolean">
+							<xs:element name="HybridElectricHDV" type="tns:HybridElectricHDVType">
 								<xs:annotation>
 									<xs:documentation>P279 - bool</xs:documentation>
 								</xs:annotation>
 							</xs:element>
-							<xs:element name="DualFuelVehicle" type="xs:boolean">
+							<xs:element name="DualFuelVehicle" type="tns:DualFuelType">
 								<xs:annotation>
 									<xs:documentation>P280 - bool</xs:documentation>
 								</xs:annotation>
@@ -2547,12 +2547,28 @@ ToDo: -0.00
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="NgTankSystemType">
+	<xs:annotation>
+<xs:appinfo>
+<vectoParam:description>
+	<vectoParam:parameterId component="Vehicle">275</vectoParam:parameterId>
+	<vectoParam:unit>-</vectoParam:unit>
+</vectoParam:description>
+</xs:appinfo>
+</xs:annotation>
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="Compressed"/>
 			<xs:enumeration value="Liquefied"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PredictiveCruiseControlType">
+	<xs:annotation>
+<xs:appinfo>
+<vectoParam:description>
+	<vectoParam:parameterId component="Vehicle/ADAS">274</vectoParam:parameterId>
+	<vectoParam:unit>-</vectoParam:unit>
+</vectoParam:description>
+</xs:appinfo>
+</xs:annotation>
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="none"/>
 			<xs:enumeration value="1,2"/>
@@ -2560,8 +2576,105 @@ ToDo: -0.00
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PowerType">
+	<xs:annotation>
+	<xs:appinfo>
+<vectoParam:description>
+	<vectoParam:parameterId component="Vehicle">277</vectoParam:parameterId>
+	<vectoParam:parameterId component="Vehicle">278</vectoParam:parameterId>
+	<vectoParam:unit>W</vectoParam:unit>
+</vectoParam:description>
+</xs:appinfo>
+</xs:annotation>
 		<xs:restriction base="xs:int">
 			<xs:minInclusive value="0"/>
 		</xs:restriction>
 	</xs:simpleType>
+	<xs:simpleType name="ZeroEmissionVehicleType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">269</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="VocationalVehicleType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">270</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="SleeperCabType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">276</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="EngineStopStartType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">271</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="EcoRollWithoutEngineStopType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">272</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="EcoRollWithEngineStopType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle/ADAS">273</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="HybridElectricHDVType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">279</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
+	<xs:simpleType name="DualFuelType">
+		<xs:annotation>
+			<xs:appinfo>
+				<vectoParam:description>
+					<vectoParam:parameterId component="Vehicle">280</vectoParam:parameterId>
+					<vectoParam:unit>-</vectoParam:unit>
+				</vectoParam:description>
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:restriction base="xs:boolean"/>
+	</xs:simpleType>
 </xs:schema>