diff --git a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.7.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..489bfb339fdd37fd5c6321ea39f39fc476b2bf67
--- /dev/null
+++ b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.7.xsd
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vmrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" targetNamespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" schemaLocation="VectoOutputManufacturer.0.7.xsd"/>
+	<xs:element name="VectoMonitoring">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="ManufacturerRecord" type="vmrf:VectoOutputManufacturerType"/>
+				<xs:element name="AdditionalData">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="Vehicle">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Make" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#15</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="Engine">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="WHTC">
+											<xs:complexType>
+												<xs:sequence>
+													<xs:element name="CO2">
+														<xs:annotation>
+															<xs:documentation>#75</xs:documentation>
+														</xs:annotation>
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:double">
+																	<xs:attribute name="unit" use="required">
+																		<xs:simpleType>
+																			<xs:restriction base="xs:string">
+																				<xs:enumeration value="g/kWh"/>
+																			</xs:restriction>
+																		</xs:simpleType>
+																	</xs:attribute>
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+													<xs:element name="FuelConsumption">
+														<xs:annotation>
+															<xs:documentation>#76</xs:documentation>
+														</xs:annotation>
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:double">
+																	<xs:attribute name="unit" use="required">
+																		<xs:simpleType>
+																			<xs:restriction base="xs:string">
+																				<xs:enumeration value="g/kWh"/>
+																			</xs:restriction>
+																		</xs:simpleType>
+																	</xs:attribute>
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+											</xs:complexType>
+										</xs:element>
+										<xs:element name="WHSC">
+											<xs:complexType>
+												<xs:sequence>
+													<xs:element name="CO2">
+														<xs:annotation>
+															<xs:documentation>#77</xs:documentation>
+														</xs:annotation>
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:double">
+																	<xs:attribute name="unit" use="required">
+																		<xs:simpleType>
+																			<xs:restriction base="xs:string">
+																				<xs:enumeration value="g/kWh"/>
+																			</xs:restriction>
+																		</xs:simpleType>
+																	</xs:attribute>
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+													<xs:element name="FuelConsumption">
+														<xs:annotation>
+															<xs:documentation>#78</xs:documentation>
+														</xs:annotation>
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:double">
+																	<xs:attribute name="unit" use="required">
+																		<xs:simpleType>
+																			<xs:restriction base="xs:string">
+																				<xs:enumeration value="g/kWh"/>
+																			</xs:restriction>
+																		</xs:simpleType>
+																	</xs:attribute>
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="Gearbox">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Manufacturer" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#24</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+										<xs:element name="ManufacturerAddress" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#24</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+										<xs:element name="Make" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#25</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="Axlegear">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Manufacturer" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#32</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+										<xs:element name="ManufacturerAddress" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#32</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+										<xs:element name="Make" type="xs:string">
+											<xs:annotation>
+												<xs:documentation>#33</xs:documentation>
+											</xs:annotation>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="AxleWheels">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Axle" minOccurs="2" maxOccurs="4">
+											<xs:complexType>
+												<xs:sequence>
+													<xs:element name="Tyre">
+														<xs:complexType>
+															<xs:sequence>
+																<xs:element name="Manufacturer" type="xs:string">
+																	<xs:annotation>
+																		<xs:documentation>#39</xs:documentation>
+																	</xs:annotation>
+																</xs:element>
+																<xs:element name="ManufacturerAddress" type="xs:string">
+																	<xs:annotation>
+																		<xs:documentation>#39</xs:documentation>
+																	</xs:annotation>
+																</xs:element>
+																<xs:element name="Make" type="xs:string">
+																	<xs:annotation>
+																		<xs:documentation>#40</xs:documentation>
+																	</xs:annotation>
+																</xs:element>
+															</xs:sequence>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+												<xs:attribute name="axleNumber" use="required"/>
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="AdvancedReducingTechnologies" type="xs:string">
+								<xs:annotation>
+									<xs:documentation>#74</xs:documentation>
+								</xs:annotation>
+							</xs:element>
+							<xs:element name="VectoLicenseNbr" type="xs:string">
+								<xs:annotation>
+									<xs:documentation>#72</xs:documentation>
+								</xs:annotation>
+							</xs:element>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd
index 1d2c9ca7d38856b87337adca5f5e2d8f8fafa8d3..ca5e7f9fdc3ca4edf923e45fba1e13315e13ed1d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.7.xsd
@@ -77,7 +77,11 @@
 	<xs:complexType name="VectoOutputDataType">
 		<xs:sequence>
 			<xs:element name="Vehicle" type="VehicleType"/>
-			<xs:element name="ResultDataSignature" type="vdecdef:SignatureType"/>
+			<xs:element name="ResultDataSignature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>II.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="Results">
 				<xs:complexType>
 					<xs:sequence>
@@ -91,11 +95,18 @@
 						</xs:element>
 						<xs:choice>
 							<xs:sequence>
-								<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
+								<xs:element name="Result" type="ResultType" maxOccurs="unbounded">
+									<xs:annotation>
+										<xs:documentation>II.2.1, II.2.2</xs:documentation>
+									</xs:annotation>
+								</xs:element>
 								<xs:element name="Summary" minOccurs="0">
 									<xs:complexType>
 										<xs:sequence>
 											<xs:element name="SpecificCO2Emissions">
+												<xs:annotation>
+													<xs:documentation>II.2.3</xs:documentation>
+												</xs:annotation>
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:double">
@@ -111,6 +122,9 @@
 												</xs:complexType>
 											</xs:element>
 											<xs:element name="AveragePayload">
+												<xs:annotation>
+													<xs:documentation>II.2.4</xs:documentation>
+												</xs:annotation>
 												<xs:complexType>
 													<xs:simpleContent>
 														<xs:extension base="xs:double">
@@ -139,8 +153,16 @@
 			<xs:element name="ApplicationInformation">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="SimulationToolVersion" type="xs:string"/>
