diff --git a/CityGML/Schema/appearance.xsd b/CityGML/Schema/appearance.xsd
index d7087ec..d8c74ac 100644
--- a/CityGML/Schema/appearance.xsd
+++ b/CityGML/Schema/appearance.xsd
@@ -90,14 +90,14 @@
     </sequence>
   </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAppearance" type="anyType"/>
-  <element name="Appearance" substitutionGroup="core:AbstractFeatureWithLifespan" type="app:AppearanceType">
+  <element name="Appearance" substitutionGroup="core:AbstractAppearance" type="app:AppearanceType">
     <annotation>
       <documentation>SIG3D: Named container for all AbstractSurfaceData</documentation>
     </annotation>
   </element>
   <complexType name="AppearanceType">
     <complexContent>
-      <extension base="core:AbstractFeatureWithLifespanType">
+      <extension base="core:AbstractAppearanceType">
         <sequence>
           <element minOccurs="0" name="theme" type="string">
             <annotation>
diff --git a/CityGML/Schema/building.xsd b/CityGML/Schema/building.xsd
index 6371e6f..cd3f89a 100644
--- a/CityGML/Schema/building.xsd
+++ b/CityGML/Schema/building.xsd
@@ -533,13 +533,6 @@
               </appinfo>
             </annotation>
           </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="constructionSurface" type="gml:ReferenceType">
-            <annotation>
-              <appinfo>
-                <targetElement xmlns="http://www.opengis.net/gml/3.2">con:AbstractConstructionSurface</targetElement>
-              </appinfo>
-            </annotation>
-          </element>
           <element maxOccurs="unbounded" minOccurs="0" ref="bldg:AbstractGenericApplicationPropertyOfStorey"/>
         </sequence>
       </extension>
diff --git a/CityGML/Schema/cityGMLBase.xsd b/CityGML/Schema/cityGMLBase.xsd
index 71ca6eb..91d9c74 100644
--- a/CityGML/Schema/cityGMLBase.xsd
+++ b/CityGML/Schema/cityGMLBase.xsd
@@ -1,13 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:app="http://www.opengis.net/citygml/appearance/3.0" xmlns:core="http://www.opengis.net/citygml/3.0" xmlns:dyn="http://www.opengis.net/citygml/dynamizer/3.0" xmlns:gen="http://www.opengis.net/citygml/generics/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlexr="http://www.opengis.net/gml/3.3/exr" xmlns:pcl="http://www.opengis.net/citygml/pointcloud/3.0" xmlns:vers="http://www.opengis.net/citygml/versioning/3.0" xmlns:xAL="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/3.0" version="3.0.0">
-  <import namespace="http://www.opengis.net/citygml/appearance/3.0" schemaLocation="./appearance.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/dynamizer/3.0" schemaLocation="./dynamizer.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/generics/3.0" schemaLocation="./generics.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/pointcloud/3.0" schemaLocation="./pointCloud.xsd"/>
-  <import namespace="http://www.opengis.net/citygml/versioning/3.0" schemaLocation="./versioning.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.opengis.net/citygml/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xAL="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/3.0" version="3.0.0">
   <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/gml/3.3/exr" schemaLocation="http://schemas.opengis.net/gml/3.3/extdEncRule.xsd"/>
   <import namespace="urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" schemaLocation="http://schemas.opengis.net/citygml/xAL/xAL.xsd"/>
   <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractAppearance" type="anyType"/>
+  <element abstract="true" name="AbstractAppearance" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractAppearanceType"/>
+  <complexType abstract="true" name="AbstractAppearanceType">
+    <complexContent>
+      <extension base="core:AbstractFeatureWithLifespanType">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractAppearance"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="AbstractAppearancePropertyType">
+    <sequence minOccurs="0">
+      <element ref="core:AbstractAppearance"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractCityObject" type="anyType"/>
   <element abstract="true" name="AbstractCityObject" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractCityObjectType">
     <annotation>
@@ -43,15 +55,15 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <complexContent>
                 <extension base="gml:AbstractFeatureMemberType">
                   <sequence minOccurs="0">
-                    <element ref="app:Appearance"/>
+                    <element ref="core:AbstractAppearance"/>
                   </sequence>
                   <attributeGroup ref="gml:AssociationAttributeGroup"/>
                 </extension>
               </complexContent>
             </complexType>
           </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="genericAttribute" type="gen:AbstractGenericAttributePropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="dynamizer" type="dyn:DynamizerPropertyType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="genericAttribute" type="core:AbstractGenericAttributePropertyType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="dynamizer" type="core:AbstractDynamizerPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractCityObject"/>
         </sequence>
       </extension>
