diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 36295f6d9..8336e803a 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -419,28 +419,6 @@ Correct COnstraints for PointOnRoute
 			<xsd:selector xpath=".//netex:Entity_Entity"/>
 			<xsd:field xpath="@id"/>
 		</xsd:key>
-		<!-- =====TypeOfEntity============================== -->
-		<!-- =====TypeOfEntity unique========================== -->
-		<xsd:unique name="TypeOfEntity_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [TypeOfEntity Id + TypeOfEntity] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:TypeOfEntity"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====TypeOfEntity============================== -->
-		<xsd:keyref name="TypeOfEntity_AnyKeyRef" refer="netex:TypeOfEntity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfEntityRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<!-- =====TypeOfEntity Key ========================== -->
-		<xsd:key name="TypeOfEntity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfEntity"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====Version============================== -->
 		<!-- =====Version unique========================== -->
 		<xsd:unique name="Version_UniqueBy_Id_Version">
@@ -945,7 +923,7 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Link_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Link | .//netex:RouteLink | .//netex:TimingLink | .//netex:PathLink | .//netex:ServiceLink | .//netex:RoadElement | .//netex:RailwayElement | .//netex:WireElement | .//netex:ActivationLink"/>
+			<xsd:selector xpath=".//netex:RouteLink | .//netex:TimingLink | .//netex:PathLink | .//netex:ServiceLink | .//netex:RoadElement | .//netex:RailwayElement | .//netex:WireElement | .//netex:ActivationLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -983,7 +961,7 @@ Correct COnstraints for PointOnRoute
 		</xsd:unique>
 		<!-- =====PointOnLink Key ========================== -->
 		<xsd:keyref name="PointOnLink_AnyKeyRef" refer="netex:PointOnLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOnLinkRef | .//netex:StartPointOnLinkRef | .//netex:EndPointOnLinkRef"/>
+			<xsd:selector xpath=".//netex:StartPointOnLinkRef | .//netex:EndPointOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1125,7 +1103,7 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Zone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace | .//netex:Garage | .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay | .//netex:StopPlaceEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:VehicleEntrance | .//netex:TaxiRank | .//netex:TaxiStand | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
+			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace | .//netex:Garage | .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay | .//netex:StopPlaceEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:TaxiRank | .//netex:TaxiStand | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1298,17 +1276,6 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====GroupOfLinkSequences Key ========================== -->
-		<xsd:keyref name="GroupOfLinkSequences_KeyRef" refer="netex:GroupOfLinkSequences_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfLinkSequencesRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="GroupOfLinkSequences_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfLinkSequences"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SimpleFeature============================== -->
 		<!-- =====SimpleFeature unique========================== -->
 		<xsd:unique name="SimpleFeature_UniqueBy_Id_Version">
@@ -3400,7 +3367,7 @@ Correct COnstraints for PointOnRoute
 			</xsd:keyref>
 
 			<xsd:key name="Object_AnyVersionedKey">
