diff --git a/resources/hosts/inspire.ec.europa.eu/.metadata/metadata.yml b/resources/hosts/inspire.ec.europa.eu/.metadata/metadata.yml
index 4cae5b1d..9f759964 100644
--- a/resources/hosts/inspire.ec.europa.eu/.metadata/metadata.yml
+++ b/resources/hosts/inspire.ec.europa.eu/.metadata/metadata.yml
@@ -1,2 +1,2 @@
 year: 2024
-version: 2024.2.20
+version: 2024.2.21
diff --git a/resources/hosts/inspire.ec.europa.eu/applicationSchemas.xml b/resources/hosts/inspire.ec.europa.eu/applicationSchemas.xml
index 86e37873..d0181665 100644
--- a/resources/hosts/inspire.ec.europa.eu/applicationSchemas.xml
+++ b/resources/hosts/inspire.ec.europa.eu/applicationSchemas.xml
@@ -147,6 +147,7 @@
     <schema version='4.0' url='https://inspire.ec.europa.eu/schemas/hh/4.0/HumanHealth.xsd' />
   </applicationSchema>
   <applicationSchema id='http://inspire.ec.europa.eu/applicationschema/hy' name='Hydro - Base' theme='hy' themeId=''>
+    <schema version='5.0' url='https://inspire.ec.europa.eu/schemas/hy/5.0/HydroBase.xsd' />
     <schema version='3.0' url='https://inspire.ec.europa.eu/schemas/hy/3.0/HydroBase.xsd' />
     <schema version='4.0' url='https://inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd' />
   </applicationSchema>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/ac-mf/4.0/AtmosphericConditionsandMeteorologicalGeographicalFeatures.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/ac-mf/4.0/AtmosphericConditionsandMeteorologicalGeographicalFeatures.xsd
index 9e3e400f..c4fcb077 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/ac-mf/4.0/AtmosphericConditionsandMeteorologicalGeographicalFeatures.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/ac-mf/4.0/AtmosphericConditionsandMeteorologicalGeographicalFeatures.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ac-mf="http://inspire.ec.europa.eu/schemas/ac-mf/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ac-mf/4.0" version="4.0">
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ac-mf="http://inspire.ec.europa.eu/schemas/ac-mf/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ac-mf/4.0" version="4.0">
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <!--XML Schema document created by ShapeChange-->
 </schema>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd
index 9cb0749d..37c5f43d 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/act-core/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/act-core/4.0" version="4.0">
   <import namespace="http://inspire.ec.europa.eu/schemas/ad/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd
index 7392dff0..346997dc 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:au="http://inspire.ec.europa.eu/schemas/au/5.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:cp="http://inspire.ec.europa.eu/schemas/cp/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/5.0" targetNamespace="http://inspire.ec.europa.eu/schemas/ad/4.0" elementFormDefault="qualified" version="4.1">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:au="http://inspire.ec.europa.eu/schemas/au/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:cp="http://inspire.ec.europa.eu/schemas/cp/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/4.0" targetNamespace="http://inspire.ec.europa.eu/schemas/ad/4.0" elementFormDefault="qualified" version="4.1">
 	<annotation>
 		<documentation>Application schema for Addresses</documentation>
 	</annotation>
-	<import namespace="http://inspire.ec.europa.eu/schemas/au/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/5.0/AdministrativeUnits.xsd"/>
-	<import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+	<import namespace="http://inspire.ec.europa.eu/schemas/au/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/4.0/AdministrativeUnits.xsd"/>
+	<import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
 	<import namespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd"/>
 	<import namespace="http://inspire.ec.europa.eu/schemas/cp/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd"/>
 	<import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
-	<import namespace="http://inspire.ec.europa.eu/schemas/tn/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/5.0/CommonTransportElements.xsd"/>
+	<import namespace="http://inspire.ec.europa.eu/schemas/tn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/4.0/CommonTransportElements.xsd"/>
 	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
 	<!-- v4.1 of this schema released in INSPIRE schema release v.2024.1.
        Change performed: Changed the datatype for the "building" association of the Address feature type. - non-breaking change - Amendment 1089/2010
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/am/4.0/AreaManagementRestrictionRegulationZone.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/am/4.0/AreaManagementRestrictionRegulationZone.xsd
index b5d2a10b..96135a3c 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/am/4.0/AreaManagementRestrictionRegulationZone.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/am/4.0/AreaManagementRestrictionRegulationZone.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:am="http://inspire.ec.europa.eu/schemas/am/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/am/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:am="http://inspire.ec.europa.eu/schemas/am/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/am/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 area management restriction and regulation zones
@@ -6,7 +6,7 @@ area management restriction and regulation zones
 -- Definition --
 The Area Management Restriction and Regulation Zones application schema contains the spatial object that represents zones or areas established to protect the environment via management, restriction or regulation.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/br/4.0/Bio-geographicalRegions.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/br/4.0/Bio-geographicalRegions.xsd