@@ -64,6 +76,24 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractDynamizer" type="anyType"/>
+  <element abstract="true" name="AbstractDynamizer" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractDynamizerType"/>
+  <complexType abstract="true" name="AbstractDynamizerType">
+    <complexContent>
+      <extension base="core:AbstractFeatureWithLifespanType">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractDynamizer"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="AbstractDynamizerPropertyType">
+    <sequence minOccurs="0">
+      <element ref="core:AbstractDynamizer"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractFeatureWithLifespan" type="anyType"/>
   <element abstract="true" name="AbstractFeatureWithLifespan" substitutionGroup="gml:AbstractFeature" type="core:AbstractFeatureWithLifespanType"/>
   <complexType abstract="true" name="AbstractFeatureWithLifespanType">
@@ -86,6 +116,15 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericAttribute" substitutionGroup="gml:AbstractObject" type="core:AbstractGenericAttributeType"/>
+  <complexType abstract="true" name="AbstractGenericAttributeType">
+    <sequence/>
+  </complexType>
+  <complexType name="AbstractGenericAttributePropertyType">
+    <sequence>
+      <element ref="core:AbstractGenericAttribute"/>
+    </sequence>
+  </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractLogicalSpace" type="anyType"/>
   <element abstract="true" name="AbstractLogicalSpace" substitutionGroup="core:AbstractSpace" type="core:AbstractLogicalSpaceType"/>
   <complexType abstract="true" name="AbstractLogicalSpaceType">
@@ -158,7 +197,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <documentation>SIG 3D: Relation to intersection curve(s) between an LOD3 AbstractPhysicalSpace and a terrain (LOD1 or LOD2 or LOD3).</documentation>
             </annotation>
           </element>
-          <element minOccurs="0" name="pointCloud" type="pcl:PointCloudPropertyType"/>
+          <element minOccurs="0" name="pointCloud" type="core:AbstractPointCloudPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractPhysicalSpace"/>
         </sequence>
       </extension>
@@ -171,6 +210,24 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractPointCloud" type="anyType"/>
+  <element abstract="true" name="AbstractPointCloud" substitutionGroup="gml:AbstractFeature" type="core:AbstractPointCloudType"/>
+  <complexType abstract="true" name="AbstractPointCloudType">
+    <complexContent>
+      <extension base="gml:AbstractFeatureType">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractPointCloud"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="AbstractPointCloudPropertyType">
+    <sequence minOccurs="0">
+      <element ref="core:AbstractPointCloud"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractSpace" type="anyType"/>
   <element abstract="true" name="AbstractSpace" substitutionGroup="core:AbstractCityObject" type="core:AbstractSpaceType"/>
   <complexType abstract="true" name="AbstractSpaceType">
@@ -184,6 +241,13 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="volume" type="core:QualifiedVolumePropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="area" type="core:QualifiedAreaPropertyType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="boundary" type="core:AbstractThematicSurfacePropertyType">
+            <annotation>
+              <appinfo>
+                <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">core:bounds</reversePropertyName>
+              </appinfo>
+            </annotation>
+          </element>
           <element minOccurs="0" name="lod0Point" type="gml:PointPropertyType">
             <annotation>
               <documentation>Relation to a  LOD0 point geometry of AbstractSpace.</documentation>
@@ -214,13 +278,6 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <documentation>Relation to a  LOD2 curve geometry of AbstractSpace.</documentation>
             </annotation>
           </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="boundary" type="core:AbstractThematicSurfacePropertyType">
-            <annotation>
-              <appinfo>
-                <reversePropertyName xmlns="http://www.opengis.net/gml/3.2">core:bounds</reversePropertyName>
-              </appinfo>
-            </annotation>
-          </element>
           <element minOccurs="0" name="lod3Solid" type="gml:SolidPropertyType">
             <annotation>
               <documentation>Relation to a  LOD3 solid geometry of AbstractSpace.</documentation>
@@ -282,7 +339,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               </appinfo>
             </annotation>
           </element>
-          <element minOccurs="0" name="pointCloud" type="pcl:PointCloudPropertyType"/>
+          <element minOccurs="0" name="pointCloud" type="core:AbstractPointCloudPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractThematicSurface"/>
         </sequence>
       </extension>
