diff --git a/NeTEx.spp b/NeTEx.spp
index 9a936fdac..11d91fa2d 100644
--- a/NeTEx.spp
+++ b/NeTEx.spp
@@ -475,7 +475,6 @@
 				<File FilePath="xsd\netex_part_3\part3_parkingTariff\netex_parkingTariff_version.xsd" HomeFolder="Yes"/>
 			</Folder>
 			<Folder FolderName="netex_part_3_PiQuery">
-				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_all_objects_part3_piQuery.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_3\part3_PiQuery\netex_piRequest_support.xsd" HomeFolder="Yes"/>
 			</Folder>
 		</Folder>
@@ -578,8 +577,6 @@
 			<Folder FolderName="netex_part_5_NM_ND">
 				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_mobilityServiceConstraintZone_version.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_support.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_ParkingCapacityAssignment_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_support.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPlace_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_nd\netex_nm_vehicleMeetingPoint_support.xsd" HomeFolder="Yes"/>
@@ -613,10 +610,6 @@
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityJourneyFrame_version.xsd" HomeFolder="Yes"/>
 				<File FilePath="xsd\netex_part_5\part5_frames\netex_nm_mobilityServiceFrame_version.xsd" HomeFolder="Yes"/>
 			</Folder>
-			<Folder FolderName="netec_part5_NM_OC">
-				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_support.xsd" HomeFolder="Yes"/>
-				<File FilePath="xsd\netex_part_5\part5_oc\netex_oc_occupancy_version.xsd" HomeFolder="Yes"/>
-			</Folder>
 			<File FilePath="xsd\netex_part_5\netex_all_objects_part5_newModes.xsd" HomeFolder="Yes"/>
 		</Folder>
 		<Folder FolderName="netex_service">
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
index 5cf2cfef3..05d94c833 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
@@ -307,11 +307,11 @@ Rail transport, Roads and Road transport
 	</xsd:element>
 	<xsd:complexType name="AllOrganisationsRefStructure">
 		<xsd:annotation>
-			<xsd:documentation>Type for a reference tto all oranisationsORGANISATION.</xsd:documentation>
+			<xsd:documentation>Type for a reference to all ORGANISATIONs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleContent>
 			<xsd:restriction base="VersionOfObjectRefStructure">
-				<xsd:attribute name="ref" type="OrganisationIdType" use="required" fixed="All">
+				<xsd:attribute name="ref" type="OrganisationIdType" use="required">
 					<xsd:annotation>
 						<xsd:documentation>Identifier of an ORGANISATION.</xsd:documentation>
 					</xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
index d449150fd..792c1a8e0 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
@@ -1383,13 +1383,7 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:simpleContent>
-				<xsd:restriction base="AllCountriesRefStructure">
-					<xsd:attribute name="ref" type="TypeOfValueIdType" use="required">
-						<xsd:annotation>
-							<xsd:documentation>Iso 3166-1 Two Character country code.</xsd:documentation>
-						</xsd:annotation>
-					</xsd:attribute>
-				</xsd:restriction>
+				<xsd:restriction base="AllCountriesRefStructure"/>
 			</xsd:simpleContent>
 		</xsd:complexType>
 	</xsd:element>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
index 6952a71af..62d08726a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
@@ -32,8 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
- <Copyright>CEN, Crown Copyright 2009-2020</Copyright>
-				</Rights>
+ <Copyright>CEN, Crown Copyright 2009-2020</Copyright></Rights>
 				<Source>
 					<ul>
 						<li>Derived from the SIRI standards.</li>
@@ -67,34 +66,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleContent>
-			<xsd:restriction base="AllOrganisationsRefStructure">
-				<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="ref" type="OrganisationIdType" use="required">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
-			</xsd:restriction>
+			<xsd:extension base="AllOrganisationsRefStructure"/>
 		</xsd:simpleContent>
 	</xsd:complexType>
 	<xsd:group name="OneOrAllTransportOrganisationsRefGroup">