index 16e52e9a..cb5a0d2c 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/br/4.0/Bio-geographicalRegions.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/br/4.0/Bio-geographicalRegions.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:br="http://inspire.ec.europa.eu/schemas/br/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/br/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:br="http://inspire.ec.europa.eu/schemas/br/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/br/4.0" version="4.0">
   <annotation>
     <documentation>Application schema for Bio-geographical Regions</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd
index d023f435..783104ed 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Building base
@@ -6,7 +6,7 @@ Building base
 -- Definition --
 The base application schema for INSPIRE theme buildings.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd
index 19dbf0a9..960c1e33 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/cp/4.0/CadastralParcels.xsd
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:au="http://inspire.ec.europa.eu/schemas/au/5.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:cp="http://inspire.ec.europa.eu/schemas/cp/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/cp/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:au="http://inspire.ec.europa.eu/schemas/au/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:cp="http://inspire.ec.europa.eu/schemas/cp/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/cp/4.0" version="4.0">
   <annotation>
     <documentation>-- Definition --
 The application schema CadastralParcels contains the feature types CadastralParcel, CadastralBoundary and CadastralIndexSet.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/au/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/5.0/AdministrativeUnits.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/au/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/4.0/AdministrativeUnits.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/ef/4.0/EnvironmentalMonitoringFacilities.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/ef/4.0/EnvironmentalMonitoringFacilities.xsd
index ffd01592..8aacef00 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/ef/4.0/EnvironmentalMonitoringFacilities.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/ef/4.0/EnvironmentalMonitoringFacilities.xsd
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:ef="http://inspire.ec.europa.eu/schemas/ef/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xmlns:om="http://www.opengis.net/om/2.0" targetNamespace="http://inspire.ec.europa.eu/schemas/ef/4.0" version="4.1">
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:ef="http://inspire.ec.europa.eu/schemas/ef/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" xmlns:om="http://www.opengis.net/om/2.0" targetNamespace="http://inspire.ec.europa.eu/schemas/ef/4.0" version="4.1">
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <import namespace="http://www.opengis.net/om/2.0" schemaLocation="http://schemas.opengis.net/om/2.0/observation.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/elu/4.0/ExistingLandUse.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/elu/4.0/ExistingLandUse.xsd
index b03ea8d6..68b6d239 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/elu/4.0/ExistingLandUse.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/elu/4.0/ExistingLandUse.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:elu="http://inspire.ec.europa.eu/schemas/elu/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/elu/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:elu="http://inspire.ec.europa.eu/schemas/elu/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/elu/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 existing land use</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd
index 3b015813..88ea40f1 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-b/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-b/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Energy Resources Base application schema</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/er-c/4.0/EnergyResourcesCoverage.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/er-c/4.0/EnergyResourcesCoverage.xsd
index c8adcb6f..0cf2102d 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/er-c/4.0/EnergyResourcesCoverage.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/er-c/4.0/EnergyResourcesCoverage.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:er-c="http://inspire.ec.europa.eu/schemas/er-c/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-c/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:er-c="http://inspire.ec.europa.eu/schemas/er-c/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-c/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Energy Resources Coverage application schema</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/er-b/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/er-v/4.0/EnergyResourcesVector.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/er-v/4.0/EnergyResourcesVector.xsd
index 988c1dc4..f954ca5f 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/er-v/4.0/EnergyResourcesVector.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/er-v/4.0/EnergyResourcesVector.xsd
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:am="http://inspire.ec.europa.eu/schemas/am/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:er-v="http://inspire.ec.europa.eu/schemas/er-v/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-v/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:am="http://inspire.ec.europa.eu/schemas/am/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:er-b="http://inspire.ec.europa.eu/schemas/er-b/4.0" xmlns:er-v="http://inspire.ec.europa.eu/schemas/er-v/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/er-v/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Energy Resources Vector application schema</documentation>
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/am/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/am/4.0/AreaManagementRestrictionRegulationZone.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/er-b/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/er-b/4.0/EnergyResourcesBase.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/ge_gp/4.0/GeophysicsCore.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/ge_gp/4.0/GeophysicsCore.xsd
index 91e39eb0..0497f653 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/ge_gp/4.0/GeophysicsCore.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/ge_gp/4.0/GeophysicsCore.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:ge_gp="http://inspire.ec.europa.eu/schemas/ge_gp/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sams="http://www.opengis.net/samplingSpatial/2.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ge_gp/4.0" version="4.0.1">
-	<import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:ge_gp="http://inspire.ec.europa.eu/schemas/ge_gp/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sams="http://www.opengis.net/samplingSpatial/2.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ge_gp/4.0" version="4.0.1">
+	<import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
 	<import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
 	<import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
 	<import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/gelu/4.0/GriddedExistingLandUse.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/gelu/4.0/GriddedExistingLandUse.xsd