@@ -313,6 +370,42 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractVersion" type="anyType"/>
+  <element abstract="true" name="AbstractVersion" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractVersionType"/>
+  <complexType abstract="true" name="AbstractVersionType">
+    <complexContent>
+      <extension base="core:AbstractFeatureWithLifespanType">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractVersion"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="AbstractVersionPropertyType">
+    <sequence minOccurs="0">
+      <element ref="core:AbstractVersion"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
+  <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractVersionTransition" type="anyType"/>
+  <element abstract="true" name="AbstractVersionTransition" substitutionGroup="core:AbstractFeatureWithLifespan" type="core:AbstractVersionTransitionType"/>
+  <complexType abstract="true" name="AbstractVersionTransitionType">
+    <complexContent>
+      <extension base="core:AbstractFeatureWithLifespanType">
+        <sequence>
+          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfAbstractVersionTransition"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="AbstractVersionTransitionPropertyType">
+    <sequence minOccurs="0">
+      <element ref="core:AbstractVersionTransition"/>
+    </sequence>
+    <attributeGroup ref="gml:AssociationAttributeGroup"/>
+    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
+  </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAddress" type="anyType"/>
   <element name="Address" substitutionGroup="gml:AbstractFeature" type="core:AddressType">
     <annotation>
@@ -380,7 +473,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <complexContent>
                 <extension base="gml:AbstractFeatureMemberType">
                   <sequence minOccurs="0">
-                    <element ref="app:Appearance"/>
+                    <element ref="core:AbstractAppearance"/>
                   </sequence>
                   <attributeGroup ref="gml:AssociationAttributeGroup"/>
                 </extension>
@@ -392,7 +485,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <complexContent>
                 <extension base="gml:AbstractFeatureMemberType">
                   <sequence minOccurs="0">
-                    <element ref="vers:Version"/>
+                    <element ref="core:AbstractVersion"/>
                   </sequence>
                   <attributeGroup ref="gml:AssociationAttributeGroup"/>
                 </extension>
@@ -404,7 +497,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
               <complexContent>
                 <extension base="gml:AbstractFeatureMemberType">
                   <sequence minOccurs="0">
-                    <element ref="vers:VersionTransition"/>
+                    <element ref="core:AbstractVersionTransition"/>
                   </sequence>
                   <attributeGroup ref="gml:AssociationAttributeGroup"/>
                 </extension>
@@ -429,13 +522,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
     <complexContent>
       <extension base="gml:AbstractGMLType">
         <sequence>
-          <element name="relationType" type="gml:ReferenceType">
-            <annotation>
-              <appinfo>
-                <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">RelationType</targetCodeList>
-              </appinfo>
-            </annotation>
-          </element>
+          <element name="relationType" type="gml:CodeType"/>
           <element name="relatedTo" type="core:AbstractCityObjectPropertyType"/>
         </sequence>
       </extension>
@@ -500,53 +587,44 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
       <element ref="core:ExternalReference"/>
     </sequence>
   </complexType>
-  <element abstract="true" name="AbstractGenericApplicationPropertyOfImplicitGeometry" type="anyType"/>
-  <element name="ImplicitGeometry" substitutionGroup="gml:AbstractFeature" type="core:ImplicitGeometryType">
+  <element name="ImplicitGeometry" substitutionGroup="gml:AbstractObject" type="core:ImplicitGeometryType">
     <annotation>
       <documentation>SIG3D: A  geometric representation where the shape is stored only once as a prototypical geometry, for example a tree or other vegetation object, a traffic light or a traffic sign. This prototypic geometry object can be re-used or referenced many times, wherever the corresponding feature occurs in the 3D city model.</documentation>
     </annotation>
   </element>
   <complexType name="ImplicitGeometryType">
