diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 2b097e7dc9f7710a506a6302a6ae091488ff24d6..a0c97fca75c4fb851de36560b15d2ec4b48521ff 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -102,7 +102,7 @@
 					<xs:element name="VIN" type="v1.0:VINType"/>
 					<xs:element name="Date" type="v1.0:DateTimeWithTimezone"/>
 					<xs:element name="LegislativeClass" type="v2.6:LegislativeClassDeclarationType"/>
-					<xs:element name="RegisteredClass">
+					<xs:element name="ClassBus">
 						<xs:simpleType>
 							<xs:restriction base="v2.6:RegisteredClassType">
 								<xs:enumeration value="I"/>
@@ -537,6 +537,13 @@
 					<xs:element name="ADAS" type="v2.1:AbstractAdvancedDriverAssistantSystemsType"/>
 					<xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/>
 					<xs:element name="Components" type="v2.0:AbstractVehicleComponentsDeclarationType"/>
+					<xs:element name="CargoVolume" minOccurs="0">
+						<xs:simpleType>
+							<xs:restriction base="xs:double">
+								<xs:minExclusive value="0"/>
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:element>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -589,6 +596,7 @@
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="electric"/>
 			<xs:enumeration value="pneumatic"/>
+			<xs:enumeration value="mixed"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="HVACTechnology">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
index 105dbe8412175f9e76c2d79ccc836e14739e0737..4948d5c58ece856340d1771937158c43ad996d79 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.8.xsd
@@ -566,6 +566,8 @@
 										<xs:documentation>P252 / II.1.1.6</xs:documentation>
 									</xs:annotation>
 								</xs:element>
+								<xs:element name="InputDataSignature" type="vdecdef:SignatureType"/>
+								<xs:element name="ManufacturerRecordSignature" type="vdecdef:SignatureType"/>
 							</xs:sequence>
 						</xs:complexType>
 					</xs:element>
@@ -674,24 +676,11 @@
 						</xs:annotation>
 					</xs:element>
 					<xs:element name="RegisteredPassengers">
-						<xs:complexType>
-							<xs:sequence>
-								<xs:element name="LowerDeck">
-									<xs:simpleType>
-										<xs:restriction base="xs:int">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-								<xs:element name="UpperDeck">
-									<xs:simpleType>
-										<xs:restriction base="xs:int">
-											<xs:minInclusive value="0"/>
-										</xs:restriction>
-									</xs:simpleType>
-								</xs:element>
-							</xs:sequence>
-						</xs:complexType>
+						<xs:simpleType>
+							<xs:restriction base="xs:int">
+								<xs:minInclusive value="0"/>
+							</xs:restriction>
+						</xs:simpleType>
 					</xs:element>
 					<xs:element name="LowEntry" type="xs:boolean"/>
 					<xs:element name="HeightIntegratedBody">
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index d3b90e3a46ce6e1579851a5194ac321ef92b831c..bad79f3186a2a0adffef95953213416dc8f2da60 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -906,8 +906,8 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Declaration\CompletedBusSegmentationTable.csv" />
-    <EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_CI_Normed.vmap" />
-    <EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_PI_Normed.vmap" />
+    <EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_CI_normalized.vmap" />
+    <EmbeddedResource Include="Resources\Declaration\GenericBusData\EngineConsumptionMap_PI_normalized.vmap" />
     <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-AxleFactor.csv" />
     <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Axles_Bus.csv" />
     <EmbeddedResource Include="Resources\Declaration\VAUXBus\SP-Factors_Bus.csv" />