index 76d0c15e..7d718c48 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/gelu/4.0/GriddedExistingLandUse.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/gelu/4.0/GriddedExistingLandUse.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gelu="http://inspire.ec.europa.eu/schemas/gelu/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/gelu/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gelu="http://inspire.ec.europa.eu/schemas/gelu/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/gelu/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 gridded land use</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <import namespace="http://www.opengis.net/gmlcov/1.0" schemaLocation="http://schemas.opengis.net/gmlcov/1.0/coverage.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd
index 8478a7ef..4ff50097 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/gn/4.0" version="4.0">
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/gn/4.0" version="4.0">
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/hb/4.0/HabitatsAndBiotopes.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/hb/4.0/HabitatsAndBiotopes.xsd
index ad5fe93d..e1e9e1b6 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/hb/4.0/HabitatsAndBiotopes.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/hb/4.0/HabitatsAndBiotopes.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:hb="http://inspire.ec.europa.eu/schemas/hb/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sd="http://inspire.ec.europa.eu/schemas/sd/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hb/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:hb="http://inspire.ec.europa.eu/schemas/hb/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sd="http://inspire.ec.europa.eu/schemas/sd/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hb/4.0" version="4.0">
   <annotation>
     <documentation>Application schema for Habitats and Biotopes</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/sd/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/sd/4.0/SpeciesDistribution.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd
index c070a570..62ace15f 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hy-p/5.0" version="5.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/5.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hy-p/5.0" version="5.0">
   <annotation>
     <documentation>-- Definition --
 The 'PhysicalWaters' application schema is concerned primarily with the 'mapping' Use Case</documentation>
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/hy/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/hy/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy/5.0/HydroBase.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!-- v5.0 of this schema released in INSPIRE schema release v.2024.1.
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd
index 5670e19f..32223eef 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/4.0" xmlns:hy-n="http://inspire.ec.europa.eu/schemas/hy-n/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/5.0" xmlns:sr="http://inspire.ec.europa.eu/schemas/sr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hy/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/4.0" xmlns:hy-n="http://inspire.ec.europa.eu/schemas/hy-n/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/4.0" xmlns:sr="http://inspire.ec.europa.eu/schemas/sr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hy/4.0" version="4.0">
   <annotation>
     <documentation>-- Definition --
 This package provides base classes used to identify real-world objects. These identities may be used to provide implicit semantic associations between different 'implementation views'.
@@ -8,7 +8,7 @@ EXAMPLE: A real-world object identified as the 'Rhine' may be realised through a
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/hy-n/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-n/4.0/HydroNetwork.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/hy-p/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/hy-p/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-p/4.0/HydroPhysicalWaters.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/sr/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/hy/5.0/HydroBase.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/hy/5.0/HydroBase.xsd
new file mode 100644
index 00000000..76baba05
--- /dev/null
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/hy/5.0/HydroBase.xsd
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/5.0" xmlns:hy-n="http://inspire.ec.europa.eu/schemas/hy-n/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/5.0" xmlns:sr="http://inspire.ec.europa.eu/schemas/sr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/hy/5.0" version="5.0">
+  <annotation>
+    <documentation>-- Definition --
+This package provides base classes used to identify real-world objects. These identities may be used to provide implicit semantic associations between different 'implementation views'.
+
+-- Description --
+EXAMPLE: A real-world object identified as the 'Rhine' may be realised through a Network view (as a set of links and nodes), a Physical Waters view (as a Watercourse), and a reporting view (as a WFDRiver).</documentation>
+  </annotation>
+  <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/hy-n/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-n/4.0/HydroNetwork.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/hy-p/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/sr/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd"/>
+  <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+  <!-- v5.0 of this schema released in INSPIRE schema release v.2024.1.2.
+       Change performed: Updated to version 5.0 since this schema imports the hy-p schema that was updated to version 5 - non-breaking change - Amendment 1089/2010
+       See https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2024.1.2 -->
+  <element name="HydroIdentifier" substitutionGroup="gml:AbstractObject" type="hy:HydroIdentifierType">
+    <annotation>
+      <documentation>-- Definition --
+A hydrographic thematic identifier.
+
+-- Description --
+NOTE May be used to hold a national hydrological identification code.</documentation>
+    </annotation>
+  </element>
+  <complexType name="HydroIdentifierType">
+    <sequence>
+      <element minOccurs="0" name="classificationScheme" type="string">
+        <annotation>
+          <documentation>-- Definition --
+A description of the identification scheme (National, European, etc.) being used.</documentation>
+        </annotation>
+      </element>
+      <element name="localId" type="string">
+        <annotation>
+          <documentation>-- Definition --
+A local identifier, assigned by some authority.
+
+-- Description --
+NOTE It will often be a national hydrographic identifier.</documentation>
+        </annotation>
+      </element>
+      <element name="namespace" type="string">
+        <annotation>
+          <documentation>-- Definition --
+An indicator of the scope for the local identifier.
+
+-- Description --
+NOTE In the case of a national hydrographic identifier it should be a two-letter country code as per ISO 3166-1-Alpha-2.</documentation>
+        </annotation>
+      </element>
+    </sequence>
+  </complexType>
+  <complexType name="HydroIdentifierPropertyType">
+    <sequence>
+      <element ref="hy:HydroIdentifier"/>
+    </sequence>
+  </complexType>
+  <complexType name="HydroObjectPropertyType">
+    <choice minOccurs="0">
+      <element ref="hy-p:DrainageBasin"/>
+      <element ref="hy-n:HydroNode"/>
+      <element ref="hy-p:HydroPointOfInterest"/>
+      <element ref="hy-p:ManMadeObject"/>
+      <element ref="sr:SeaArea"/>
+      <element ref="hy-p:Shore"/>
+      <element ref="sr:Shoreline"/>
+      <element ref="hy-p:SurfaceWater"/>
+      <element ref="hy-n:WatercourseLink"/>
+      <element ref="hy-n:WatercourseLinkSequence"/>
+      <element ref="hy-n:WatercourseSeparatedCrossing"/>
+      <element ref="hy-p:Wetland"/>
+    </choice>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+</schema>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/lcn/4.0/LandCoverNomenclature.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/lcn/4.0/LandCoverNomenclature.xsd
index 68754566..b83fd9dd 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/lcn/4.0/LandCoverNomenclature.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/lcn/4.0/LandCoverNomenclature.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lcn="http://inspire.ec.europa.eu/schemas/lcn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lcn/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lcn="http://inspire.ec.europa.eu/schemas/lcn/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lcn/4.0" version="4.0">
   <annotation>
     <documentation>application schema for Land Cover Nomenclature</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/lcr/4.0/LandCoverRaster.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/lcr/4.0/LandCoverRaster.xsd