@@ -176,34 +148,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Type for a reference to all TRANSPORT ORGANISATIONs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleContent>
-			<xsd:restriction base="AllTransportOrganisationsRefStructure">
-				<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="ref" type="OrganisationIdType" use="required">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
-			</xsd:restriction>
+			<xsd:extension base="AllTransportOrganisationsRefStructure"/>
 		</xsd:simpleContent>
 	</xsd:complexType>
 	<xsd:simpleType name="OperatorIdType">
@@ -262,34 +207,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Type for a reference to all OPERATORss.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:simpleContent>
-			<xsd:restriction base="AllAuthoritiesRefStructure">
-				<xsd:attribute name="nameOfRefClass" type="NameOfClass" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="modification" type="ModificationEnumeration" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="ref" type="OrganisationIdType" use="required">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attribute name="uri" type="xsd:anyURI" use="optional">
-					<xsd:annotation>
-						<xsd:documentation>Location of the external entity. +v2.0</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
-				<xsd:attributeGroup ref="ReferenceModificationDetailsGroup"/>
-			</xsd:restriction>
+			<xsd:extension base="AllAuthoritiesRefStructure"/>
 		</xsd:simpleContent>
 	</xsd:complexType>
 	<xsd:group name="OneOrAllOperatorsRefGroup">
@@ -315,7 +233,7 @@ Rail transport, Roads and Road transport
 		<xsd:complexType>
 			<xsd:simpleContent>
 				<xsd:restriction base="AuthorityRefStructure">
-					<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" default="Authority" use="optional">
+					<xsd:attribute name="nameOfRefClass" type="NameOfClassAuthorityRefStructureType" use="optional" default="Authority">
 						<xsd:annotation>
 							<xsd:documentation>Name of Class of the referenced entity. Allows reflection. Fixed for each entity type.</xsd:documentation>
 						</xsd:annotation>
@@ -401,11 +319,6 @@ Rail transport, Roads and Road transport
 						<xsd:documentation>Nature of last modification: new, revise, delete, unchanged.</xsd:documentation>
 					</xsd:annotation>
 				</xsd:attribute>
-				<xsd:attribute name="ref" type="OrganisationIdType" use="required">
-					<xsd:annotation>
-						<xsd:documentation>Identifier of referenced entity.</xsd:documentation>
-					</xsd:annotation>
-				</xsd:attribute>
 				<xsd:attribute name="versionRef" type="VersionIdType" use="optional">
 					<xsd:annotation>
 						<xsd:documentation>Identifier of version of referenced entity. For use when reference is External and a specific version is required. Mutually exclusive with version</xsd:documentation>
@@ -653,9 +566,9 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Reference to a TRANSPORT ADMINISTRATIVE ZONE.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
-			<xsd:complexContent>
+			<xsd:simpleContent>
 				<xsd:extension base="TransportAdministrativeZoneRefStructure"/>
-			</xsd:complexContent>
+			</xsd:simpleContent>
 		</xsd:complexType>
 	</xsd:element>
 	<xsd:complexType name="TransportAdministrativeZoneRefStructure">
diff --git a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd
index cf9e8ed5d..bcb46e83f 100644
--- a/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd
+++ b/xsd/netex_part_5/part5_fm/netex_nm_accessCredentialsAssignment_version.xsd
@@ -4,6 +4,7 @@
 	<xsd:include schemaLocation="../part5_rc/netex_nm_mobilityService_support.xsd"/>
 	<xsd:include schemaLocation="../part5_nd/netex_nm_vehicleMeetingPlace_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_mediumApplication_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_travelDocument_version.xsd"/>
diff --git a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd
index f5e724270..391e348f2 100644
--- a/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd
+++ b/xsd/netex_part_5/part5_fm/netex_nm_individualTraveller_version.xsd
@@ -3,6 +3,7 @@
 	<xsd:include schemaLocation="netex_nm_individualTraveller_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicle_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->