-    <complexContent>
-      <extension base="gml:AbstractFeatureType">
-        <sequence>
-          <element minOccurs="0" name="transformationMatrix" type="core:TransformationMatrix4x4Type">
-            <annotation>
-              <documentation>SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="mimeType" type="gml:CodeType">
-            <annotation>
-              <documentation>SIG3D: Mime type of the referenced external geometric object (attribute libraryObject).</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="libraryObject" type="anyURI">
-            <annotation>
-              <documentation>SIG3D: External link to a prototype geometry.</documentation>
-            </annotation>
-          </element>
-          <element name="referencePoint" type="gml:PointPropertyType">
-            <annotation>
-              <documentation>SIG3D: Base point of the object in the world coordinate system.</documentation>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="relativeGMLGeometry" type="gml:GeometryPropertyType">
-            <annotation>
-              <documentation>SIG3D: Geometry of the prototype, specified in a local coordinate system.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="appearance" type="app:AppearancePropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" ref="core:AbstractGenericApplicationPropertyOfImplicitGeometry"/>
-        </sequence>
-      </extension>
-    </complexContent>
+    <sequence>
+      <element name="transformationMatrix" type="core:TransformationMatrix4x4Type">
+        <annotation>
+          <documentation>SIG3D: Mathematical transformation (translation, rotation and scaling) between the prototype geometry and the actual spatial position of the object.</documentation>
+        </annotation>
+      </element>
+      <element minOccurs="0" name="mimeType" type="gml:CodeType">
+        <annotation>
+          <documentation>SIG3D: Mime type of the referenced external geometric object (attribute libraryObject).</documentation>
+        </annotation>
+      </element>
+      <element minOccurs="0" name="libraryObject" type="anyURI">
+        <annotation>
+          <documentation>SIG3D: External link to a prototype geometry.</documentation>
+        </annotation>
+      </element>
+      <element name="referencePoint" type="gml:PointPropertyType">
+        <annotation>
+          <documentation>SIG3D: Base point of the object in the world coordinate system.</documentation>
+        </annotation>
+      </element>
+      <element minOccurs="0" name="relativeGMLGeometry" type="gml:GeometryPropertyType">
+        <annotation>
+          <documentation>SIG3D: Geometry of the prototype, specified in a local coordinate system.</documentation>
+        </annotation>
+      </element>
+    </sequence>
   </complexType>
   <complexType name="ImplicitGeometryPropertyType">
-    <sequence minOccurs="0">
+    <sequence>
       <element ref="core:ImplicitGeometry"/>
     </sequence>
-    <attributeGroup ref="gml:AssociationAttributeGroup"/>
-    <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
   <simpleType name="IntegerBetween0and3Type">
     <restriction base="integer">
@@ -558,20 +636,8 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
   <complexType name="OccupancyType">
     <sequence>
       <element name="numberOfOccupants" type="integer"/>
-      <element minOccurs="0" name="interval" type="gml:ReferenceType">
-        <annotation>
-          <appinfo>
-            <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">IntervalValue</targetCodeList>
-          </appinfo>
-        </annotation>
-      </element>
-      <element minOccurs="0" name="occupantType" type="gml:ReferenceType">
-        <annotation>
-          <appinfo>
-            <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">OccupantTypeValue</targetCodeList>
-          </appinfo>
-        </annotation>
-      </element>
+      <element minOccurs="0" name="interval" type="gml:CodeType"/>
+      <element minOccurs="0" name="occupantType" type="gml:CodeType"/>
     </sequence>
   </complexType>
   <complexType name="OccupancyPropertyType">
@@ -583,13 +649,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
   <complexType name="QualifiedAreaType">
     <sequence>
       <element name="area" type="gml:AreaType"/>
-      <element name="typeOfArea" type="gml:ReferenceType">
-        <annotation>
-          <appinfo>
-            <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">QualifiedAreaValue</targetCodeList>
-          </appinfo>
-        </annotation>
-      </element>
+      <element name="typeOfArea" type="gml:CodeType"/>
     </sequence>
   </complexType>
   <complexType name="QualifiedAreaPropertyType">
@@ -601,13 +661,7 @@ AbstractCityObject relative to the surrounding terrain.</documentation>
   <complexType name="QualifiedVolumeType">
     <sequence>
       <element name="volume" type="gml:VolumeType"/>
-      <element name="typeOfVolume" type="gml:ReferenceType">
-        <annotation>
-          <appinfo>
-            <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">QualifiedVolumeValue</targetCodeList>
-          </appinfo>
-        </annotation>
-      </element>
+      <element name="typeOfVolume" type="gml:CodeType"/>
     </sequence>
   </complexType>
   <complexType name="QualifiedVolumePropertyType">