-				<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame | .//netex:DriverScheduleFrame | .//netex:FareFrame | .//netex:RailwayJunction | .//netex:RoadJunction | .//netex:WireJunction|.//netex:ReliefPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:ScheduledStopPoint | .//netex:TimingPoint | .//netex:ActivationPoint | .//netex:BeaconPoint | .//netex:RoutePoint | .//netex:TrafficControlPoint | .//netex:Place | .//netex:StopPlace | .//netex:ServiceSite | .//netex:TopographicPlace | .//netex:PointOfInterest | .//netex:Parking | .//netex:EquipmentPlace | .//netex:FlexibleStopPlace | .//netex:AccessZone | .//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress | .//netex:Quay | .//netex:AccessSpace | .//netex:BoardingPosition | .//netex:StopArea | .//netex:HailAndRideArea | .//netex:FlexibleArea | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleEntrance | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea | .//netex:AdministrativeZone | .//netex:Country | .//netex:RoutingConstraintZone | .//netex:ActivationLink | .//netex:TimingLink | .//netex:ServiceLink | .//netex:Connection | .//netex:Access | .//netex:NavigationPath | .//netex:PathJunction | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:ServiceJourney | .//netex:TemplateServiceJourney | .//netex:TemplateServiceJourney | .//netex:SpecialService | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney | .//netex:TimingPattern | .//netex:Operator | .//netex:GroupOfOperators | .//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation | .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line | .//netex:GroupOfLines | .//netex:Garage | .//netex:Crewbase | .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern | .//netex:GroupOfServices"/>
+				<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame | .//netex:DriverScheduleFrame | .//netex:FareFrame | .//netex:RailwayJunction | .//netex:RoadJunction | .//netex:WireJunction|.//netex:ReliefPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:ScheduledStopPoint | .//netex:TimingPoint | .//netex:ActivationPoint | .//netex:BeaconPoint | .//netex:RoutePoint | .//netex:TrafficControlPoint | .//netex:Place | .//netex:StopPlace | .//netex:ServiceSite | .//netex:TopographicPlace | .//netex:PointOfInterest | .//netex:Parking | .//netex:EquipmentPlace | .//netex:FlexibleStopPlace | .//netex:AccessZone | .//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress | .//netex:Quay | .//netex:AccessSpace | .//netex:BoardingPosition | .//netex:StopArea | .//netex:HailAndRideArea | .//netex:FlexibleArea | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea | .//netex:AdministrativeZone | .//netex:Country | .//netex:RoutingConstraintZone | .//netex:ActivationLink | .//netex:TimingLink | .//netex:ServiceLink | .//netex:Connection | .//netex:Access | .//netex:NavigationPath | .//netex:PathJunction | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:ServiceJourney | .//netex:TemplateServiceJourney | .//netex:TemplateServiceJourney | .//netex:SpecialService | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney | .//netex:TimingPattern | .//netex:Operator | .//netex:GroupOfOperators | .//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation | .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line | .//netex:GroupOfLines | .//netex:Garage | .//netex:Crewbase | .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern | .//netex:GroupOfServices"/>
 				<xsd:field xpath="@id"/>
 				<xsd:field xpath="@version"/>
 			</xsd:key>  -->
@@ -5156,7 +5123,7 @@ Correct COnstraints for PointOnRoute
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructurePoint Key ========================== -->
 		<xsd:keyref name="InfrastructurePoint_KeyRef" refer="netex:InfrastructurePoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructurePointRef | .//netex:OvertakingAtPointRef"/>
+			<xsd:selector xpath=".//netex:OvertakingAtPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5168,7 +5135,7 @@ Correct COnstraints for PointOnRoute
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructureLink Key ========================== -->
 		<xsd:keyref name="InfrastructureLink_KeyRef" refer="netex:InfrastructureLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructureLinkRef | .//netex:OvertakingOnLinkRef"/>
+			<xsd:selector xpath=".//netex:OvertakingOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -6887,15 +6854,6 @@ Correct COnstraints for PointOnRoute
 		<!-- =====JOURNEY Constraints========================= -->
 		<!-- ===== Journey================== -->
 		<!-- =====Journey unique========================== -->
-		<xsd:unique name="Journey_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [Journey Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:Journey"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====Journey unique========================== -->
 		<xsd:unique name="VehicleJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [VehicleJourney Id + Version] must be unique within document.</xsd:documentation>
@@ -6930,7 +6888,7 @@ Correct COnstraints for PointOnRoute
 		</xsd:unique>
 		<!-- =====Journey Key ========================== -->
 		<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
+			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -7180,15 +7138,6 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@order"/>
 		</xsd:key>
 		<!-- =====JourneyFrequencyGroup============================== -->
-		<!-- =====JourneyFrequencyGroup unique========================== -->
-		<xsd:unique name="JourneyFrequencyGroup_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [JourneyFrequencyGroup Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
 		<!-- =====JourneyFrequencyGroup Key ========================== -->
 		<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>
@@ -8193,19 +8142,6 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:unique>
-		<!-- =====FareElementInSequence Key ========================== -->
-		<xsd:keyref name="FareElementInSequence_KeyRef" refer="netex:FareElementInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FareElementInSequenceRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-			<xsd:field xpath="@order"/>
-		</xsd:keyref>
-		<xsd:key name="FareElementInSequence_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FareElementInSequence"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-			<xsd:field xpath="@order"/>
-		</xsd:key>
 		<!-- =====TypeOfFareStructureElement============================== -->
 		<!-- =====TypeOfFareStructureElement unique========================== -->
 		<xsd:unique name="TypeOfFareStructureElement_UniqueBy_Id_Version">