index 962963ff..71469ef0 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/lcr/4.0/LandCoverRaster.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/lcr/4.0/LandCoverRaster.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:lcn="http://inspire.ec.europa.eu/schemas/lcn/4.0" xmlns:lcr="http://inspire.ec.europa.eu/schemas/lcr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lcr/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:lcn="http://inspire.ec.europa.eu/schemas/lcn/4.0" xmlns:lcr="http://inspire.ec.europa.eu/schemas/lcr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lcr/4.0" version="4.0">
   <annotation>
     <documentation>application schema for Land Cover Raster</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/lcn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/lcn/4.0/LandCoverNomenclature.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd
index ac06e9f0..c0036d42 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 land use nomenclature</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <import namespace="http://www.opengis.net/gmlcov/1.0" schemaLocation="http://schemas.opengis.net/gmlcov/1.0/coverage.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/mr-core/4.0/MineralResourcesCore.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/mr-core/4.0/MineralResourcesCore.xsd
index ba2a5900..e216d95d 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/mr-core/4.0/MineralResourcesCore.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/mr-core/4.0/MineralResourcesCore.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:cgu="http://xmlns.geosciml.org/Utilities/3.0" xmlns:ge="http://inspire.ec.europa.eu/schemas/ge-core/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:mr-core="http://inspire.ec.europa.eu/schemas/mr-core/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:swe="http://www.opengis.net/swe/2.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/mr-core/4.0" version="4.0.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:cgu="http://xmlns.geosciml.org/Utilities/3.0" xmlns:ge="http://inspire.ec.europa.eu/schemas/ge-core/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:mr-core="http://inspire.ec.europa.eu/schemas/mr-core/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:swe="http://www.opengis.net/swe/2.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/mr-core/4.0" version="4.0.1">
   <!-- v4.0.1 of this schema released in INSPIRE schema release v.2022.2.
        Change performed: Added type to ‘sourceReference ‘element - breaking change - bugfix
        See https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2022.2 -->
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/ge-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ge-core/4.0/GeologyCore.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/net/4.0/Network.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/net/4.0/Network.xsd
index f3c1003b..e60e6d0f 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/net/4.0/Network.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/net/4.0/Network.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/net/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/net/4.0" version="4.0">
   <annotation>
     <documentation>Generic application schema for networks.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/of/4.0/OceanFeatures.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/of/4.0/OceanFeatures.xsd
index f6f2df98..6400af07 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/of/4.0/OceanFeatures.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/of/4.0/OceanFeatures.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:of="http://inspire.ec.europa.eu/schemas/of/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/of/4.0" version="4.0">
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:of="http://inspire.ec.europa.eu/schemas/of/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/of/4.0" version="4.0">
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <!--XML Schema document created by ShapeChange-->
 </schema>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/oi/4.0/Orthoimagery.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/oi/4.0/Orthoimagery.xsd