diff --git a/CityGML/Schema/construction.xsd b/CityGML/Schema/construction.xsd
index f58b897..7ad9785 100644
--- a/CityGML/Schema/construction.xsd
+++ b/CityGML/Schema/construction.xsd
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:con="http://www.opengis.net/citygml/construction/3.0" xmlns:core="http://www.opengis.net/citygml/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:gmlexr="http://www.opengis.net/gml/3.3/exr" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/construction/3.0" version="3.0.0">
+<?xml version="1.0" encoding="UTF-8"?><schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:con="http://www.opengis.net/citygml/construction/3.0" xmlns:core="http://www.opengis.net/citygml/3.0" xmlns:gml="http://www.opengis.net/gml/3.2" elementFormDefault="qualified" targetNamespace="http://www.opengis.net/citygml/construction/3.0" version="3.0.0">
   <import namespace="http://www.opengis.net/citygml/3.0" schemaLocation="./cityGMLBase.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/gml/3.3/exr" schemaLocation="http://schemas.opengis.net/gml/3.3/extdEncRule.xsd"/>
   <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
   <element abstract="true" name="AbstractGenericApplicationPropertyOfAbstractConstruction" type="anyType"/>
   <element abstract="true" name="AbstractConstruction" substitutionGroup="core:AbstractOccupiedSpace" type="con:AbstractConstructionType">
@@ -46,7 +45,6 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
             </annotation>
           </element>
           <element maxOccurs="unbounded" minOccurs="0" name="occupancy" type="core:OccupancyPropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="constructionSurface" type="con:AbstractConstructionSurfacePropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfAbstractConstruction"/>
         </sequence>
       </extension>
@@ -66,7 +64,6 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
       <extension base="core:AbstractThematicSurfaceType">
         <sequence>
           <element maxOccurs="unbounded" minOccurs="0" name="fillingSurface" type="con:AbstractFillingSurfacePropertyType"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="closureSurface" type="core:ClosureSurfacePropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfAbstractConstructionSurface"/>
         </sequence>
       </extension>
@@ -234,13 +231,7 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
   <element name="ConstructionEvent" substitutionGroup="gml:AbstractObject" type="con:ConstructionEventType"/>
   <complexType name="ConstructionEventType">
     <sequence>
-      <element name="event" type="gml:ReferenceType">
-        <annotation>
-          <appinfo>
-            <targetCodeList xmlns="http://www.opengis.net/gml/3.3/exr">EventValue</targetCodeList>
-          </appinfo>
-        </annotation>
-      </element>
+      <element name="event" type="gml:CodeType"/>
       <element name="dateOfEvent" type="date"/>
       <element minOccurs="0" name="description" type="string"/>
     </sequence>
@@ -260,7 +251,9 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
     <complexContent>
       <extension base="con:AbstractFillingElementType">
         <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="doorSurface" type="con:DoorSurfacePropertyType"/>
+          <element minOccurs="0" name="class" type="gml:CodeType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="address" type="core:AddressPropertyType">
             <annotation>
               <documentation>SIG3D: Relation between Door and Address.</documentation>
@@ -535,7 +528,7 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
     <complexContent>
       <extension base="con:AbstractConstructionType">
         <sequence>
-          <element name="class" type="gml:CodeType"/>
+          <element minOccurs="0" name="class" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfOtherConstruction"/>
@@ -655,7 +648,9 @@ AbstractConstruction. E.g. a road or canal is man made, but not an AbstractConst
     <complexContent>
       <extension base="con:AbstractFillingElementType">
         <sequence>
-          <element maxOccurs="unbounded" minOccurs="0" name="windowSurface" type="con:WindowSurfacePropertyType"/>
+          <element minOccurs="0" name="class" type="gml:CodeType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="con:AbstractGenericApplicationPropertyOfWindow"/>
         </sequence>
       </extension>
diff --git a/CityGML/Schema/dynamizer.xsd b/CityGML/Schema/dynamizer.xsd
index 72d8d72..fa6f66b 100644
--- a/CityGML/Schema/dynamizer.xsd
+++ b/CityGML/Schema/dynamizer.xsd
@@ -75,10 +75,10 @@
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfDynamizer" type="anyType"/>
-  <element name="Dynamizer" substitutionGroup="core:AbstractFeatureWithLifespan" type="dyn:DynamizerType"/>
+  <element name="Dynamizer" substitutionGroup="core:AbstractDynamizer" type="dyn:DynamizerType"/>
   <complexType name="DynamizerType">
     <complexContent>
-      <extension base="core:AbstractFeatureWithLifespanType">
+      <extension base="core:AbstractDynamizerType">
         <sequence>
           <element name="attributeRef" type="anyURI"/>
           <element name="startTime" type="gml:TimePositionType"/>
diff --git a/CityGML/Schema/generics.xsd b/CityGML/Schema/generics.xsd
index 9a3a85c..4ed3e10 100644
--- a/CityGML/Schema/generics.xsd
+++ b/CityGML/Schema/generics.xsd
@@ -5,11 +5,15 @@
   <import namespace="http://www.opengis.net/citygml/3.0" schemaLocation="./cityGMLBase.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 - http://shapechange.net/-->