@@ -8430,7 +8366,7 @@ Correct COnstraints for PointOnRoute
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="FarePrice_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FarePrice | .//netex:FareProductPrice | .//netex:CappingRulePrice | .//netex:UsageParameterPrice | .//netex:FareStructureElementPrice | .//netex:ValidableElementPrice | .//netex:ControllableElementPrice | .//netex:DistanceMatrixElementPrice | .//netex:SeriesConstraintPrice | .//netex:GeographicalIntervalPrice | .//netex:TimeIntervalPrice | .//netex:SalesOfferPackagePrice | .//netex:FulfilmentMethodPrice | .//netex:QualityStructureFactorPrice | .//netex:ParkingPrice"/>
+			<xsd:selector xpath=".//netex:FareProductPrice | .//netex:CappingRulePrice | .//netex:UsageParameterPrice | .//netex:FareStructureElementPrice | .//netex:ValidableElementPrice | .//netex:ControllableElementPrice | .//netex:DistanceMatrixElementPrice | .//netex:SeriesConstraintPrice | .//netex:GeographicalIntervalPrice | .//netex:TimeIntervalPrice | .//netex:SalesOfferPackagePrice | .//netex:FulfilmentMethodPrice | .//netex:QualityStructureFactorPrice | .//netex:ParkingPrice"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index 1183256df..01c68f809 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -342,12 +342,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====TypeOfEntity============================== -->
-		<xsd:keyref name="TypeOfEntity_AnyKeyRef" refer="netex:TypeOfEntity_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TypeOfEntityRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
 		<!-- =====TypeOfEntity Key ========================== -->
 		<xsd:key name="TypeOfEntity_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:TypeOfEntity"/>
@@ -817,7 +811,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Link_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Link | .//netex:RouteLink | .//netex:TimingLink | .//netex:PathLink | .//netex:ServiceLink | .//netex:RoadElement | .//netex:RailwayElement | .//netex:WireElement | .//netex:ActivationLink"/>
+			<xsd:selector xpath=".//netex:RouteLink | .//netex:TimingLink | .//netex:PathLink | .//netex:ServiceLink | .//netex:RoadElement | .//netex:RailwayElement | .//netex:WireElement | .//netex:ActivationLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -855,7 +849,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:unique>
 		<!-- =====PointOnLink Key ========================== -->
 		<xsd:keyref name="PointOnLink_AnyKeyRef" refer="netex:PointOnLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOnLinkRef |.//netex:StartPointOnLinkRef |.//netex:EndPointOnLinkRef"/>
+			<xsd:selector xpath=".//netex:StartPointOnLinkRef |.//netex:EndPointOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -984,7 +978,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Zone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone  | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace| .//netex:Garage| .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay| .//netex:StopPlaceEntance | .//netex:Entrance | .//netex:PointOfInterestEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:VehicleEntrance   | .//netex:TransportAdministrativeZone"/>
+			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone  | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace| .//netex:Garage| .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay| .//netex:StopPlaceEntance | .//netex:Entrance | .//netex:PointOfInterestEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:TransportAdministrativeZone"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1178,17 +1172,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<!-- =====GroupOfLinkSequences Key ========================== -->
-		<xsd:keyref name="GroupOfLinkSequences_KeyRef" refer="netex:GroupOfLinkSequences_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfLinkSequencesRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="GroupOfLinkSequences_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfLinkSequences"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====SimpleFeature============================== -->
 		<!-- =====SimpleFeature unique========================== -->
 		<xsd:unique name="SimpleFeature_UniqueBy_Id_Version">