-						<xs:element name="Date" type="vdecdef:DateTimeWithTimezone"/>
+						<xs:element name="SimulationToolVersion" type="xs:string">
+							<xs:annotation>
+								<xs:documentation>II.2.5</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Date" type="vdecdef:DateTimeWithTimezone">
+							<xs:annotation>
+								<xs:documentation>II.2.5</xs:documentation>
+							</xs:annotation>
+						</xs:element>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
@@ -152,22 +174,34 @@
 	</xs:complexType>
 	<xs:complexType name="VehicleType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
-			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
-			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P236 / II.1.1.7</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P235 / II.1.1.6</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+				<xs:annotation>
+					<xs:documentation>P252 / II.1.1.6</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="VIN" type="vdecdef:VINType">
 				<xs:annotation>
-					<xs:documentation>P238</xs:documentation>
+					<xs:documentation>P238 / II.1.1.1</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
 				<xs:annotation>
-					<xs:documentation>P251</xs:documentation>
+					<xs:documentation>P251 / II.1.1.2</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="GrossVehicleMass">
 				<xs:annotation>
-					<xs:documentation>P041</xs:documentation>
+					<xs:documentation>P041 / II.1.1.4</xs:documentation>
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
@@ -179,7 +213,7 @@
 			</xs:element>
 			<xs:element name="CurbMassChassis">
 				<xs:annotation>
-					<xs:documentation>P038</xs:documentation>
+					<xs:documentation>P038 / II.1.1.8</xs:documentation>
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
@@ -191,39 +225,39 @@
 			</xs:element>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P269</xs:documentation>
+					<xs:documentation>P269 / II.1.1.10</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="HybridElectricHDV" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P279</xs:documentation>
+					<xs:documentation>P279 / II.1.1.11</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="DualFuelVehicle" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P280</xs:documentation>
+					<xs:documentation>P280 / II.1.1.12</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:choice>
 				<xs:sequence>
 					<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
 						<xs:annotation>
-							<xs:documentation>P037</xs:documentation>
+							<xs:documentation>P037 / II.1.1.3</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="VehicleGroup" type="VehicleGroupType">
 						<xs:annotation>
-							<xs:documentation>VECTO</xs:documentation>
+							<xs:documentation>VECTO / II.1.1.5</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="VocationalVehicle" type="xs:boolean">
 						<xs:annotation>
-							<xs:documentation>P270</xs:documentation>
+							<xs:documentation>P270 / II.1.1.9</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="SleeperCab" type="xs:boolean">
 						<xs:annotation>
-							<xs:documentation>P267</xs:documentation>
+							<xs:documentation>P267 / II.1.1.13</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="ADAS">
@@ -231,22 +265,22 @@
 							<xs:sequence>
 								<xs:element name="EngineStopStart" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P271 - bool</xs:documentation>
+										<xs:documentation>P271 / II.1.2.11</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P272 - bool</xs:documentation>
+										<xs:documentation>P272 / II.1.2.12</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P273 - bool</xs:documentation>
+										<xs:documentation>P273 / II.1.2.13</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="PredictiveCruiseControl" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P274 - enum</xs:documentation>
+										<xs:documentation>P274 / II.1.2.14</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 							</xs:sequence>
@@ -254,7 +288,7 @@
 					</xs:element>
 					<xs:element name="EngineRatedPower">
 						<xs:annotation>
-							<xs:documentation>P250</xs:documentation>
+							<xs:documentation>P250 / II.1.2.1</xs:documentation>
 						</xs:annotation>
 						<xs:complexType>
 							<xs:simpleContent>
@@ -266,7 +300,7 @@
 					</xs:element>
 					<xs:element name="EngineDisplacement">
 						<xs:annotation>
-							<xs:documentation>P061</xs:documentation>
+							<xs:documentation>P061 / II.1.2.2</xs:documentation>
 						</xs:annotation>
 						<xs:complexType>
 							<xs:simpleContent>
@@ -278,22 +312,22 @@
 					</xs:element>
 					<xs:element name="FuelType" type="vdecdef:FuelTypeType">
 						<xs:annotation>
-							<xs:documentation>P193</xs:documentation>
+							<xs:documentation>P193 / II.1.2.3</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="TransmissionMainCertificationMethod" type="vdecdef:GearboxCertificationOptionType">
 						<xs:annotation>
-							<xs:documentation>P154</xs:documentation>
+							<xs:documentation>P154 / II.1.2.4</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
 						<xs:annotation>
-							<xs:documentation>P076</xs:documentation>
+							<xs:documentation>P076 / II.1.2.5</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="GearsCount">
 						<xs:annotation>
-							<xs:documentation>P199</xs:documentation>
+							<xs:documentation>P199 / II.1.2.6</xs:documentation>
 						</xs:annotation>
 						<xs:simpleType>
 							<xs:restriction base="xs:int">
@@ -303,16 +337,23 @@
 					</xs:element>
 					<xs:element name="Retarder" type="xs:boolean">
 						<xs:annotation>
-							<xs:documentation>P052</xs:documentation>
+							<xs:documentation>P052 / II.1.2.7</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="AxleRatio" type="vdecdef:AxlegearRatioType">
 						<xs:annotation>
-							<xs:documentation>P150</xs:documentation>
+							<xs:documentation>P150 / II.1.2.8</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="AverageRRCMotorVehicleTyres" type="vdecdef:TyreRRCISOType">
+						<xs:annotation>
+							<xs:documentation>P046 / II.1.2.9</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="AverageRRCMotorVehicleTyres" type="vdecdef:TyreRRCISOType"/>
 					<xs:element name="AverageFuelEfficiencyLabelMotorVehicleTyres">
+						<xs:annotation>
+							<xs:documentation>II.1.2.10</xs:documentation>
+						</xs:annotation>
 						<xs:simpleType>
 							<xs:restriction base="xs:string">
 								<xs:minLength value="1"/>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