-  <element abstract="true" name="AbstractGenericAttribute" substitutionGroup="gml:AbstractObject" type="gen:AbstractGenericAttributeType"/>
+  <element abstract="true" name="AbstractGenericAttribute" substitutionGroup="core:AbstractGenericAttribute" type="gen:AbstractGenericAttributeType"/>
   <complexType abstract="true" name="AbstractGenericAttributeType">
-    <sequence>
-      <element name="name" type="string"/>
-    </sequence>
+    <complexContent>
+      <extension base="core:AbstractGenericAttributeType">
+        <sequence>
+          <element name="name" type="string"/>
+        </sequence>
+      </extension>
+    </complexContent>
   </complexType>
   <complexType name="AbstractGenericAttributePropertyType">
     <sequence>
diff --git a/CityGML/Schema/pointCloud.xsd b/CityGML/Schema/pointCloud.xsd
index 36d6367..7e34e17 100644
--- a/CityGML/Schema/pointCloud.xsd
+++ b/CityGML/Schema/pointCloud.xsd
@@ -3,10 +3,10 @@
   <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 - http://shapechange.net/-->
   <element abstract="true" name="AbstractGenericApplicationPropertyOfPointCloud" type="anyType"/>
-  <element name="PointCloud" substitutionGroup="gml:AbstractFeature" type="pcl:PointCloudType"/>
+  <element name="PointCloud" substitutionGroup="core:AbstractPointCloud" type="pcl:PointCloudType"/>
   <complexType name="PointCloudType">
     <complexContent>
-      <extension base="gml:AbstractFeatureType">
+      <extension base="core:AbstractPointCloudType">
         <sequence>
           <element minOccurs="0" name="mimeType" type="gml:CodeType"/>
           <element minOccurs="0" name="pointFile" type="anyURI"/>
diff --git a/CityGML/Schema/transportation.xsd b/CityGML/Schema/transportation.xsd
index 013355a..cee63a2 100644
--- a/CityGML/Schema/transportation.xsd
+++ b/CityGML/Schema/transportation.xsd
@@ -11,6 +11,7 @@
           <element minOccurs="0" name="class" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
+          <element minOccurs="0" name="surfaceMaterial" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="tran:AbstractGenericApplicationPropertyOfAuxiliaryTrafficArea"/>
         </sequence>
       </extension>
@@ -48,12 +49,6 @@
               <documentation>SIG3D: Actual usage of AuxiliaryTrafficSpace as given by the relevant national regulations, information communities, or specific applications.</documentation>
             </annotation>
           </element>
-          <element minOccurs="0" name="surfaceMaterial" type="gml:CodeType">
-            <annotation>
-              <documentation>SIG3D: Surface material covering the AuxiliaryTrafficSpace as given by the relevant national regulations, information communities or specific applications.</documentation>
-            </annotation>
-          </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="auxiliaryTraffixArea" type="tran:AuxiliaryTrafficAreaPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="tran:AbstractGenericApplicationPropertyOfAuxiliaryTrafficSpace"/>
         </sequence>
       </extension>
@@ -309,6 +304,7 @@
           <element minOccurs="0" name="class" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
+          <element minOccurs="0" name="surfaceMaterial" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="tran:AbstractGenericApplicationPropertyOfTrafficArea"/>
         </sequence>
       </extension>
@@ -346,11 +342,6 @@
               <documentation>SIG3D: Actual usage of TrafficSpace as given by the relevant national regulations, information communities, or specific applications.</documentation>
             </annotation>
           </element>
-          <element minOccurs="0" name="surfaceMaterial" type="gml:CodeType">
-            <annotation>
-              <documentation>SIG3D: Surface material covering the TrafficSpace as given by the relevant national regulations, information communities, or specific applications.</documentation>
-            </annotation>
-          </element>
           <element maxOccurs="unbounded" minOccurs="0" name="occupancy" type="core:OccupancyPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="predecessor" type="tran:TrafficSpacePropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="successor" type="tran:TrafficSpacePropertyType"/>
@@ -366,18 +357,6 @@
               </complexContent>
             </complexType>
           </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="trafficArea">