@@ -1259,7 +1242,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Place_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Place | .//netex:TopographicPlace | .//netex:RoadAddress | .//netex:PostalAddress | .//netex:Garage | .//netex:StopPlace | .//netex:Quay | .//netex:BoardingPosition | .//netex:AccessSpace | .//netex:StopPlaceEntrance | .//netex:FlexibleStopPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:PointOfInterest | .//netex:PointOfInterestSpace | .//netex:PointOfInterestEntrance | .//netex:PathJunction | .//netex:SiteEntrance | .//netex:Parking | .//netex:ParkingBay | .//netex:ParkingArea | .//netex:VehicleStoppingPlace"/>
+			<xsd:selector xpath=".//netex:TopographicPlace | .//netex:RoadAddress | .//netex:PostalAddress | .//netex:Garage | .//netex:StopPlace | .//netex:Quay | .//netex:BoardingPosition | .//netex:AccessSpace | .//netex:StopPlaceEntrance | .//netex:FlexibleStopPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:PointOfInterest | .//netex:PointOfInterestSpace | .//netex:PointOfInterestEntrance | .//netex:PathJunction | .//netex:SiteEntrance | .//netex:Parking | .//netex:ParkingBay | .//netex:ParkingArea | .//netex:VehicleStoppingPlace"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1646,15 +1629,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====EQUIPMENT Constraints========================= -->
-		<!-- =====Equipment unique========================== -->
-		<xsd:unique name="Equipment_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [Equipment Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:Equipment"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
 		<!-- =====Equipment Key ========================== -->
 		<xsd:keyref name="Equipment_KeyRef" refer="netex:Equipment_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:EquipmentRef"/>
@@ -1662,7 +1636,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Equipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Equipment | .//netex:PlaceEquipment | .//netex:InstalledEquipment | .//netex:ActualVehicleEquipment | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment   | .//netex:SanitaryEquipment  | .//netex:PassengerSafetyEquipment | .//netex:RubbishDisposalEquipment    |.//netex:PassengerInformationEquipment   | .//netex:EntranceEquipment  | .//netex:LiftEquipment |  .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:StaircaseEquipment | .//netex:RampEquipment  | .//netex:RoughSurface  | .//netex:PlaceLighting|  .//netex:PlaceSign |  .//netex:PlaceSign | .//netex:HeadingSign  | .//netex:GeneralSign   |.//netex:WaitingRoomEquipment   | .//netex:ShelterEquipment  | .//netex:SeatingEquipment | .//netex:TrolleyStandEquipment      | .//netex:LuggageLockerEquipment  |  .//netex:CycleParkingEquipment    |.//netex:AccessVehicleEquipment    |.//netex:WheelchairVehicleEquipment"/>
+			<xsd:selector xpath=".//netex:TicketValidatorEquipment | .//netex:TicketingEquipment   | .//netex:SanitaryEquipment  | .//netex:PassengerSafetyEquipment | .//netex:RubbishDisposalEquipment    |.//netex:PassengerInformationEquipment   | .//netex:EntranceEquipment  | .//netex:LiftEquipment |  .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:StaircaseEquipment | .//netex:RampEquipment  | .//netex:RoughSurface  | .//netex:PlaceLighting|  .//netex:PlaceSign |  .//netex:PlaceSign | .//netex:HeadingSign  | .//netex:GeneralSign   |.//netex:WaitingRoomEquipment   | .//netex:ShelterEquipment  | .//netex:SeatingEquipment | .//netex:TrolleyStandEquipment | .//netex:CycleParkingEquipment    |.//netex:AccessVehicleEquipment    |.//netex:WheelchairVehicleEquipment"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1750,17 +1724,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====AccessEquipment============================ -->
-		<xsd:keyref name="AccessEquipment_AnyKeyRef" refer="netex:AccessEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AccessEquipmentRef"/>
-			<xsd:field xpath="@ref"/>
-			<xsd:field xpath="@version"/>
-		</xsd:keyref>
-		<xsd:key name="AccessEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:RampEquipment |.//netex:StaircaseEquipment   | .//netex:EscalatorEquipment  |  .//netex:TravelatorEquipment  | .//netex:RoughSurface | .//netex:PlaceLighting"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:key>
 		<!-- =====EntranceEquipment============================== -->
 		<!-- =====EntranceEquipment unique========================== -->
 		<xsd:unique name="EntranceEquipment_UniqueBy_Id_Version">
