diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd
index 9759f83ce47377fe683f4eac22b1bf718b6ee4ba..197e6185febf15204db6c55b5cf45b64ce597933 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutput.xsd
@@ -1,438 +1,185 @@
 <?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) -->
 <!--W3C XML Schema generated by XMLSpy vXMLSpy Professional Edition v2016 rel. 2 (x64) (http://www.altova.com)-->
-<xs:schema xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vdecdef="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
-	<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8" schemaLocation="VectoDeclarationDefinitions.0.8.xsd"/>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
 	<xs:element name="VectoOutput">
 		<xs:annotation>
 			<xs:documentation>Comment describing your root element</xs:documentation>
 		</xs:annotation>
 		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Data" type="VectoOutputDataType"/>
-				<xs:element name="Signature" type="vdecdef:SignatureType"/>
-			</xs:sequence>
-			<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+			<xs:complexContent>
+				<xs:extension base="VectoOutputType">
+					<xs:attribute name="schemaVersion" type="xs:decimal" use="required"/>
+				</xs:extension>
+			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
-	<xs:complexType name="ComponentDescriptionType">
-		<xs:sequence>
-			<xs:element name="Model" type="vdecdef:ModelType"/>
-			<xs:element name="CertificationNumber" type="vdecdef:CertificationNumberType"/>
-			<xs:element name="DigestValue" type="xs:token"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="EngineType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="RatedPower" type="vdecdef:EngineRatedPower"/>
-					<xs:element name="IdlingSpeed" type="vdecdef:EngineDeclaredSpeedType"/>
-					<xs:element name="RatedSpeed" type="vdecdef:EngineDeclaredSpeedType"/>
-					<xs:element name="Displacement" type="vdecdef:EngineDisplacementType"/>
-					<xs:element name="FuelType" type="vdecdef:FuelTypeType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="GearboxType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="MainCertificationMethod" type="vdecdef:GearboxCertificationOptionType"/>
-					<xs:element name="TransmissionType" type="vdecdef:GearboxTransmissionTypeType"/>
-					<xs:element name="GearsCount">
-						<xs:simpleType>
-							<xs:restriction base="xs:int">
-								<xs:minInclusive value="1"/>
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element name="TransmissionRatioFinalGear" type="vdecdef:GearboxGearRatioType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="RetarderType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="CertificationMethod" type="vdecdef:RetarderCertificationOptionType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AngledriveType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="CertificationMethod" type="vdecdef:AngledriveCertificationOptionType"/>
-					<xs:element name="Ratio" type="vdecdef:AngledriveRatioType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AxlegearType">
-		<xs:complexContent>
-			<xs:extension base="ComponentDescriptionType">
-				<xs:sequence>
-					<xs:element name="CertificationMethod" type="vdecdef:AxlegearCertificationOptionType"/>
-					<xs:element name="LineType" type="vdecdef:AxlegearLineTypeType"/>
-					<xs:element name="Ratio" type="vdecdef:AxlegearRatioType"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="AirdragType">
-		<xs:sequence>
-			<xs:sequence minOccurs="0">
-				<xs:element name="Model"/>
-				<xs:element name="CertificationNumber"/>
-				<xs:element name="DigestValue"/>
-			</xs:sequence>
-			<xs:element name="CertificationMethod" type="AirdragCertificationOptionType"/>
-			<xs:element name="CdxA" type="vdecdef:AirdragCdxAType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AxleType">
-		<xs:sequence>
-			<xs:element name="TyreDimension" type="vdecdef:TyreDimensionType">
-				<xs:annotation>
-					<xs:documentation>P108</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TyreCertificationNumber" type="vdecdef:CertificationNumberType">
-				<xs:annotation>
-					<xs:documentation>P267</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TyreRRCDeclared" type="vdecdef:TyreRRCISOType">
-				<xs:annotation>
-					<xs:documentation>P046</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TwinTyre" type="vdecdef:AxleTwinTyresType">
-				<xs:annotation>
-					<xs:documentation>P045</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="axleNumber" use="required"/>
-	</xs:complexType>
-	<xs:complexType name="AxleWheelsType">
-		<xs:sequence minOccurs="2" maxOccurs="4">
-			<xs:element name="Axle" type="AxleType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="AuxiliariesType">
-		<xs:sequence>
-			<xs:element name="FanTechnology" type="vdecdef:AuxFanTechnologyType">
-				<xs:annotation>
-					<xs:documentation>P181</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="SteeringPumpTechnology" maxOccurs="4">
-				<xs:annotation>
-					<xs:documentation>P182</xs:documentation>
-				</xs:annotation>
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="vdecdef:AuxSPTechnologyType">
-							<xs:attribute name="axleNumber" use="required">
-								<xs:simpleType>
-									<xs:restriction base="xs:int">
-										<xs:minInclusive value="1"/>
-										<xs:maxInclusive value="4"/>
-									</xs:restriction>
-								</xs:simpleType>
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ElectricSystemTechnology" type="vdecdef:AuxESTechnologyType">
-				<xs:annotation>
-					<xs:documentation>P183</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PneumaticSystemTechnology" type="vdecdef:AuxPSTechnologyType">
-				<xs:annotation>
-					<xs:documentation>P184</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="HVACTechnology" type="vdecdef:AuxHVACTechnologyType">
-				<xs:annotation>
-					<xs:documentation>P185</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TorqueLimitsEntryType">
-		<xs:attribute name="gear" type="vdecdef:GearboxGearNumberType" use="required"/>
-		<xs:attribute name="torqueLimit" type="vdecdef:TorqueLimitEntryMaxTorqueType" use="required"/>
-	</xs:complexType>
-	<xs:complexType name="TorqueLimitsType">
-		<xs:sequence>
-			<xs:element name="Entry" type="TorqueLimitsEntryType"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="VehicleType">
-		<xs:sequence>
-			<xs:element name="VIN">
-				<xs:annotation>
-					<xs:documentation>P238</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VehicleCategory" type="vdecdef:LegislativeClassDeclarationType">
-				<xs:annotation>
-					<xs:documentation>P251</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="VehicleGroup" type="VehicleGroupType">
-				<xs:annotation>
-					<xs:documentation>VECTO</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="AxleConfiguration" type="vdecdef:VehicleAxleConfigurationDeclarationType">
-				<xs:annotation>
-					<xs:documentation>P037</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="GrossVehicleMass" type="vdecdef:VehicleGrossVehicleMassType">
-				<xs:annotation>
-					<xs:documentation>P041</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="CurbMassChassis" type="vdecdef:VehicleCurbMassChassisType">
-				<xs:annotation>
-					<xs:documentation>P038</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="RetarderType" type="vdecdef:RetarderTypeType">
-				<xs:annotation>
-					<xs:documentation>P052</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="PTO" type="xs:boolean">
-				<xs:annotation>
-					<xs:documentation>P247</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="TorqueLimits" type="TorqueLimitsType"/>
-			<xs:element name="Components">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Engine" type="EngineType"/>
-						<xs:element name="Gearbox" type="GearboxType"/>
-						<xs:element name="Torqueconverter" type="ComponentDescriptionType" minOccurs="0"/>
-						<xs:element name="Retarder" type="RetarderType" minOccurs="0"/>
-						<xs:element name="Angledrive" type="AngledriveType" minOccurs="0"/>
-						<xs:element name="Axlegear" type="AxlegearType"/>
-						<xs:element name="Airdrag" type="AirdragType"/>
-						<xs:element name="AxleWheels" type="AxleWheelsType"/>
-						<xs:element name="Auxiliaries" type="AuxiliariesType"/>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="SimulationParametersType">
+	<xs:simpleType name="ComputationModeType" final="restriction">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="declaration"/>
+			<xs:enumeration value="engineering"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="ComponentDataType" final="restriction">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Vehicle"/>
+			<xs:enumeration value="Engine"/>
+			<xs:enumeration value="Gearbox"/>
+			<xs:enumeration value="Axlegear"/>
+			<xs:enumeration value="Retarder"/>
+			<xs:enumeration value="AxleWheels"/>
+			<xs:enumeration value="Auxiliaries"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AxleTypeType" final="restriction">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="VehicleNonDriven"/>
+			<xs:enumeration value="VehicleDriven"/>
+			<xs:enumeration value="Trailer"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="dateTimeWithTimezone">
+		<xs:restriction base="xs:dateTime">
+			<xs:pattern value=".+T.+(Z|[+-].+)"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="FuelConsumptionResultsType">
 		<xs:sequence>
-			<xs:element name="Payload">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="MassUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TotalVehicleMass">
+			<xs:element name="FuelConsumption" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="MassUnitType" use="required"/>
+							<xs:attribute name="unit" use="required"/>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="FuelType" type="vdecdef:FuelTypeType"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="VehiclePerformanceType">
+	<xs:complexType name="CO2ResultsType">
 		<xs:sequence>
-			<xs:element name="AverageSpeed">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MinSpeed">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MaxSpeed">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="SpeedUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MaxDeceleration">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="MaxAcceleration">
+			<xs:element name="CO2" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="AccelerationUnitType" use="required"/>
+							<xs:attribute name="unit" use="required"/>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="FullLoadDrivingtimePercentage">
-				<xs:simpleType>
-					<xs:restriction base="xs:double">
-						<xs:minInclusive value="0"/>
-						<xs:maxInclusive value="100"/>
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="GearShiftCount" type="xs:int"/>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="ResultType">
+	<xs:complexType name="SimulationRunType">
 		<xs:sequence>
-			<xs:element name="Mission" type="MissionTypeType"/>
-			<xs:element name="Distance">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="DistanceUnitType" use="required"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="SimulationParameters" type="SimulationParametersType"/>
-			<xs:element name="VehiclePerformance" type="VehiclePerformanceType"/>
-			<xs:element name="FuelConsumption" maxOccurs="unbounded">
+			<xs:element name="DrivingCycle" type="xs:token"/>
+			<xs:element name="Loading">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="FuelConsumptionUnitType" use="required"/>
+							<xs:attribute name="unit" use="required">
+								<xs:simpleType>
+									<xs:restriction base="xs:string">
+										<xs:enumeration value="kg"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="CO2" maxOccurs="unbounded">
+			<xs:element name="FuelConsumptionResults" type="FuelConsumptionResultsType"/>
+			<xs:element name="CO2Results" type="CO2ResultsType"/>
+			<xs:element name="AvgSpeed">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="xs:double">
-							<xs:attribute name="unit" type="CO2UnitType" use="required"/>
+							<xs:attribute name="unit" type="xs:string" use="required"/>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
-	<xs:complexType name="VectoOutputDataType">
+	<xs:complexType name="DeclarationReportType">
 		<xs:sequence>
-			<xs:element name="Vehicle" type="VehicleType"/>
-			<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
-			<xs:element name="Results">
+			<xs:element name="AppVersion"/>
+			<xs:element name="Date"/>
+			<xs:element name="Vehicle">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="Result" type="ResultType" maxOccurs="unbounded"/>
+						<xs:group ref="ComponentDataGroup"/>
+						<xs:sequence>
+							<xs:element name="Components">
+								<xs:complexType>
+									<xs:sequence>
+										<xs:element name="Component" type="VehicleComponentDataType" maxOccurs="unbounded"/>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
 					</xs:sequence>
+					<xs:attribute name="id" type="xs:string" use="required"/>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="ApplicationInformation">
+			<xs:element name="SignatureVerification" minOccurs="0"/>
+			<xs:element name="SimulationResults">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="SimulationToolVersion"/>
-						<xs:element name="Date"/>
+						<xs:element name="SimulationRun" type="SimulationRunType" maxOccurs="unbounded"/>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="id" use="required"/>
+		<xs:attribute name="id" type="xs:string" use="required"/>
+	</xs:complexType>
+	<xs:complexType name="VectoOutputType">
+		<xs:sequence>
+			<xs:element name="DeclarationReport" type="DeclarationReportType"/>
+			<xs:element name="Signature"/>
+		</xs:sequence>
+		<xs:attribute name="type" type="ComputationModeType" use="required"/>
+	</xs:complexType>
+	<xs:group name="ComponentDataGroup">
+		<xs:sequence>
+			<xs:element name="Vendor"/>
+			<xs:element name="MakeAndModel"/>
+			<xs:element name="TypeId"/>
+			<xs:element name="ComponentDataHash" type="xs:string" minOccurs="0"/>
+		</xs:sequence>
+	</xs:group>
+	<xs:complexType name="PowertrainCompontentType">
+		<xs:complexContent>
+			<xs:extension base="VehicleComponentDataType">
+				<xs:group ref="ComponentDataGroup"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:complexType name="AxleWheelsType">
+		<xs:sequence>
+			<xs:element name="Dimension"/>
+			<xs:group ref="ComponentDataGroup"/>
+		</xs:sequence>
+		<xs:attribute name="twinTyres" type="xs:boolean" use="required"/>
+		<xs:attribute name="axleType" type="AxleTypeType" use="required"/>
+	</xs:complexType>
+	<xs:complexType name="AuxiliariesType">
+		<xs:attribute name="name" type="xs:string" use="required"/>
+		<xs:attribute name="technology" type="xs:string" use="required"/>
+	</xs:complexType>
+	<xs:attributeGroup name="ComponentAttributesGroup">
+		<xs:attribute name="type" type="ComponentDataType" use="required"/>
+		<xs:attribute name="id" type="xs:string" use="required"/>
+	</xs:attributeGroup>
+	<xs:complexType name="VehicleComponentDataType">
+		<xs:choice>
+			<xs:group ref="ComponentDataGroup"/>
+			<xs:sequence>
+				<xs:element name="Axle" type="AxleWheelsType" minOccurs="2" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:sequence minOccurs="5" maxOccurs="5">
+				<xs:element name="Auxiliary" type="AuxiliariesType"/>
+			</xs:sequence>
+		</xs:choice>
+		<xs:attributeGroup ref="ComponentAttributesGroup"/>
 	</xs:complexType>
-	<xs:simpleType name="VehicleGroupType">
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="1"/>
-			<xs:maxInclusive value="16"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AirdragCertificationOptionType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Measured"/>
-			<xs:enumeration value="Standard values"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="SpeedUnitType">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="km/h"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="AccelerationUnitType">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="m/s²"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="MassUnitType">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="kg"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="DistanceUnitType">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="km"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="FuelConsumptionUnitType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="g/km"/>
-			<xs:enumeration value="g/t-km"/>
-			<xs:enumeration value="g/p-km"/>
-			<xs:enumeration value="g/m³-km"/>
-			<xs:enumeration value="l/100km"/>
-			<xs:enumeration value="l/t-km"/>
-			<xs:enumeration value="l/p-km"/>
-			<xs:enumeration value="l/m³-km"/>
-			<xs:enumeration value="MJ/km"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="CO2UnitType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="g/km"/>
-			<xs:enumeration value="g/t-km"/>
-			<xs:enumeration value="g/p-km"/>
-			<xs:enumeration value="g/m³-km"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="MissionTypeType">
-		<xs:restriction base="xs:token">
-			<xs:enumeration value="Long Haul"/>
-			<xs:enumeration value="Regional Delivery"/>
-			<xs:enumeration value="Urban Delivery"/>
-			<xs:enumeration value="Municipal Utility"/>
-			<xs:enumeration value="Construction"/>
-		</xs:restriction>
-	</xs:simpleType>
 </xs:schema>
diff --git a/VectoCore/VectoXML.spp b/VectoCore/VectoXML.spp
index c06a8df0da684f3f7c91e62a29aecc68ab7c228c..38112e2e50ce56c8ec95b93ee5b86f8bc82f0e1a 100644
--- a/VectoCore/VectoXML.spp
+++ b/VectoCore/VectoXML.spp
@@ -10,14 +10,22 @@
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_job-sample_ref.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_retarder-sample_ref.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderEngineering\engineering_vehicle_ref.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding ISO 8859-15.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding UTF-16 BE BOM.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding UTF-16 LE.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding UTF-8 BOM.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding UTF-8.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample Encoding windows-1292.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_engine-sample.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_engine-sample_Whitespaces.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_gearbox-sample.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample.xml" HomeFolder="Yes"/>
 		<File FilePath="VectoCoreTest\TestData\XML\XMLReaderDeclaration\vecto_vehicle-sample_FULL.xml" HomeFolder="Yes"/>
+		<File FilePath="VectoCoreTest\TestData\XML\Hashing\vecto_vehicle-sample_FULL_Entry_Order.xml" HomeFolder="Yes"/>
 	</Folder>
 	<Folder FolderName="XSL Files" ExtStr="xsl;xslt">
 		<File FilePath="E:\QUAM\Workspace\VECTO_API\API\RenderTable.xslt" HomeFolder="Yes"/>
-		<File FilePath="E:\QUAM\Workspace\VECTO_API\API\XSD\SortInputData.xslt" HomeFolder="Yes"/>
+		<File FilePath="E:\QUAM\Workspace\VECTO_quam\VectoCommon\VectoHashing\Resources\XSLT\SortInputData.xslt" HomeFolder="Yes"/>
 	</Folder>
 	<Folder FolderName="XQuery Files" ExtStr="xq;xql;xquery;xqu"/>
 	<Folder FolderName="HTML Files" ExtStr="html;htm;xhtml;asp"/>