index ba4b164b5ff6acbd416e2e276302c0f95e3cb915..bb7ea49256c03dfcaae428082e98061a306f1fdd 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.7.xsd
@@ -17,30 +17,58 @@
 	</xs:element>
 	<xs:complexType name="AirdragType">
 		<xs:sequence>
-			<xs:element name="Model" minOccurs="0"/>
-			<xs:element name="CertificationMethod" type="AirdragCertificationOptionType"/>
-			<xs:element name="CertificationNumber" minOccurs="0"/>
-			<xs:element name="DigestValue" minOccurs="0"/>
+			<xs:element name="Model" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P241 / I.1.8.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationMethod" type="AirdragCertificationOptionType">
+				<xs:annotation>
+					<xs:documentation>VECTO / I.1.8.2 / #22</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P268 / I.1.8.3 / #3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>? / I.1.8.5</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="CdxA" type="vdecdef:AirdragCdxAType">
 				<xs:annotation>
-					<xs:documentation>P245</xs:documentation>
+					<xs:documentation>P245 / I.1.8.4 / #23</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AngledriveType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P221 / I.1.6.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="CertificationMethod" type="vdecdef:AngledriveCertificationOptionType">
 				<xs:annotation>
-					<xs:documentation>P258</xs:documentation>
+					<xs:documentation>P258 / I.1.6.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P265 / I.1.6.2 / #5</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.6.5</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
-			<xs:element name="DigestValue" type="xs:token"/>
 			<xs:element name="Ratio" type="vdecdef:AngledriveRatioType">
 				<xs:annotation>
-					<xs:documentation>P176</xs:documentation>
+					<xs:documentation>P176 / I.1.6.4</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
@@ -49,12 +77,12 @@
 		<xs:sequence>
 			<xs:element name="FanTechnology" type="vdecdef:AuxFanTechnologyType">
 				<xs:annotation>
-					<xs:documentation>P181</xs:documentation>
+					<xs:documentation>P181 / I.1.10.1</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="SteeringPumpTechnology" maxOccurs="4">
 				<xs:annotation>
-					<xs:documentation>P182</xs:documentation>
+					<xs:documentation>P182 / I.1.10.2</xs:documentation>
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
@@ -64,12 +92,12 @@
 			</xs:element>
 			<xs:element name="ElectricSystemTechnology" type="vdecdef:AuxESTechnologyType">
 				<xs:annotation>
-					<xs:documentation>P183</xs:documentation>
+					<xs:documentation>P183 / I.1.10.3</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="PneumaticSystemTechnology" type="vdecdef:AuxPSTechnologyType">
 				<xs:annotation>
-					<xs:documentation>P184</xs:documentation>
+					<xs:documentation>P184 / I.1.10.4</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="HVACTechnology" type="vdecdef:AuxHVACTechnologyType">
@@ -81,22 +109,34 @@
 	</xs:complexType>
 	<xs:complexType name="AxlegearType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P216 / I.1.7.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="CertificationMethod" type="vdecdef:AxlegearCertificationOptionType">
 				<xs:annotation>
-					<xs:documentation>P256</xs:documentation>
+					<xs:documentation>P256  I.1.7.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P264 / I.1.7.2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.7.6</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
-			<xs:element name="DigestValue" type="xs:token"/>
 			<xs:element name="LineType" type="vdecdef:AxlegearLineTypeType">
 				<xs:annotation>
-					<xs:documentation>P253</xs:documentation>
+					<xs:documentation>P253 / I.1.7.4</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Ratio" type="vdecdef:AxlegearRatioType">
 				<xs:annotation>
-					<xs:documentation>P150</xs:documentation>
+					<xs:documentation>P150 / I.1.7.5</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
@@ -105,23 +145,27 @@
 		<xs:sequence>
 			<xs:element name="TyreDimension" type="vdecdef:TyreDimensionType">
 				<xs:annotation>
-					<xs:documentation>P108</xs:documentation>
+					<xs:documentation>P108 / I.1.9.1, I.1.9.4, I.1.9.8, I.1.9.12</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="TyreCertificationNumber" type="vdecdef:CertificationNumberType">
 				<xs:annotation>
-					<xs:documentation>P267</xs:documentation>
+					<xs:documentation>P267 / I.1.9.2, I.1.9.6, I.1.9.10, I.1.9.14, #6, #7, #8, #9</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.9.3a, I.1.9.7a, I.1.9.11a, I.1.16</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="DigestValue" type="xs:token"/>
 			<xs:element name="TyreRRCDeclared" type="vdecdef:TyreRRCISOType">
 				<xs:annotation>
-					<xs:documentation>P046</xs:documentation>
+					<xs:documentation>P046 / I.1.9.3, I.1.9.7, I.1.9.11, I.1.9.15</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="TwinTyres" type="vdecdef:AxleTwinTyresType">
 				<xs:annotation>