@@ -2297,16 +2260,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====LocalService Constraints========================= -->
-		<!-- =====LocalService unique========================== -->
-		<xsd:unique name="LocalService_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [LocalService Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:LocalService"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
 		<!-- =====LocalService Key ========================== -->
 		<xsd:keyref name="LocalService_KeyRef" refer="netex:LocalService_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:LocalServiceRef"/>
@@ -2314,7 +2267,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="LocalService_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:LocalService | .//netex:TicketingService | .//netex:AssistanceService |  .//netex:AssistanceBookingService | .//netex:LuggageService | .//netex:LeftLuggageService | .//netex:CustomerService | .//netex:ComplaintsService | .//netex:LostPropertyService | .//netex:MeetingPointService | .//netex:HireService | .//netex:MoneyService |.//netex:RetailService  |.//netex:CateringService  |.//netex:CommunicationService"/>
+			<xsd:selector xpath=".//netex:TicketingService | .//netex:AssistanceService |  .//netex:AssistanceBookingService | .//netex:LuggageService | .//netex:LeftLuggageService | .//netex:CustomerService | .//netex:ComplaintsService | .//netex:LostPropertyService | .//netex:MeetingPointService | .//netex:HireService | .//netex:MoneyService |.//netex:RetailService  |.//netex:CateringService  |.//netex:CommunicationService"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -2836,7 +2789,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:keyref>
 
 		<xsd:key name="Object_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame  | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame  |  .//netex:DriverScheduleFrame |.//netex:FareFrame | .//netex:RailwayJunction| .//netex:RoadJunction| .//netex:WireJunction|.//netex:ReliefPoint  |.//netex:GaragePoint  |.//netex:ParkingPoint  | .//netex:ScheduledStopPoint  | .//netex:TimingPoint  |.//netex:ActivationPoint  |.//netex:BeaconPoint  |.//netex:RoutePoint  | .//netex:TrafficControlPoint  |.//netex:Place |.//netex:StopPlace | .//netex:ServiceSite |  .//netex:TopographicPlace |.//netex:PointOfInterest  |.//netex:Parking  |  .//netex:EquipmentPlace  | .//netex:FlexibleStopPlace | .//netex:AccessZone |.//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress |  .//netex:Quay | .//netex:AccessSpace  | .//netex:BoardingPosition |  .//netex:StopArea | .//netex:HailAndRideArea |  .//netex:FlexibleArea |.//netex:VehicleStoppingPlace |  .//netex:VehicleStoppingPosition | .//netex:VehicleEntrance | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance |  .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea |   .//netex:AdministrativeZone | .//netex:Country |   .//netex:RoutingConstraintZone  |.//netex:ActivationLink  | .//netex:TimingLink  |  .//netex:ServiceLink | .//netex:Connection |.//netex:Access |  .//netex:NavigationPath |.//netex:PathJunction  | .//netex:VehicleJourney |  .//netex:DeadRun |.//netex:ServiceJourney |.//netex:TemplateServiceJourney |.//netex:TemplateServiceJourney | .//netex:SpecialService |.//netex:DatedVehicleJourney  |.//netex:NormalDatedVehicleJourney |  .//netex:TimingPattern |.//netex:Operator | .//netex:GroupOfOperators |.//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation |  .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line| .//netex:GroupOfLines |  .//netex:Garage | .//netex:Crewbase  |  .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern |.//netex:GroupOfServices"/>
