diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index c9cc22867..0368019c8 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -347,7 +347,7 @@
 			<xsd:field xpath="@ref"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSourceRef_AnyKeyRef" refer="netex:DataSource_AnyKey">
-			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessEquipment | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareContractEntry_ | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceAccessRight_ | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelSpecification_ | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEntity | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection"/>
+			<xsd:selector xpath=".//netex:AlternativeName | .//netex:Codespace | .//netex:Access | .//netex:AccessEquipment | .//netex:AccessRightParameterAssignment | .//netex:AccessSpace | .//netex:AccessVehicleEquipment | .//netex:AccessZone | .//netex:AccountableElement | .//netex:ActivatedEquipment | .//netex:ActivationAssignment | .//netex:ActivationLink | .//netex:ActivationPoint | .//netex:AddressablePlace | .//netex:AdministrativeZone | .//netex:AllowedLineDirection | .//netex:AmountOfPriceUnitProduct | .//netex:AssistanceBookingService | .//netex:AssistanceService | .//netex:Authority | .//netex:AvailabilityCondition | .//netex:BeaconPoint | .//netex:Blacklist | .//netex:Block | .//netex:BlockPart | .//netex:BoardingPosition | .//netex:BorderPoint | .//netex:Branding | .//netex:Cancelling | .//netex:CappedDiscountRight | .//netex:CappingRule | .//netex:CateringService | .//netex:ChargingMoment | .//netex:ChargingPolicy | .//netex:CheckConstraint | .//netex:CheckConstraintDelay | .//netex:CheckConstraintThroughput | .//netex:ClassOfUse | .//netex:CommercialProfile | .//netex:CommonSection | .//netex:CommunicationService | .//netex:CompanionProfile | .//netex:ComplaintsService | .//netex:ComplexFeature | .//netex:ComplexFeatureProjection | .//netex:CompositeFrame | .//netex:CompoundBlock | .//netex:CompoundTrain | .//netex:Connection | .//netex:ControlCentre | .//netex:ControllableElement | .//netex:Country | .//netex:CoupledJourney | .//netex:CourseOfJourneys | .//netex:CrewBase | .//netex:CrossingEquipment | .//netex:Customer | .//netex:CustomerAccount | .//netex:CustomerAccountStatus | .//netex:CustomerPurchasePackage | .//netex:CustomerPurchasePackageElement | .//netex:CustomerPurchaseParameterAssignment | .//netex:CustomerService | .//netex:CycleStorageEquipment | .//netex:DatedServiceJourney | .//netex:DatedSpecialService | .//netex:DatedVehicleJourney | .//netex:DayType | .//netex:DayTypeAssignment | .//netex:DeadRun | .//netex:DeadRunJourneyPattern | .//netex:DefaultConnection | .//netex:DefaultInterchange | .//netex:DeliveryVariant | .//netex:Department | .//netex:DestinationDisplay | .//netex:DestinationDisplayVariant | .//netex:Direction | .//netex:DiscountingRule | .//netex:DisplayAssignment | .//netex:DistanceMatrixElement | .//netex:DistributionAssignment | .//netex:DistributionChannel | .//netex:DriverScheduleFrame | .//netex:DriverTrip | .//netex:DriverTripTime | .//netex:Duty | .//netex:DutyPart | .//netex:DynamicStopAssignment | .//netex:EligibilityChangePolicy | .//netex:EntitlementGiven | .//netex:EntitlementProduct | .//netex:EntitlementRequired | .//netex:Entrance | .//netex:EntranceEquipment | .//netex:EquipmentPlace | .//netex:EquipmentPosition | .//netex:EscalatorEquipment | .//netex:EstimatedPassingTimeView | .//netex:Exchanging | .//netex:FacilityRequirement | .//netex:FareContract | .//netex:FareContractEntry_ | .//netex:FareDayType | .//netex:FareDemandFactor | .//netex:FareFrame | .//netex:FareInterval | .//netex:FareQuotaFactor | .//netex:FareScheduledStopPoint | .//netex:FareSection | .//netex:FareStructureElement | .//netex:FareStructureFactor | .//netex:FareTable | .//netex:FareTableInContext | .//netex:FareUnit | .//netex:FareZone | .//netex:FlexibleArea | .//netex:FlexibleLine | .//netex:FlexibleQuay | .//netex:FlexibleRoute | .//netex:FlexibleServiceProperties | .//netex:FlexibleStopAssignment | .//netex:FlexibleStopPlace | .//netex:FrequencyOfUse | .//netex:FulfilmentMethod | .//netex:Garage | .//netex:GaragePoint | .//netex:GeneralFrame | .//netex:GeneralGroupOfEntities | .//netex:GeneralOrganisation | .//netex:GeneralSection | .//netex:GeneralSign | .//netex:GeneralZone | .//netex:GenericParameterAssignment | .//netex:GenericParameterAssignmentInContext | .//netex:GeographicalInterval | .//netex:GeographicalStructureFactor | .//netex:GeographicalUnit | .//netex:GroupOfDistanceMatrixElements | .//netex:GroupOfDistributionChannels | .//netex:GroupOfLines | .//netex:GroupOfLinkSequences | .//netex:GroupOfLinks | .//netex:GroupOfOperators | .//netex:GroupOfPlaces | .//netex:GroupOfPoints | .//netex:GroupOfSalesOfferPackages | .//netex:GroupOfServices | .//netex:GroupOfStopPlaces | .//netex:GroupOfTimebands | .//netex:GroupOfTimingLinks | .//netex:GroupTicket | .//netex:HailAndRideArea | .//netex:HeadingSign | .//netex:HeadwayJourneyGroup | .//netex:HelpPointEquipment | .//netex:HireService | .//netex:InfrastructureFrame | .//netex:InterchangeRule | .//netex:Interchanging | .//netex:JourneyAccounting | .//netex:JourneyMeeting | .//netex:JourneyPart | .//netex:JourneyPartCouple | .//netex:JourneyPattern | .//netex:Layer | .//netex:LeftLuggageService | .//netex:Level | .//netex:LiftEquipment | .//netex:LimitingRule | .//netex:LimitingRuleInContext | .//netex:Line | .//netex:LineNetwork | .//netex:LineSection | .//netex:LineShape | .//netex:LinkProjection | .//netex:LinkSequenceProjection | .//netex:LogicalDisplay | .//netex:LostPropertyService | .//netex:LuggageAllowance | .//netex:LuggageService | .//netex:ManagementAgent | .//netex:MeetingPointService | .//netex:MeetingRestriction | .//netex:MinimumStay | .//netex:MoneyService | .//netex:MonthValidityOffset | .//netex:NavigationPath | .//netex:NavigationPathAssignment | .//netex:Network | .//netex:NormalDatedVehicleJourney | .//netex:Notice | .//netex:NoticeAssignment | .//netex:ObservedPassingTimeView | .//netex:OfferedTravelSpecification | .//netex:OpenTransportMode | .//netex:OperatingDay | .//netex:OperatingDepartment | .//netex:OperatingPeriod | .//netex:OperationalContext | .//netex:Operator | .//netex:OrganisationDayType | .//netex:OrganisationPart | .//netex:OrganisationalUnit | .//netex:OtherOrganisation | .//netex:OtherPlaceEquipment | .//netex:OvertakingPossibility | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:ParkingChargeBand | .//netex:ParkingComponent | .//netex:ParkingEntranceForVehicles | .//netex:ParkingPassengerEntrance | .//netex:ParkingPoint | .//netex:ParkingTariff | .//netex:PassengerCapacity | .//netex:PassengerCarryingRequirement | .//netex:PassengerCarryingRequirementsView | .//netex:PassengerInformationEquipment | .//netex:PassengerSafetyEquipment | .//netex:PassengerStopAssignment | .//netex:PassingTimeView | .//netex:PathJunction | .//netex:PathLink | .//netex:PenaltyPolicy | .//netex:PlaceLighting | .//netex:PlaceSign | .//netex:Point | .//netex:PointOfInterest | .//netex:PointOfInterestClassification | .//netex:PointOfInterestClassificationHierarchy | .//netex:PointOfInterestEntrance | .//netex:PointOfInterestSpace | .//netex:PointOfInterestVehicleEntrance | .//netex:PointProjection | .//netex:PostalAddress | .//netex:PreassignedFareProduct | .//netex:PriceGroup | .//netex:PriceUnit | .//netex:PricingParameterSet | .//netex:PricingRule | .//netex:PricingService | .//netex:PurchaseWindow | .//netex:PurposeOfEquipmentProfile | .//netex:PurposeOfGrouping | .//netex:PurposeOfJourneyPartition | .//netex:QualityStructureFactor | .//netex:Quay | .//netex:QueueingEquipment | .//netex:RailwayElement | .//netex:RailwayJunction | .//netex:RampEquipment | .//netex:Refunding | .//netex:ReliefOpportunity | .//netex:ReliefPoint | .//netex:Replacing | .//netex:RequestedTravelSpecification | .//netex:Reselling | .//netex:Reserving | .//netex:ResourceFrame | .//netex:ResponsibilitySet | .//netex:RestrictedManoeuvre | .//netex:RetailConsortium | .//netex:RetailDevice | .//netex:RetailService | .//netex:RhythmicalJourneyGroup | .//netex:RoadAddress | .//netex:RoadElement | .//netex:RoadJunction | .//netex:RoughSurface | .//netex:RoundTrip | .//netex:Rounding | .//netex:Route | .//netex:RouteInstruction | .//netex:RouteLink | .//netex:RoutePoint | .//netex:Routing | .//netex:RoutingConstraintZone | .//netex:RubbishDisposalEquipment | .//netex:SaleDiscountRight | .//netex:SalesNoticeAssignment | .//netex:SalesOfferPackage | .//netex:SalesOfferPackageElement | .//netex:SalesOfferPackageEntitlementGiven | .//netex:SalesOfferPackageEntitlementRequired | .//netex:SalesOfferPackageSubstitution | .//netex:SalesTransaction | .//netex:SalesTransactionFrame | .//netex:SanitaryEquipment | .//netex:ScheduledStopPoint | .//netex:SchematicMap | .//netex:SeatingEquipment | .//netex:SeriesConstraint | .//netex:ServiceAccessRight | .//netex:ServiceAccessRight_ | .//netex:ServiceCalendar | .//netex:ServiceCalendarFrame | .//netex:ServiceExclusion | .//netex:ServiceFacilitySet | .//netex:ServiceFrame | .//netex:ServiceJourney | .//netex:ServiceJourneyInterchange | .//netex:ServiceJourneyPattern | .//netex:ServiceJourneyPatternInterchange | .//netex:ServiceLink | .//netex:ServicePattern | .//netex:ServiceSite | .//netex:ServicedOrganisation | .//netex:ShelterEquipment | .//netex:SignEquipment | .//netex:SimpleAvailabilityCondition | .//netex:SimpleFeature | .//netex:SimpleValidityCondition | .//netex:SiteConnection | .//netex:SiteFacilitySet | .//netex:SiteFrame | .//netex:SitePathLink | .//netex:SpatialFeature | .//netex:SpecialService | .//netex:SpecificParameterAssignment | .//netex:StaircaseEquipment | .//netex:StandardFareTable | .//netex:StepLimit | .//netex:StopArea | .//netex:StopPlace | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:Submode | .//netex:Subscribing | .//netex:SupplementProduct | .//netex:Suspending | .//netex:TargetPassingTimeView | .//netex:Tariff | .//netex:TariffZone | .//netex:TemplateServiceJourney | .//netex:TemplateVehicleJourney | .//netex:ThirdPartyProduct | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:TicketingService | .//netex:TimeDemandProfile | .//netex:TimeDemandType | .//netex:TimeDemandTypeAssignment | .//netex:TimeInterval | .//netex:TimeStructureFactor | .//netex:TimeUnit | .//netex:Timeband | .//netex:TimetableFrame | .//netex:TimetabledPassingTimeView | .//netex:TimingAlgorithmType | .//netex:TimingLink | .//netex:TimingPattern | .//netex:TimingPoint | .//netex:TopographicPlace | .//netex:TopographicProjection | .//netex:TrafficControlPoint | .//netex:Train | .//netex:TrainBlock | .//netex:TrainBlockPart | .//netex:TrainComponent | .//netex:TrainComponentLabelAssignment | .//netex:TrainElement | .//netex:TrainNumber | .//netex:TrainStopAssignment | .//netex:TransferRestriction | .//netex:Transferability | .//netex:TransportAdministrativeZone | .//netex:TravelAgent | .//netex:TravelDocument | .//netex:TravelSpecification | .//netex:TravelSpecification_ | .//netex:TravelatorEquipment | .//netex:TrolleyStandEquipment | .//netex:TypeOfAccessRightAssignment | .//netex:TypeOfActivation | .//netex:TypeOfCodespaceAssignment | .//netex:TypeOfConcession | .//netex:TypeOfCongestion | .//netex:TypeOfCustomerAccount | .//netex:TypeOfDeliveryVariant | .//netex:TypeOfEquipment | .//netex:TypeOfFacility | .//netex:TypeOfFareContract | .//netex:TypeOfFareContractEntry | .//netex:TypeOfFareProduct | .//netex:TypeOfFareStructureElement | .//netex:TypeOfFareStructureFactor | .//netex:TypeOfFareTable | .//netex:TypeOfFeature | .//netex:TypeOfFlexibleService | .//netex:TypeOfFrame | .//netex:TypeOfJourneyPattern | .//netex:TypeOfLine | .//netex:TypeOfLink | .//netex:TypeOfLinkSequence | .//netex:TypeOfMachineReadability | .//netex:TypeOfNotice | .//netex:TypeOfOperation | .//netex:TypeOfOrganisation | .//netex:TypeOfOrganisationPart | .//netex:TypeOfPassengerInformationEquipment | .//netex:TypeOfPaymentMethod | .//netex:TypeOfPlace | .//netex:TypeOfPoint | .//netex:TypeOfPricingRule | .//netex:TypeOfProductCategory | .//netex:TypeOfProjection | .//netex:TypeOfResponsibilityRole | .//netex:TypeOfRetailDevice | .//netex:TypeOfSalesOfferPackage | .//netex:TypeOfSecurityList | .//netex:TypeOfService | .//netex:TypeOfServiceFeature | .//netex:TypeOfTariff | .//netex:TypeOfTimeDemandType | .//netex:TypeOfTransfer | .//netex:TypeOfTravelDocument | .//netex:TypeOfUsageParameter | .//netex:TypeOfValidity | .//netex:TypeOfVersion | .//netex:TypeOfZone | .//netex:UicOperatingPeriod | .//netex:UsageDiscountRight | .//netex:UsageValidityPeriod | .//netex:UserProfile | .//netex:ValidBetween | .//netex:ValidDuring | .//netex:ValidableElement | .//netex:ValidityCondition | .//netex:ValidityParameterAssignment | .//netex:ValidityRuleParameter | .//netex:ValidityTrigger | .//netex:ValueSet | .//netex:Vehicle | .//netex:VehicleChargingEquipment | .//netex:VehicleEquipmentProfile | .//netex:VehicleJourney | .//netex:VehicleJourneyStopAssignment | .//netex:VehicleManoeuvringRequirement | .//netex:VehicleModel | .//netex:VehicleScheduleFrame | .//netex:VehicleService | .//netex:VehicleServicePart | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleType | .//netex:VehicleTypeAtPoint | .//netex:VehicleTypeStopAssignment | .//netex:Version | .//netex:WaitingRoomEquipment | .//netex:WheelchairVehicleEquipment | .//netex:Whitelist | .//netex:WireElement | .//netex:WireJunction | .//netex:Zone | .//netex:ZoneProjection"/>
 			<xsd:field xpath="@dataSourceRef"/>
 		</xsd:keyref>
 		<xsd:keyref name="DataSource_AnyVersionedKeyRef" refer="netex:DataSource_AnyVersionedKey">
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index e3d82367e..2fe9cc4a0 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -332,22 +332,6 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<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 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">