-					<xs:documentation>P045</xs:documentation>
+					<xs:documentation>P045 / I.1.9.5, I.1.9.9, I.1.9.13</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
@@ -154,65 +198,76 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="EngineType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="RatedPower">
-						<xs:annotation>
-							<xs:documentation>P250</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="vdecdef:EngineRatedPower">
-									<xs:attribute name="unit" type="PowerUnitType" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="IdlingSpeed">
-						<xs:annotation>
-							<xs:documentation>P063 / P198</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="vdecdef:EngineDeclaredSpeedType">
-									<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="RatedSpeed">
-						<xs:annotation>
-							<xs:documentation>P249</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="vdecdef:EngineDeclaredSpeedType">
-									<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="Displacement">
-						<xs:annotation>
-							<xs:documentation>P061</xs:documentation>
-						</xs:annotation>
-						<xs:complexType>
-							<xs:simpleContent>
-								<xs:extension base="xs:double">
-									<xs:attribute name="unit" type="DisplacementType" use="required"/>
-								</xs:extension>
-							</xs:simpleContent>
-						</xs:complexType>
-					</xs:element>
-					<xs:element name="FuelType" type="vdecdef:FuelTypeType">
-						<xs:annotation>
-							<xs:documentation>P193</xs:documentation>
-						</xs:annotation>
-					</xs:element>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
+		<xs:sequence>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P201 / I.1.2.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType">
+				<xs:annotation>
+					<xs:documentation>P261 / I.1.2.2 / #2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.2.8</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="RatedPower">
+				<xs:annotation>
+					<xs:documentation>P250 / I.1.2.3 / #17</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineRatedPower">
+							<xs:attribute name="unit" type="PowerUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="IdlingSpeed">
+				<xs:annotation>
+					<xs:documentation>P063, P198 / I.1.2.4 / #18</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RatedSpeed">
+				<xs:annotation>
+					<xs:documentation>P249 / I.1.2.5 / #19</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="vdecdef:EngineDeclaredSpeedType">
+							<xs:attribute name="unit" type="AngularVelocityUnitType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="Displacement">
+				<xs:annotation>
+					<xs:documentation>P061 / I.1.2.6 / #20</xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:simpleContent>
+						<xs:extension base="xs:double">
+							<xs:attribute name="unit" type="DisplacementType" use="required"/>
+						</xs:extension>
+					</xs:simpleContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="FuelType" type="vdecdef:FuelTypeType">
+				<xs:annotation>
+					<xs:documentation>P193 / I.1.2.7</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="FuelConsumptionType">
 		<xs:simpleContent>
@@ -223,22 +278,34 @@
 	</xs:complexType>
 	<xs:complexType name="GearboxType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P205 / I.1.3.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="CertificationMethod" type="vdecdef:GearboxCertificationOptionType">
 				<xs:annotation>
-					<xs:documentation>P154</xs:documentation>
+					<xs:documentation>P154 / I.1.3.3 / #26</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P262 / I.1.3.2 / #3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.3.9</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
-			<xs:element name="DigestValue" type="xs:token"/>
 			<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType">
 				<xs:annotation>
-					<xs:documentation>P076</xs:documentation>
+					<xs:documentation>P076 / I.1.3.4 / #27</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="GearsCount">
 				<xs:annotation>
-					<xs:documentation>P199</xs:documentation>
+					<xs:documentation>P199 / I.1.3.5</xs:documentation>
 				</xs:annotation>
 				<xs:simpleType>
 					<xs:restriction base="xs:int">
@@ -248,17 +315,24 @@
 			</xs:element>
 			<xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType">
 				<xs:annotation>
-					<xs:documentation>P078</xs:documentation>
+					<xs:documentation>P078 / I.1.3.6</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="ResultType">
 		<xs:sequence>
-			<xs:element name="Mission" type="MissionTypeType"/>
+			<xs:element name="Mission" type="MissionTypeType">
+				<xs:annotation>
+					<xs:documentation>I.2.1.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:choice>
 				<xs:sequence>
 					<xs:element name="Distance">
+						<xs:annotation>
+							<xs:documentation>I.2.2.8</xs:documentation>
+						</xs:annotation>
 						<xs:complexType>
 							<xs:simpleContent>
 								<xs:extension base="xs:double">
@@ -269,8 +343,16 @@
 					</xs:element>
 					<xs:element name="SimulationParameters" type="SimulationParametersType"/>
 					<xs:element name="VehiclePerformance" type="VehiclePerformanceType"/>
-					<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded"/>
-					<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded"/>
+					<xs:element name="FuelConsumption" type="FuelConsumptionType" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>I.2.3.1 - I.2.3.12</xs:documentation>
+						</xs:annotation>
+					</xs:element>
+					<xs:element name="CO2" type="CO2Type" maxOccurs="unbounded">
+						<xs:annotation>
+							<xs:documentation>I.2.3.10 - I.2.3.16</xs:documentation>
+						</xs:annotation>
+					</xs:element>
 				</xs:sequence>
 				<xs:sequence>
 					<xs:element name="Error" type="xs:string"/>
@@ -291,24 +373,39 @@
 		<xs:sequence>
 			<xs:element name="RetarderType" type="vdecdef:RetarderTypeType">
 				<xs:annotation>
-					<xs:documentation>P052</xs:documentation>
+					<xs:documentation>P052 / I.1.3.7</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:sequence minOccurs="0">
-				<xs:element name="Model" type="vdecdef:ModelType"/>
+				<xs:element name="Model" type="vdecdef:ModelType">
+					<xs:annotation>
+						<xs:documentation>P226 / I.1.4.1</xs:documentation>
+					</xs:annotation>
+				</xs:element>
 				<xs:element name="CertificationMethod" type="vdecdef:RetarderCertificationOptionType">
 					<xs:annotation>
-						<xs:documentation>P255</xs:documentation>
+						<xs:documentation>P255 / I.1.4.3</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+					<xs:annotation>
+						<xs:documentation>P266 / I.1.4.2</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element name="DigestValue" type="xs:token">
+					<xs:annotation>
+						<xs:documentation>? / I.1.4.4</xs:documentation>
 					</xs:annotation>
 				</xs:element>
-				<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
-				<xs:element name="DigestValue" type="xs:token"/>
 			</xs:sequence>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="SimulationParametersType">
 		<xs:sequence>
 			<xs:element name="TotalVehicleMass">
+				<xs:annotation>
+					<xs:documentation>I.2.1.4</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -318,6 +415,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="Payload">
+				<xs:annotation>
+					<xs:documentation>I.2.1.2</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -326,19 +426,35 @@
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="FuelType" type="vdecdef:FuelTypeType"/>
+			<xs:element name="FuelType" type="vdecdef:FuelTypeType">
+				<xs:annotation>
+					<xs:documentation>I.2.1.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="TorqueconverterType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P211 / I.1.5.1</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="CertificationMethod" type="vdecdef:TorqueConverterCertificationOptionType">
 				<xs:annotation>