+			<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame  | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame  |  .//netex:DriverScheduleFrame |.//netex:FareFrame | .//netex:RailwayJunction| .//netex:RoadJunction| .//netex:WireJunction|.//netex:ReliefPoint  |.//netex:GaragePoint  |.//netex:ParkingPoint  | .//netex:ScheduledStopPoint  | .//netex:TimingPoint  |.//netex:ActivationPoint  |.//netex:BeaconPoint  |.//netex:RoutePoint  | .//netex:TrafficControlPoint | .//netex:StopPlace | .//netex:ServiceSite |  .//netex:TopographicPlace |.//netex:PointOfInterest  |.//netex:Parking  |  .//netex:EquipmentPlace  | .//netex:FlexibleStopPlace | .//netex:AccessZone |.//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress |  .//netex:Quay | .//netex:AccessSpace  | .//netex:BoardingPosition |  .//netex:StopArea | .//netex:HailAndRideArea |  .//netex:FlexibleArea |.//netex:VehicleStoppingPlace |  .//netex:VehicleStoppingPosition | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance |  .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea |   .//netex:AdministrativeZone | .//netex:Country |   .//netex:RoutingConstraintZone  |.//netex:ActivationLink  | .//netex:TimingLink  |  .//netex:ServiceLink | .//netex:Connection |.//netex:Access |  .//netex:NavigationPath |.//netex:PathJunction  | .//netex:VehicleJourney |  .//netex:DeadRun |.//netex:ServiceJourney |.//netex:TemplateServiceJourney |.//netex:TemplateServiceJourney | .//netex:SpecialService |.//netex:DatedVehicleJourney  |.//netex:NormalDatedVehicleJourney |  .//netex:TimingPattern |.//netex:Operator | .//netex:GroupOfOperators |.//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation |  .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line| .//netex:GroupOfLines |  .//netex:Garage | .//netex:Crewbase  |  .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern |.//netex:GroupOfServices"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>  -->
@@ -3984,7 +3937,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructurePoint Key ========================== -->
 		<xsd:keyref name="InfrastructurePoint_KeyRef" refer="netex:InfrastructurePoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructurePointRef |.//netex:OvertakingAtPointRef"/>
+			<xsd:selector xpath=".//netex:OvertakingAtPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -3996,7 +3949,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructureLink Key ========================== -->
 		<xsd:keyref name="InfrastructureLink_KeyRef" refer="netex:InfrastructureLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructureLinkRef |.//netex:OvertakingOnLinkRef"/>
+			<xsd:selector xpath=".//netex:OvertakingOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5560,15 +5513,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		<!-- =====JOURNEY Constraints========================= -->
 		<!-- ===== Journey================== -->
 		<!-- =====Journey unique========================== -->
-		<xsd:unique name="Journey_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [Journey Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:Journey"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
-		<!-- =====Journey unique========================== -->
 		<xsd:unique name="VehicleJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [VehicleJourney Id + Version] must be unique within document.</xsd:documentation>
@@ -5603,7 +5547,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:unique>
 		<!-- =====Journey Key ========================== -->
 		<xsd:keyref name="Journey_KeyRef" refer="netex:Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef| .//netex:JourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
+			<xsd:selector xpath=".//netex:ServiceJourneyRef | .//netex:VehicleJourneyRef | .//netex:TemplateServiceJourneyRef | .//netex:DeadRunRef | .//netex:FromJourneyRef | .//netex:ToJourneyRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5745,15 +5689,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@order"/>
 		</xsd:key>
 		<!-- =====JourneyFrequencyGroup============================== -->
-		<!-- =====JourneyFrequencyGroup unique========================== -->
-		<xsd:unique name="JourneyFrequencyGroup_UniqueBy_Id_Version">
-			<xsd:annotation>
-				<xsd:documentation>Every [JourneyFrequencyGroup Id + Version] must be unique within document.</xsd:documentation>
-			</xsd:annotation>
-			<xsd:selector xpath=".//netex:JourneyFrequencyGroup"/>
-			<xsd:field xpath="@id"/>
-			<xsd:field xpath="@version"/>
-		</xsd:unique>
 		<!-- =====JourneyFrequencyGroup Key ========================== -->
 		<xsd:keyref name="JourneyFrequencyGroup_KeyRef" refer="netex:JourneyFrequencyGroup_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:JourneyFrequencyGroupRef"/>
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
index a72b6bcb4..b97f93ead 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
@@ -177,7 +177,7 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="ResponsibilityRole" abstract="true" substitutionGroup="DataManagedObject">
+	<xsd:element name="ResponsibilityRole" substitutionGroup="DataManagedObject">
 		<xsd:annotation>
 			<xsd:documentation>A particular role an ORGANISATION or an ORGANISATION PART is playing.  +v1.1</xsd:documentation>
 		</xsd:annotation>