diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd
index 2bf47a0b6ff0a5c84d919c9f363888e1875a5033..77af14737f91e70a66bdbc8e0c6c46e1e707c60d 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd
@@ -8,14 +8,98 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:choice>
-				<xs:element name="Engine" type="vdecdef:EngineComponentDeclarationType"/>
-				<xs:element name="Gearbox" type="vdecdef:GearboxComponentDeclarationType"/>
-				<xs:element name="Retarder" type="vdecdef:RetarderComponentDeclarationType"/>
-				<xs:element name="Axlegear" type="vdecdef:AxlegearComponentDeclarationType"/>
-				<xs:element name="Tyre" type="vdecdef:TyreDeclarationType"/>
+				<xs:element name="Engine">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:EngineComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="vdecdef:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P261 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Gearbox">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:GearboxComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P262 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Retarder">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:RetarderComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P266 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Axlegear">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:AxlegearComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P264 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Tyre">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:TyreDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P267 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
 				<xs:element name="Auxiliaries" type="vdecdef:AuxiliariesComponentDeclarationType"/>
-				<xs:element name="Angledrive" type="vdecdef:AngledriveComponentDeclarationType"/>
-				<xs:element name="AirDrag" type="vdecdef:AirDragComponentDeclarationType"/>
+				<xs:element name="Angledrive">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:AngledriveComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P265 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="AirDrag">
+					<xs:complexType>
+						<xs:complexContent>
+							<xs:extension base="vdecdef:AirDragComponentDeclarationType">
+								<xs:attribute name="certificationNumber" type="tns:CertificationNumberType">
+									<xs:annotation>
+										<xs:documentation>P268 - [-]</xs:documentation>
+									</xs:annotation>
+								</xs:attribute>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
 			</xs:choice>
 			<xs:attribute name="schemaVersion" use="required">
 				<xs:simpleType>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
index a3f68db38f2633b0a8094f1ed250bab962524ccc..0237237901ddd79942cb4e5c3a074eee6b97a289 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.0.8.xsd
@@ -242,7 +242,7 @@
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="tns:TyreDeclarationType">
-							<xs:attribute name="certificationNumber" type="tns:CertificationNumberType"  use="required">
+							<xs:attribute name="certificationNumber" type="tns:CertificationNumberType" use="required">
 								<xs:annotation>
 									<xs:documentation>P267 - [-]</xs:documentation>
 								</xs:annotation>