-            <complexType>
-              <complexContent>
-                <extension base="gml:AbstractFeatureMemberType">
-                  <sequence minOccurs="0">
-                    <element ref="tran:TrafficArea"/>
-                  </sequence>
-                  <attributeGroup ref="gml:AssociationAttributeGroup"/>
-                </extension>
-              </complexContent>
-            </complexType>
-          </element>
           <element minOccurs="0" name="lod2Network" type="gml:GeometricComplexPropertyType"/>
           <element minOccurs="0" name="lod3Network" type="gml:GeometricComplexPropertyType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="tran:AbstractGenericApplicationPropertyOfTrafficSpace"/>
@@ -496,7 +475,7 @@
     <complexContent>
       <extension base="core:AbstractUnoccupiedSpaceType">
         <sequence>
-          <element name="class" type="gml:CodeType"/>
+          <element minOccurs="0" name="class" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="function" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" name="usage" type="gml:CodeType"/>
           <element maxOccurs="unbounded" minOccurs="0" ref="tran:AbstractGenericApplicationPropertyOfTransportationSpace"/>
diff --git a/CityGML/Schema/versioning.xsd b/CityGML/Schema/versioning.xsd
index 7403519..1b923b1 100644
--- a/CityGML/Schema/versioning.xsd
+++ b/CityGML/Schema/versioning.xsd
@@ -32,10 +32,10 @@
     </restriction>
   </simpleType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfVersion" type="anyType"/>
-  <element name="Version" substitutionGroup="core:AbstractFeatureWithLifespan" type="vers:VersionType"/>
+  <element name="Version" substitutionGroup="core:AbstractVersion" type="vers:VersionType"/>
   <complexType name="VersionType">
     <complexContent>
-      <extension base="core:AbstractFeatureWithLifespanType">
+      <extension base="core:AbstractVersionType">
         <sequence>
           <element maxOccurs="unbounded" minOccurs="0" name="tag" type="string"/>
           <element maxOccurs="unbounded" minOccurs="0" name="versionMember">
@@ -63,10 +63,10 @@
     <attributeGroup ref="gml:OwnershipAttributeGroup"/>
   </complexType>
   <element abstract="true" name="AbstractGenericApplicationPropertyOfVersionTransition" type="anyType"/>
-  <element name="VersionTransition" substitutionGroup="core:AbstractFeatureWithLifespan" type="vers:VersionTransitionType"/>
+  <element name="VersionTransition" substitutionGroup="core:AbstractVersionTransition" type="vers:VersionTransitionType"/>
   <complexType name="VersionTransitionType">
     <complexContent>
-      <extension base="core:AbstractFeatureWithLifespanType">
+      <extension base="core:AbstractVersionTransitionType">
         <sequence>
           <element minOccurs="0" name="reason" type="string"/>
           <element name="clonePredecessor" type="boolean"/>
diff --git a/CityGML/Schema/waterBody.xsd b/CityGML/Schema/waterBody.xsd
index 2f87e7b..b87cd01 100644
--- a/CityGML/Schema/waterBody.xsd
+++ b/CityGML/Schema/waterBody.xsd
@@ -49,18 +49,6 @@
               <documentation>SIG3D: Actual usage of WaterBody as given by the relevant national regulations, information communities, or specific applications.</documentation>
             </annotation>
           </element>
-          <element maxOccurs="unbounded" minOccurs="0" name="WaterBoundarySurface">
-            <complexType>
-              <complexContent>
-                <extension base="gml:AbstractFeatureMemberType">
-                  <sequence minOccurs="0">
-                    <element ref="wtr:AbstractWaterBoundarySurface"/>
-                  </sequence>
-                  <attributeGroup ref="gml:AssociationAttributeGroup"/>
-                </extension>
-              </complexContent>
-            </complexType>
-          </element>
           <element maxOccurs="unbounded" minOccurs="0" ref="wtr:AbstractGenericApplicationPropertyOfWaterBody"/>
         </sequence>
       </extension>
diff --git a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml
index 518ae39..ba57ea5 100644
--- a/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml
+++ b/CityGML/ShapeChangeConfigurationFile_CityGML_3.0.xml
@@ -7,7 +7,7 @@
     
   <input>
     <parameter name="inputModelType" value="EA7"/>
-    <parameter name="inputFile" value="D:/CityGML_3.0/CityGML_3.0_Consolidated_Draft.eap"/>
+    <parameter name="inputFile" value="D:/CityGML/CityGML_3.0/_CityGML_3.0_UML-Modell/CityGML 3.0 UML Arbeitskopie/CityGML_3.0_Consolidated_Draft_2019_10_01.eap"/>
     <parameter name="appSchemaNamespaceRegex" value="^http://www.opengis.net/citygml/.*"/>
     <parameter name="checkingConstraints" value="disabled"/>
     <parameter name="addTaggedValues" value="itemType"/>