-					<xs:documentation>P257</xs:documentation>
+					<xs:documentation>P257 / I.1.5.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>P263 / I.1.5.2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="DigestValue" type="xs:token">
+				<xs:annotation>
+					<xs:documentation>? / I.1.5.4</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType" minOccurs="0"/>
-			<xs:element name="DigestValue" type="xs:token"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="TorqueLimitsEntryType">
@@ -360,6 +476,9 @@
 			</xs:simpleType>
 		</xs:attribute>
 		<xs:attribute name="torqueLimitPercent" use="required">
+			<xs:annotation>
+				<xs:documentation>/ I.1.11.*</xs:documentation>
+			</xs:annotation>
 			<xs:simpleType>
 				<xs:restriction base="xs:float">
 					<xs:minInclusive value="0.0"/>
@@ -396,42 +515,6 @@
 						<xs:choice>
 							<xs:sequence>
 								<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
-								<xs:element name="Summary" minOccurs="0">
-									<xs:complexType>
-										<xs:sequence>
-											<xs:element name="SpecificCO2Emissions">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:double">
-															<xs:attribute name="unit" use="required">
-																<xs:simpleType>
-																	<xs:restriction base="xs:string">
-																		<xs:enumeration value="gCO2/tkm"/>
-																	</xs:restriction>
-																</xs:simpleType>
-															</xs:attribute>
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-											<xs:element name="AveragePayload">
-												<xs:complexType>
-													<xs:simpleContent>
-														<xs:extension base="xs:double">
-															<xs:attribute name="unit" use="required">
-																<xs:simpleType>
-																	<xs:restriction base="xs:string">
-																		<xs:enumeration value="t"/>
-																	</xs:restriction>
-																</xs:simpleType>
-															</xs:attribute>
-														</xs:extension>
-													</xs:simpleContent>
-												</xs:complexType>
-											</xs:element>
-										</xs:sequence>
-									</xs:complexType>
-								</xs:element>
 							</xs:sequence>
 							<xs:element name="ExemptedVehicle">
 								<xs:complexType/>
@@ -443,8 +526,16 @@
 			<xs:element name="ApplicationInformation">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="SimulationToolVersion"/>
-						<xs:element name="Date"/>
+						<xs:element name="SimulationToolVersion">
+							<xs:annotation>
+								<xs:documentation>I.3.1.1</xs:documentation>
+							</xs:annotation>
+						</xs:element>
+						<xs:element name="Date">
+							<xs:annotation>
+								<xs:documentation>I.3.1.2</xs:documentation>
+							</xs:annotation>
+						</xs:element>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
@@ -454,6 +545,9 @@
 	<xs:complexType name="VehiclePerformanceType">
 		<xs:sequence>
 			<xs:element name="AverageSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.1</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -472,6 +566,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="MinSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.2</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -481,6 +578,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="MaxSpeed">
+				<xs:annotation>
+					<xs:documentation>I.2.2.3</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -490,6 +590,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="MaxDeceleration">
+				<xs:annotation>
+					<xs:documentation>I.2.2.4</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -499,6 +602,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="MaxAcceleration">
+				<xs:annotation>
+					<xs:documentation>I.2.2.5</xs:documentation>
+				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
@@ -508,6 +614,9 @@
 				</xs:complexType>
 			</xs:element>
 			<xs:element name="FullLoadDrivingtimePercentage">
+				<xs:annotation>
+					<xs:documentation>I.2.2.6</xs:documentation>
+				</xs:annotation>
 				<xs:simpleType>
 					<xs:restriction base="xs:double">
 						<xs:minInclusive value="0"/>
@@ -515,7 +624,11 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="GearshiftCount" type="xs:int"/>
+			<xs:element name="GearshiftCount" type="xs:int">
+				<xs:annotation>
+					<xs:documentation>I.2.2.7</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="EngineSpeedDriving">
 				<xs:complexType>
 					<xs:sequence>
@@ -553,22 +666,34 @@
 	</xs:complexType>
 	<xs:complexType name="VehicleType">
 		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
-			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType"/>
-			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType"/>
+			<xs:element name="Model" type="vdecdef:ModelType">
+				<xs:annotation>
+					<xs:documentation>P236 / I.1.1.2</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Manufacturer" type="vdecdef:ManufacturerType">
+				<xs:annotation>
+					<xs:documentation>P235 / I.1.1.1 / #14</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="ManufacturerAddress" type="vdecdef:ManufacturerAddressType">
+				<xs:annotation>
+					<xs:documentation>P252 / I.1.1.1 / #14</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 			<xs:element name="VIN">
 				<xs:annotation>
-					<xs:documentation>P238</xs:documentation>
+					<xs:documentation>P238 / I.1.1.3 / #1</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="LegislativeClass" type="vdecdef:LegislativeClassDeclarationType">
 				<xs:annotation>
-					<xs:documentation>P251</xs:documentation>
+					<xs:documentation>P251 / I.1.1.4 / #10</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="GrossVehicleMass">
 				<xs:annotation>
-					<xs:documentation>P041</xs:documentation>
+					<xs:documentation>P041 / I.1.1.6 / #12</xs:documentation>
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
@@ -580,7 +705,8 @@
 			</xs:element>
 			<xs:element name="CurbMassChassis">
 				<xs:annotation>
-					<xs:documentation>P038</xs:documentation>
+					<xs:documentation>P038 / I.1.1.8 / #16</xs:documentation>
+					<xs:documentation>P038 / I.1.1.8 / #16</xs:documentation>
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
@@ -592,44 +718,44 @@
 			</xs:element>
 			<xs:element name="ZeroEmissionVehicle" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P269</xs:documentation>
+					<xs:documentation>P269 / I.1.1.10</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="HybridElectricHDV" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P279</xs:documentation>
+					<xs:documentation>P279 / I.1.1.11</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="DualFuelVehicle" type="xs:boolean">
 				<xs:annotation>