index d2a0ee5a..222eb39e 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/oi/4.0/Orthoimagery.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/oi/4.0/Orthoimagery.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:oi="http://inspire.ec.europa.eu/schemas/oi/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/oi/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:oi="http://inspire.ec.europa.eu/schemas/oi/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/oi/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 orthoimagery</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/omor/3.0/ObservationReferences.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/omor/3.0/ObservationReferences.xsd
index 85cb6b14..00b93eff 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/omor/3.0/ObservationReferences.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/omor/3.0/ObservationReferences.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:om="http://www.opengis.net/om/2.0" xmlns:omor="http://inspire.ec.europa.eu/schemas/omor/3.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/omor/3.0" version="3.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:om="http://www.opengis.net/om/2.0" xmlns:omor="http://inspire.ec.europa.eu/schemas/omor/3.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/omor/3.0" version="3.0">
   <annotation>
     <documentation>-- Definition --
 Application Schema for Observation References</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <import namespace="http://www.opengis.net/om/2.0" schemaLocation="http://schemas.opengis.net/om/2.0/observation.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/ompr/3.0/Processes.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/ompr/3.0/Processes.xsd
index 54f4fe2f..ae40b722 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/ompr/3.0/Processes.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/ompr/3.0/Processes.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ompr="http://inspire.ec.europa.eu/schemas/ompr/3.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ompr/3.0" version="3.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ompr="http://inspire.ec.europa.eu/schemas/ompr/3.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/ompr/3.0" version="3.0">
   <annotation>
     <documentation>-- Definition --
 Application Schema for Processes</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/pd/4.0/PopulationDistributionDemography.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/pd/4.0/PopulationDistributionDemography.xsd
index 8caea501..1bb93b1f 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/pd/4.0/PopulationDistributionDemography.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/pd/4.0/PopulationDistributionDemography.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:pd="http://inspire.ec.europa.eu/schemas/pd/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/pd/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:pd="http://inspire.ec.europa.eu/schemas/pd/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/pd/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Population distribution - demography</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/su-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/su-core/4.0/StatisticalUnitCore.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/pf/4.0/ProductionAndIndustrialFacilities.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/pf/4.0/ProductionAndIndustrialFacilities.xsd
index cb2f3bc7..df705fba 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/pf/4.0/ProductionAndIndustrialFacilities.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/pf/4.0/ProductionAndIndustrialFacilities.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:bu-core2d="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:pf="http://inspire.ec.europa.eu/schemas/pf/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/pf/4.0" version="4.0.2">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" xmlns:bu-core2d="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:pf="http://inspire.ec.europa.eu/schemas/pf/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/pf/4.0" version="4.0.2">
   <!-- v4.1 of this schema released in INSPIRE schema release v.2024.1.
        Change performed: Changed the definition of the ProductionInstallation feature type. - non-breaking change - Amendment 1089/2010
        See https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2024.1 -->
@@ -13,7 +13,7 @@
 Production And Industrial Facilities - Core</documentation>
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/act-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-core2d/4.0/BuildingsCore2D.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/plu/4.0/PlannedLandUse.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/plu/4.0/PlannedLandUse.xsd
index 2db83778..5102efa7 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/plu/4.0/PlannedLandUse.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/plu/4.0/PlannedLandUse.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:plu="http://inspire.ec.europa.eu/schemas/plu/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/plu/4.0" version="4.0.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:plu="http://inspire.ec.europa.eu/schemas/plu/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/plu/4.0" version="4.0.1">
   <annotation>
     <documentation>-- Name --
 planned land use</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/readme.txt b/resources/hosts/inspire.ec.europa.eu/schemas/readme.txt
index 985249ee..e8920da7 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/readme.txt
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/readme.txt
@@ -3,6 +3,14 @@ W3C Schema for INSPIRE
       
 Change log
 
