diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index f8a7ecfb0897ea318bbe4f2cc984ee391e898f11..57faab2c4c2c0dfb7c09ab9d23fbd7f145d9fb45 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -609,6 +609,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+    <VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
 			<v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index 9e78863358126b7f4bf414095decf0c2fed06ca1..3a0a0231c228c8c35a944413a0fe77cdd7dbba9a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -32,6 +32,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<AirDrag>
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 92eac018358bc848e6d6298232b37af2830eec1a..45845205323b0939964b38b07e0dcfad7839ac0e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -32,6 +32,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>mixed</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<AirDrag>
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
index 6422345a377266bf8042973f7e2af7a2b0835b46..6ed0ab0bacb8806a7b9e8703e9699fbe3cd39945 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
@@ -31,6 +31,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<AirDrag>
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index ee0bce9b6ec425823a0d84ae3232a33eaeff3387..1430acaca45542e9105a056871ad119908aff909 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -31,6 +31,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+		<VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<AirDrag>
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index f8a7ecfb0897ea318bbe4f2cc984ee391e898f11..57faab2c4c2c0dfb7c09ab9d23fbd7f145d9fb45 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -609,6 +609,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 		<EntranceHeight>120</EntranceHeight>
 		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
 		<VehicleDeclarationType>final</VehicleDeclarationType>
+    <VehicleTypeApprovalNumber>1234567890</VehicleTypeApprovalNumber>
 		<Components xsi:type="CompletedVehicleComponentsDeclarationType">
 			<v2.8:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
 				<Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">