-					<xs:documentation>P280</xs:documentation>
+					<xs:documentation>P280 / I.1.1.12</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:choice>
 				<xs:sequence>
 					<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
 						<xs:annotation>
-							<xs:documentation>P037</xs:documentation>
+							<xs:documentation>P037 / I.1.1.5 / #11</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="VehicleGroup" type="VehicleGroupType">
 						<xs:annotation>
-							<xs:documentation>VECTO</xs:documentation>
+							<xs:documentation>VECTO / I.1.1.7 / #13</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="VocationalVehicle">
 						<xs:annotation>
-							<xs:documentation>P270</xs:documentation>
+							<xs:documentation>P270 / I.1.1.9</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="SleeperCab" type="xs:boolean">
 						<xs:annotation>
-							<xs:documentation>P267</xs:documentation>
+							<xs:documentation>P267 / I.1.1.13</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="PTO" type="xs:boolean">
 						<xs:annotation>
-							<xs:documentation>P247</xs:documentation>
+							<xs:documentation>P247 / I.1.3.8</xs:documentation>
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="ADAS">
@@ -637,22 +763,22 @@
 							<xs:sequence>
 								<xs:element name="EngineStopStart" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P271 - bool</xs:documentation>
+										<xs:documentation>P271 / I.1.12.1</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="EcoRollWithoutEngineStop" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P272 - bool</xs:documentation>
+										<xs:documentation>P272 / I.1.12.2</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="EcoRollWithEngineStop" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P273 - bool</xs:documentation>
+										<xs:documentation>P273 / I.1.12.3</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 								<xs:element name="PredictiveCruiseControl" type="xs:boolean">
 									<xs:annotation>
-										<xs:documentation>P274 - enum</xs:documentation>
+										<xs:documentation>P274 / I.1.12.4</xs:documentation>
 									</xs:annotation>
 								</xs:element>
 							</xs:sequence>
@@ -702,7 +828,11 @@
 					</xs:element>
 				</xs:sequence>
 			</xs:choice>
-			<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
+			<xs:element name="InputDataSignature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>I.3.1.3</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:simpleType name="AccelerationUnitType">
@@ -797,7 +927,11 @@
 					</xs:complexContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="Signature" type="vdecdef:SignatureType"/>