@@ -21,15 +21,16 @@
   
   <log>
     <parameter name="reportLevel" value="INFO"/>
-    <parameter name="logFile" value="D:/CityGML_3.0/logs/CityGML_3.0.xml"/>
+    <parameter name="logFile" value="D:/CityGML/CityGML_3.0/_CityGML_3.0_GML-Encoding/logs/CityGML_3.0.xml"/>
   </log>
   
   <targets>
     <TargetXmlSchema class="de.interactive_instruments.ShapeChange.Target.XmlSchema.XmlSchema" mode="enabled">
-      <targetParameter name="outputDirectory" value="D:/CityGML_3.0/xsds"/>
+      <targetParameter name="outputDirectory" value="D:/CityGML/CityGML_3.0/_CityGML_3.0_GML-Encoding/xsds"/>
       <targetParameter name="defaultEncodingRule" value="citygml"/>
       <rules>
-        <EncodingRule name="citygml" extends="gml33">
+        <EncodingRule name="citygml" extends="iso19136_2007"> <!-- gml33 -->
+          <rule name="rule-xsd-rel-association-classes"/>
           <rule name="rule-xsd-cls-basictype"/>
           <rule name="rule-xsd-cls-adehook"/>
           <rule name="rule-xsd-prop-initialValue"/>
@@ -70,7 +71,7 @@
         <XsdMapEntry type="URI" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="anyURI" xmlType="anyURI" xmlTypeType="simple" xmlTypeContent="simple"/>
         <XsdMapEntry type="Code" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="gml:CodeType" xmlType="gml:CodeType" xmlTypeType="complex" xmlTypeContent="simple"/>
         <XsdMapEntry type="MeasureOrNilReasonList" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="gml:MeasureOrNilReasonListType" xmlType="gml:MeasureOrNilReasonListType" xmlTypeType="simple" xmlTypeContent="complex"/>
-        <XsdMapEntry type="doubleList" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="gml:doubleList" xmlType="gml:doubleList" xmlTypeType="simple" xmlTypeContent="simple"/>
+        <XsdMapEntry type="DoubleList" xsdEncodingRules="iso19136_2007 gml33" xmlPropertyType="gml:doubleList" xmlType="gml:doubleList" xmlTypeType="simple" xmlTypeContent="simple"/>
         <XsdMapEntry type="SC_CRS" xsdEncodingRules="citygml" xmlAttributeGroup="gml:SRSReferenceGroup"/>
         <XsdMapEntry type="CV_DiscreteGridPointCoverage" xsdEncodingRules="iso19136_2007 gml33" xmlType="gml:RectifiedGridCoverageType" xmlElement="gml:RectifiedGridCoverage" xmlPropertyType="_P_"/>
         <XsdMapEntry type="TimeseriesTVP" xsdEncodingRules="citygml" xmlType="tsml:TimeseriesTVPType" xmlElement="tsml:TimeseriesTVP" xmlPropertyType="tsml:TimeseriesTVPPropertyType"/>
@@ -79,7 +80,7 @@
       </xsdMapEntries>
     </TargetXmlSchema>
     <!--Target class="de.interactive_instruments.ShapeChange.Target.FeatureCatalogue.FeatureCatalogue" mode="enabled">
-     <targetParameter name="outputDirectory" value="D:/CityGML_3.0/FeatureCatalog"/>
+     <targetParameter name="outputDirectory" value="D:/CityGML/CityGML_3.0/_CityGML_3.0_GML-Encoding/FeatureCatalog"/>
      <targetParameter name="outputFilename" value="FC_CityGML"/>
      <targetParameter name="package" value="CityFurniture"/>
      <targetParameter name="inheritedProperties" value="false"/>
@@ -94,7 +95,7 @@
      <targetParameter name="xslTransformerFactory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
      <targetParameter name="xslhtmlFile" value="html.xsl"/>
      <targetParameter name="xsldocxFile" value="docx.xsl"/>
-     <targetParameter name="docxTemplateFilePath" value="D:/CityGML_3.0/FeatureCatalog/template.docx"/>
+     <targetParameter name="docxTemplateFilePath" value="D:/CityGML/CityGML_3.0/_CityGML_3.0_GML-Encoding/FeatureCatalog/template.docx"/>
     </Target-->
   </targets>
 </ShapeChangeConfiguration>