+INSPIRE schema release v.2024.1.2 - 21/02/2022 (https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2024.1.2)
+
+Schema            Change description                                                                                                           Version    Change type
+===============   ===========================================================================================================================  =======    ====================================
+[hy]              Updated to version 5.0 since the schema imports the hy-p schema that was updated to version 5                                v5.0       non-breaking change  Amendment 1089/2010
+[us-xx]           Fixed typos in some US schemas                                                 
+
+
 INSPIRE schema release v.2024.1.1 - 09/02/2022 (https://github.com/INSPIRE-MIF/application-schemas/releases/tag/2024.1.1)
 
 Schema            Change description                                                                                                           Version    Change type
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/sd/4.0/SpeciesDistribution.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/sd/4.0/SpeciesDistribution.xsd
index cb34311e..852b1943 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/sd/4.0/SpeciesDistribution.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/sd/4.0/SpeciesDistribution.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sd="http://inspire.ec.europa.eu/schemas/sd/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/sd/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sd="http://inspire.ec.europa.eu/schemas/sd/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/sd/4.0" version="4.0">
   <annotation>
     <documentation>Application schema for Species Distribution</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/selu/4.0/SampledExistingLandUse.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/selu/4.0/SampledExistingLandUse.xsd
index da6e6627..5df0776a 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/selu/4.0/SampledExistingLandUse.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/selu/4.0/SampledExistingLandUse.xsd
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:selu="http://inspire.ec.europa.eu/schemas/selu/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/selu/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:lunom="http://inspire.ec.europa.eu/schemas/lunom/4.0" xmlns:selu="http://inspire.ec.europa.eu/schemas/selu/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/selu/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 sampled land use</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/lunom/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/lunom/4.0/LandUseNomenclature.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/so/4.0/Soil.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/so/4.0/Soil.xsd
index 3e9014c0..e0009a87 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/so/4.0/Soil.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/so/4.0/Soil.xsd
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:ge="http://inspire.ec.europa.eu/schemas/ge-core/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:om="http://www.opengis.net/om/2.0" xmlns:omop="http://inspire.ec.europa.eu/schemas/omop/4.0" xmlns:ompr="http://inspire.ec.europa.eu/schemas/ompr/3.0" xmlns:ps="http://inspire.ec.europa.eu/schemas/ps/5.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:so="http://inspire.ec.europa.eu/schemas/so/4.0" xmlns:spec="http://www.opengis.net/samplingSpecimen/2.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/so/4.0" version="4.0.2">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:ge="http://inspire.ec.europa.eu/schemas/ge-core/4.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlcov="http://www.opengis.net/gmlcov/1.0" xmlns:om="http://www.opengis.net/om/2.0" xmlns:omop="http://inspire.ec.europa.eu/schemas/omop/3.0" xmlns:ompr="http://inspire.ec.europa.eu/schemas/ompr/3.0" xmlns:ps="http://inspire.ec.europa.eu/schemas/ps/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:so="http://inspire.ec.europa.eu/schemas/so/4.0" xmlns:spec="http://www.opengis.net/samplingSpecimen/2.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/so/4.0" version="4.0.2">
   <!-- v4.0.2 of this schema released in INSPIRE schema release v.2021.2.
 	 Change performed: Added missing associations to OM_Observation + soilDerivedObjectObservation from 1 to [1..*] - breaking change - bugfix + enhancement. The versioning considers the v4.0.1 of the schema in draft repository.
 	 See https://github.com/INSPIRE-MIF/helpdesk-validator/releases/v2021.2 -->
   <annotation>
     <documentation>Soil model</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/ge-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ge-core/4.0/GeologyCore.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/omop/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/omop/4.0/ObservableProperties.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/omop/3.0" schemaLocation="https://inspire.ec.europa.eu/schemas/omop/3.0/ObservableProperties.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/ompr/3.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ompr/3.0/Processes.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/ps/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ps/5.0/ProtectedSites.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/ps/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ps/4.0/ProtectedSites.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd
index 951ad32f..71fede68 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/sr/4.0/SeaRegions.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/5.0" xmlns:omop="http://inspire.ec.europa.eu/schemas/omop/4.0" xmlns:omor="http://inspire.ec.europa.eu/schemas/omor/3.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sr="http://inspire.ec.europa.eu/schemas/sr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/sr/4.0" version="4.0.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:hy="http://inspire.ec.europa.eu/schemas/hy/4.0" xmlns:hy-p="http://inspire.ec.europa.eu/schemas/hy-p/4.0" xmlns:omop="http://inspire.ec.europa.eu/schemas/omop/3.0" xmlns:omor="http://inspire.ec.europa.eu/schemas/omor/3.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:sr="http://inspire.ec.europa.eu/schemas/sr/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/sr/4.0" version="4.0.1">
   <annotation>
     <documentation>-- Name --
 Sea Regions Application Schema
@@ -33,11 +33,11 @@ Both biotic and physical parameters and indicators are important in the classifi
 &amp;bull; tidal zones
 &amp;bull; wavesrequired</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/hy-p/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-p/5.0/HydroPhysicalWaters.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/hy-p/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy-p/4.0/HydroPhysicalWaters.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/hy/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/hy/4.0/HydroBase.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/omop/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/omop/4.0/ObservableProperties.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/omop/3.0" schemaLocation="https://inspire.ec.europa.eu/schemas/omop/3.0/ObservableProperties.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/omor/3.0" schemaLocation="https://inspire.ec.europa.eu/schemas/omor/3.0/ObservationReferences.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/su-grid/4.0/StatisticalUnitGrid.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/su-grid/4.0/StatisticalUnitGrid.xsd
index e3cbce96..f1335e9f 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/su-grid/4.0/StatisticalUnitGrid.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/su-grid/4.0/StatisticalUnitGrid.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" xmlns:su-grid="http://inspire.ec.europa.eu/schemas/su-grid/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/su-grid/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" xmlns:su-grid="http://inspire.ec.europa.eu/schemas/su-grid/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/su-grid/4.0" version="4.0">
   <annotation>
     <documentation>-- Name --
 Statistical Units Grid
@@ -6,7 +6,7 @@ Statistical Units Grid
 -- Definition --
 Package containing classes to represent statistical grids.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/su-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/su-core/4.0/StatisticalUnitCore.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/su-vector/4.0/StatisticalUnitVector.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/su-vector/4.0/StatisticalUnitVector.xsd
index 94fe321c..80e4691b 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/su-vector/4.0/StatisticalUnitVector.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/su-vector/4.0/StatisticalUnitVector.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:au="http://inspire.ec.europa.eu/schemas/au/5.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" xmlns:su-vector="http://inspire.ec.europa.eu/schemas/su-vector/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/su-vector/4.0" version="4.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:au="http://inspire.ec.europa.eu/schemas/au/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:su-core="http://inspire.ec.europa.eu/schemas/su-core/4.0" xmlns:su-vector="http://inspire.ec.europa.eu/schemas/su-vector/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/su-vector/4.0" version="4.1">
   <annotation>
     <documentation>-- Name --
 Statistical Units Vector
@@ -6,8 +6,8 @@ Statistical Units Vector
 -- Definition --
 Package containing classes to represent statistical units with vector geometries.</documentation>
   </annotation>
-  <import namespace="http://inspire.ec.europa.eu/schemas/au/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/5.0/AdministrativeUnits.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/au/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/4.0/AdministrativeUnits.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/su-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/su-core/4.0/StatisticalUnitCore.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/tn-a/4.0/AirTransportNetwork.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/tn-a/4.0/AirTransportNetwork.xsd
index 38189233..9c8c6d88 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/tn-a/4.0/AirTransportNetwork.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/tn-a/4.0/AirTransportNetwork.xsd
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/5.0" xmlns:tn-a="http://inspire.ec.europa.eu/schemas/tn-a/4.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/tn-a/4.0" version="4.1">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/4.0" xmlns:tn-a="http://inspire.ec.europa.eu/schemas/tn-a/4.0" xmlns:bu-base="http://inspire.ec.europa.eu/schemas/bu-base/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/tn-a/4.0" version="4.1">
   <annotation>
     <documentation>-- Definition --
 This package defines the types that are used on the air transport subtheme.</documentation>
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/net/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/net/4.0/Network.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/tn/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/5.0/CommonTransportElements.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/tn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/4.0/CommonTransportElements.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/bu-base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-base/4.0/BuildingsBase.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!-- v4.1 of this schema released in INSPIRE schema release v.2024.1.
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/tn-c/4.0/CableTransportNetwork.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/tn-c/4.0/CableTransportNetwork.xsd
index 12f4d28f..90f2082a 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/tn-c/4.0/CableTransportNetwork.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/tn-c/4.0/CableTransportNetwork.xsd
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/5.0" xmlns:tn-c="http://inspire.ec.europa.eu/schemas/tn-c/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/tn-c/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:tn="http://inspire.ec.europa.eu/schemas/tn/4.0" xmlns:tn-c="http://inspire.ec.europa.eu/schemas/tn-c/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/tn-c/4.0" version="4.0">
   <annotation>
     <documentation>-- Definition --
 This package defines the types that are used on the cable subtheme.</documentation>
   </annotation>
   <import namespace="http://inspire.ec.europa.eu/schemas/net/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/net/4.0/Network.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/tn/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/5.0/CommonTransportElements.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/tn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/tn/4.0/CommonTransportElements.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
   <!--XML Schema document created by ShapeChange-->
   <element name="CablewayLink" substitutionGroup="tn:TransportLink" type="tn-c:CablewayLinkType">
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/us-govserv/4.0/GovernmentalServices.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/us-govserv/4.0/GovernmentalServices.xsd
index bb5c9f0b..499a3fd5 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/us-govserv/4.0/GovernmentalServices.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/us-govserv/4.0/GovernmentalServices.xsd
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:au="http://inspire.ec.europa.eu/schemas/au/5.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:bu-core2d="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-govserv="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:ad="http://inspire.ec.europa.eu/schemas/ad/4.0" xmlns:au="http://inspire.ec.europa.eu/schemas/au/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/3.3" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:bu-core2d="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gn="http://inspire.ec.europa.eu/schemas/gn/4.0" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-govserv="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/4.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" version="4.0">
   <import namespace="http://inspire.ec.europa.eu/schemas/act-core/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/act-core/4.0/ActivityComplex_Core.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/ad/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/ad/4.0/Addresses.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/au/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/5.0/AdministrativeUnits.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/au/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/au/4.0/AdministrativeUnits.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/base/3.3" schemaLocation="https://inspire.ec.europa.eu/schemas/base/3.3/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/bu-core2d/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/bu-core2d/4.0/BuildingsCore2D.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/gn/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/gn/4.0/GeographicalNames.xsd"/>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/4.0/UtilityNetworksCommon.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/4.0/UtilityNetworksCommon.xsd
index 337a0638..df4804db 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/4.0/UtilityNetworksCommon.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/4.0/UtilityNetworksCommon.xsd
@@ -917,16 +917,18 @@ Uses the codelist "UtilityNetworkTypeValue" to describe the possible utility net
             </annotation>
           </element>
           <element maxOccurs="unbounded" name="authorityRole">
+            <annotation>
               <documentation>-- Name --
 authority role
 
 -- Definition --
 Parties authorized to manage a utility network, such as maintainers, operators or owners.</documentation>
-         <complexType>
-            <sequence>
-              <element ref="base2:RelatedParty"/>
-            </sequence>
-         </complexType>
+            </annotation>
+            <complexType>
+              <sequence>
+                <element ref="base2:RelatedParty"/>
+              </sequence>
+            </complexType>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="utilityFacilityReference" nillable="true">
             <annotation>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/5.0/UtilityNetworksCommon.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/5.0/UtilityNetworksCommon.xsd
index 427bc2b0..de923645 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/5.0/UtilityNetworksCommon.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-common/5.0/UtilityNetworksCommon.xsd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-govserv="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" version="5.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:act-core="http://inspire.ec.europa.eu/schemas/act-core/4.0" xmlns:base="http://inspire.ec.europa.eu/schemas/base/4.0" xmlns:base2="http://inspire.ec.europa.eu/schemas/base2/2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:net="http://inspire.ec.europa.eu/schemas/net/4.0" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-govserv="http://inspire.ec.europa.eu/schemas/us-govserv/5.0" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" version="5.0">
   <annotation>
     <documentation>-- Name --
 common utility network elements
@@ -10,7 +10,7 @@ Common Utility Network Elements</documentation>
   <import namespace="http://inspire.ec.europa.eu/schemas/base/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base/4.0/BaseTypes.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/base2/2.0" schemaLocation="https://inspire.ec.europa.eu/schemas/base2/2.0/BaseTypes2.xsd"/>
   <import namespace="http://inspire.ec.europa.eu/schemas/net/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/net/4.0/Network.xsd"/>
-  <import namespace="http://inspire.ec.europa.eu/schemas/us-govserv/4.0" schemaLocation="https://inspire.ec.europa.eu/schemas/us-govserv/4.0/GovernmentalServices.xsd"/>
+  <import namespace="http://inspire.ec.europa.eu/schemas/us-govserv/5.0" schemaLocation="https://inspire.ec.europa.eu/schemas/us-govserv/5.0/GovernmentalServices.xsd"/>
   <import namespace="http://www.interactive-instruments.de/ShapeChange/AppInfo" schemaLocation="http://portele.de/ShapeChangeAppinfo.xsd"/>
   <import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="http://schemas.opengis.net/iso/19139/20070417/gmd/gmd.xsd"/>
   <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
@@ -898,16 +898,18 @@ Uses the codelist "UtilityNetworkTypeValue" to describe the possible utility net
             </annotation>
           </element>
           <element maxOccurs="unbounded" name="authorityRole">
+            <annotation>
               <documentation>-- Name --
 authority role
 
 -- Definition --
 Parties authorized to manage a utility network, such as maintainers, operators or owners.</documentation>
-         <complexType>
-            <sequence>
-              <element ref="base2:RelatedParty"/>
-            </sequence>
-         </complexType>
+            </annotation>
+            <complexType>
+              <sequence>
+                <element ref="base2:RelatedParty"/>
+              </sequence>
+            </complexType>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="utilityFacilityReference" nillable="true">
             <annotation>
diff --git a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-ogc/5.0/OilGasChemicalsNetwork.xsd b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-ogc/5.0/OilGasChemicalsNetwork.xsd
index 07f7910d..6d73f708 100644
--- a/resources/hosts/inspire.ec.europa.eu/schemas/us-net-ogc/5.0/OilGasChemicalsNetwork.xsd
+++ b/resources/hosts/inspire.ec.europa.eu/schemas/us-net-ogc/5.0/OilGasChemicalsNetwork.xsd
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" xmlns:us-net-ogc="http://inspire.ec.europa.eu/schemas/us-net-ogc/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-net-ogc/5.0" version="454
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:sc="http://www.interactive-instruments.de/ShapeChange/AppInfo" xmlns:us-net-common="http://inspire.ec.europa.eu/schemas/us-net-common/5.0" xmlns:us-net-ogc="http://inspire.ec.europa.eu/schemas/us-net-ogc/5.0" elementFormDefault="qualified" targetNamespace="http://inspire.ec.europa.eu/schemas/us-net-ogc/5.0" version="5.0">
+  <annotation>
     <documentation>-- Name --
 oil, gas &amp; chemicals utility network