+			<xs:element name="Signature" type="vdecdef:SignatureType">
+				<xs:annotation>
+					<xs:documentation>I.3.1.4</xs:documentation>
+				</xs:annotation>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 </xs:schema>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/MonitoringReportSample.xml b/VectoCore/VectoCoreTest/TestData/XML/MonitoringReportSample.xml
new file mode 100644
index 0000000000000000000000000000000000000000..252da16df07b9be8f6bc6528a5a657435714c805
--- /dev/null
+++ b/VectoCore/VectoCoreTest/TestData/XML/MonitoringReportSample.xml
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mns:VectoMonitoring xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.7" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mns="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7 file:///E:/QUAM/Workspace/VECTO_quam/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.0.7.xsd">
+	<mns:ManufacturerRecord>
+		<Data id="RESULT-df37a37ded8847a4aecd">
+			<Vehicle>
+				<Model>Rigid Truck_4x2_vehicle-class-4</Model>
+				<Manufacturer>TUG IVT EM</Manufacturer>
+				<ManufacturerAddress>Inffeldgasse 16, 8010 Graz</ManufacturerAddress>
+				<VIN>standard values</VIN>
+				<LegislativeClass>N3</LegislativeClass>
+				<GrossVehicleMass unit="kg">15000</GrossVehicleMass>
+				<CurbMassChassis unit="kg">4980</CurbMassChassis>
+				<ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+				<VehicleGroup>4</VehicleGroup>
+				<AxleConfiguration>4x2</AxleConfiguration>
+				<PTO>false</PTO>
+				<Components>
+					<Engine>
+						<Model>350kW_IVT_12l</Model>
+						<CertificationNumber>ENG-350kW_IVT_12l</CertificationNumber>
+						<DigestValue>
+						</DigestValue>
+						<RatedPower unit="W">325032</RatedPower>
+						<IdlingSpeed unit="rpm">600</IdlingSpeed>
+						<RatedSpeed unit="rpm">1736</RatedSpeed>
+						<Displacement unit="ltr">12700</Displacement>
+						<FuelType>Diesel CI</FuelType>
+					</Engine>
+					<Gearbox>
+						<Model>GB_12-gear</Model>
+						<CertificationMethod>Standard values</CertificationMethod>
+						<DigestValue>
+						</DigestValue>
+						<TransmissionType>AMT</TransmissionType>
+						<GearsCount>12</GearsCount>
+						<TransmissionRatioFinalGear>1.000</TransmissionRatioFinalGear>
+					</Gearbox>
+					<Retarder>
+						<RetarderType>Transmission Output Retarder</RetarderType>
+						<Model>RET-generic</Model>
+						<CertificationMethod>Standard values</CertificationMethod>
+						<DigestValue>
+						</DigestValue>
+					</Retarder>
+					<Axlegear>
+						<Model>N.A.</Model>
+						<CertificationMethod>Standard values</CertificationMethod>
+						<DigestValue>
+						</DigestValue>
+						<LineType>Single portal axle</LineType>
+						<Ratio>2.640</Ratio>
+					</Axlegear>
+					<AirDrag>
+						<Model>N.A.</Model>
+						<CertificationMethod>Measured</CertificationMethod>
+						<CertificationNumber>generic cabin</CertificationNumber>
+						<DigestValue>
+						</DigestValue>
+						<CdxA>5.40</CdxA>
+					</AirDrag>
+					<AxleWheels>
+						<Axle axleNumber="1">
+							<TyreDimension>315/70 R22.5</TyreDimension>
+							<TyreCertificationNumber/>
+							<DigestValue/>
+							<TyreRRCDeclared>0.0052</TyreRRCDeclared>
+							<TwinTyres>false</TwinTyres>
+						</Axle>
+						<Axle axleNumber="2">
+							<TyreDimension>315/70 R22.5</TyreDimension>
+							<TyreCertificationNumber/>
+							<DigestValue/>
+							<TyreRRCDeclared>0.0061</TyreRRCDeclared>
+							<TwinTyres>true</TwinTyres>
+						</Axle>
+					</AxleWheels>
+					<Auxiliaries>
+						<FanTechnology>Belt driven or driven via transm. - Electronically controlled visco clutch</FanTechnology>
+						<SteeringPumpTechnology>Fixed displacement with elec. control</SteeringPumpTechnology>
+						<ElectricSystemTechnology>Standard technology</ElectricSystemTechnology>
+						<PneumaticSystemTechnology>Medium Supply 1-stage + ESS + AMS</PneumaticSystemTechnology>
+						<HVACTechnology>Default</HVACTechnology>
+					</Auxiliaries>
+				</Components>
+				<InputDataSignature>
+					<di:Reference URI="#VEH-class4_Class-4_4t0">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>GSxu8JmHbLkx6NU584cib4EuNe+UlStsjoA7lV+gpss=</di:DigestValue>
+					</di:Reference>
+				</InputDataSignature>
+			</Vehicle>
+			<Results>
+				<Status>success</Status>
+				<Result status="success">
+					<Mission>Long Haul</Mission>
+					<Distance unit="km">100.185</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17600</TotalVehicleMass>
+						<Payload unit="kg">1900</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">79.6</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">79.6</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">86.5</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>3.33</FullLoadDrivingtimePercentage>
+						<GearshiftCount>57</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">233.5</FuelConsumption>
+					<FuelConsumption unit="g/t-km">122.9</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">2.36</FuelConsumption>
+					<FuelConsumption unit="MJ/km">9.97</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">5.25</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.101</FuelConsumption>
+					<FuelConsumption unit="l/100km">27.9</FuelConsumption>
+					<FuelConsumption unit="l/t-km">0.147</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.00282</FuelConsumption>
+					<CO2 unit="g/km">731.0</CO2>
+					<CO2 unit="g/t-km">384.7</CO2>
+					<CO2 unit="g/m³-km">7.39</CO2>
+				</Result>
+				<Result status="success">
+					<Mission>Long Haul</Mission>
+					<Distance unit="km">100.185</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">29700</TotalVehicleMass>
+						<Payload unit="kg">14000</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">79.0</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">80.0</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">87.5</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>9.22</FullLoadDrivingtimePercentage>
+						<GearshiftCount>64</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">282.1</FuelConsumption>
+					<FuelConsumption unit="g/t-km">20.2</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">2.85</FuelConsumption>
+					<FuelConsumption unit="MJ/km">12.0</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">0.860</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.122</FuelConsumption>
+					<FuelConsumption unit="l/100km">33.7</FuelConsumption>
+					<FuelConsumption unit="l/t-km">0.0241</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.00341</FuelConsumption>
+					<CO2 unit="g/km">883.1</CO2>
+					<CO2 unit="g/t-km">63.1</CO2>
+					<CO2 unit="g/m³-km">8.93</CO2>
+				</Result>
+				<Result status="success">
+					<Mission>Regional Delivery</Mission>
+					<Distance unit="km">100.000</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">11200</TotalVehicleMass>
+						<Payload unit="kg">900</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">60.6</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">61.0</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">86.5</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>1.92</FullLoadDrivingtimePercentage>
+						<GearshiftCount>224</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">178.3</FuelConsumption>
+					<FuelConsumption unit="g/t-km">198.1</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">3.61</FuelConsumption>
+					<FuelConsumption unit="MJ/km">7.61</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">8.46</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.154</FuelConsumption>
+					<FuelConsumption unit="l/100km">21.3</FuelConsumption>
+					<FuelConsumption unit="l/t-km">0.237</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.00432</FuelConsumption>
+					<CO2 unit="g/km">558.0</CO2>
+					<CO2 unit="g/t-km">620.0</CO2>
+					<CO2 unit="g/m³-km">11.3</CO2>
+				</Result>
+				<Result status="success">
+					<Mission>Regional Delivery</Mission>
+					<Distance unit="km">100.000</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14700</TotalVehicleMass>
+						<Payload unit="kg">4400</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">60.6</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">61.0</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">86.5</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>2.92</FullLoadDrivingtimePercentage>
+						<GearshiftCount>224</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">195.5</FuelConsumption>
+					<FuelConsumption unit="g/t-km">44.4</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">3.96</FuelConsumption>
+					<FuelConsumption unit="MJ/km">8.35</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">1.90</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.169</FuelConsumption>
+					<FuelConsumption unit="l/100km">23.4</FuelConsumption>
+					<FuelConsumption unit="l/t-km">0.0531</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.00473</FuelConsumption>
+					<CO2 unit="g/km">611.9</CO2>
+					<CO2 unit="g/t-km">139.1</CO2>
+					<CO2 unit="g/m³-km">12.4</CO2>
+				</Result>
+				<Result status="success">
+					<Mission>Municipal Utility</Mission>
+					<Distance unit="km">11.240</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">14800</TotalVehicleMass>
+						<Payload unit="kg">600</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">9.1</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">12.0</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">85.8</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>0.65</FullLoadDrivingtimePercentage>
+						<GearshiftCount>2850</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">706.3</FuelConsumption>
+					<FuelConsumption unit="g/t-km">1177.2</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">14.3</FuelConsumption>
+					<FuelConsumption unit="MJ/km">30.2</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">50.3</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.611</FuelConsumption>
+					<FuelConsumption unit="l/100km">84.5</FuelConsumption>
+					<FuelConsumption unit="l/t-km">1.41</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.0171</FuelConsumption>
+					<CO2 unit="g/km">2210.8</CO2>
+					<CO2 unit="g/t-km">3684.6</CO2>
+					<CO2 unit="g/m³-km">44.8</CO2>
+				</Result>
+				<Result status="success">
+					<Mission>Municipal Utility</Mission>
+					<Distance unit="km">11.240</Distance>
+					<SimulationParameters>
+						<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
+						<Payload unit="kg">3000</Payload>
+						<FuelType>Diesel CI</FuelType>
+					</SimulationParameters>
+					<VehiclePerformance>
+						<AverageSpeed unit="km/h">9.1</AverageSpeed>
+						<AverageDrivingSpeed unit="km/h">11.0</AverageDrivingSpeed>
+						<MinSpeed unit="km/h">0.0</MinSpeed>
+						<MaxSpeed unit="km/h">85.8</MaxSpeed>
+						<MaxDeceleration unit="m/s²">1.00</MaxDeceleration>
+						<MaxAcceleration unit="m/s²">1.00</MaxAcceleration>
+						<FullLoadDrivingtimePercentage>1.07</FullLoadDrivingtimePercentage>
+						<GearshiftCount>2850</GearshiftCount>
+						<EngineSpeedDriving>
+							<Min unit="rpm">600</Min>
+							<Average unit="rpm">800</Average>
+							<Max unit="rpm">1600</Max>
+						</EngineSpeedDriving>
+					</VehiclePerformance>
+					<FuelConsumption unit="g/km">731.0</FuelConsumption>
+					<FuelConsumption unit="g/t-km">243.7</FuelConsumption>
+					<FuelConsumption unit="g/m³-km">14.8</FuelConsumption>
+					<FuelConsumption unit="MJ/km">31.2</FuelConsumption>
+					<FuelConsumption unit="MJ/t-km">10.4</FuelConsumption>
+					<FuelConsumption unit="MJ/m³-km">0.632</FuelConsumption>
+					<FuelConsumption unit="l/100km">87.4</FuelConsumption>
+					<FuelConsumption unit="l/t-km">0.291</FuelConsumption>
+					<FuelConsumption unit="l/m³-km">0.0177</FuelConsumption>
+					<CO2 unit="g/km">2287.9</CO2>
+					<CO2 unit="g/t-km">762.6</CO2>
+					<CO2 unit="g/m³-km">46.3</CO2>
+				</Result>
+			</Results>
+			<ApplicationInformation>
+				<SimulationToolVersion>3.2.0.925</SimulationToolVersion>
+				<Date>2018-02-01T15:20:23.1129173Z</Date>
+			</ApplicationInformation>
+		</Data>
+		<Signature>
+			<di:Reference URI="#RESULT-df37a37ded8847a4aecd">
+				<di:Transforms>
+					<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+					<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+				</di:Transforms>
+				<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+				<di:DigestValue>C3OhqWCN3PBXCYWiTQpHwi7CCjuS7thQpVhkIXS6S30=</di:DigestValue>
+			</di:Reference>
+		</Signature>
+	</mns:ManufacturerRecord>
+	<AdditionalData xmlns="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" >
+		<Engine>
+			<WHTC>
+				<CO2 unit="g/kWh">NaN</CO2>
+				<FuelConsumption unit="g/kWh">NaN</FuelConsumption>
+			</WHTC>
+			<WHSC>
+				<CO2 unit="g/kWh">NaN</CO2>
+				<FuelConsumption unit="g/kWh">NaN</FuelConsumption>
+			</WHSC>
+		</Engine>
+		<Gearbox>
+			<Manufacturer>##GEARBOX_MANUFACTURER##</Manufacturer>
+			<ManufacturerAddress>##GEARBOX_MANUFACTURER_ADDRESS##</ManufacturerAddress>
+			<Make>##GEARBOX_MAKE##</Make>
+		</Gearbox>
+		<Axlegear>
+			<Manufacturer>##AXLEGEAR_MANUFACTURER##</Manufacturer>
+			<ManufacturerAddress>##AXLEGEAR_MANUFACTURER_ADDRESS##</ManufacturerAddress>
+			<Make>##AXLEGEAR_MAKE##</Make>
+		</Axlegear>
+		<AxleWheels>
+			<Axle axleNumber="1">
+				<Tyre>
+					<Manufacturer>##TYRE1_MANUFACTURER##</Manufacturer>
+					<ManufacturerAddress>##TYRE1_MANUFACTURER_ADDRESS##</ManufacturerAddress>
+					<Make>##TYRE1_MAKE##</Make>
+				</Tyre>
+			</Axle>
+			<Axle axleNumber="2">
+				<Tyre>
+					<Manufacturer>##TYRE2_MANUFACTURER##</Manufacturer>
+					<ManufacturerAddress>##TYRE2_MANUFACTURER_ADDRESS##</ManufacturerAddress>
+					<Make>##TYRE2_MAKE##</Make>
+				</Tyre>
+			</Axle>
+		</AxleWheels>
+		<AdvancedReducingTechnologies>###ADVANCED_CO2_REDUCING_TECHNOLOGIES##</AdvancedReducingTechnologies>
+		<VectoLicenseNbr>##VECTO_LICENSE_NUMBER##</VectoLicenseNbr>
+	</AdditionalData>
+</mns:VectoMonitoring>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index 2c8a35613436ffe86ac39067b029e46beafaf490..d32982ca9a3cfe2c69d739aff2ca401309462495 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -42,6 +42,7 @@
 		<File FilePath="VectoCore\Resources\XSD\VectoEngineeringDefinitions.0.7.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\Resources\XSD\VectoEngineeringInput.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\Resources\XSD\VectoInput.xsd" HomeFolder="Yes"/>
+		<File FilePath="VectoCore\Resources\XSD\VectoMonitoring.0.7.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.4.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.5.xsd" HomeFolder="Yes"/>
 		<File FilePath="VectoCore\Resources\XSD\VectoOutputCustomer.0.7.xsd" HomeFolder="Yes"/>