diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index 2ec7728ba39aaa0cecec09a19e593206571120fc..515b7304fd9fed18b0415d654fa54a440a383e6a 100644
--- a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
+++ b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
@@ -6,8 +6,8 @@
   <import namespace="http://www.opengis.net/citygml/building/2.0" schemaLocation="http://schemas.opengis.net/citygml/building/2.0/building.xsd"/>
   <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
   <!--XML Schema document created by ShapeChange - http://shapechange.net/-->
-  <element name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
-  <complexType name="BuildingSurveyType">
+  <element abstract="true" name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
+  <complexType abstract="true" name="BuildingSurveyType">
     <complexContent>
       <extension base="gml:AbstractFeatureType">
         <sequence>
@@ -15,27 +15,6 @@
           <element maxOccurs="unbounded" minOccurs="0" name="surveyYearVersion" type="double"/>
           <element maxOccurs="unbounded" minOccurs="0" name="surveyDescription" type="string"/>
           <element minOccurs="0" name="population" type="integer"/>
-          <element maxOccurs="unbounded" minOccurs="0" name="consistsOf" type="FWEB:FoodSurveyPropertyType">
-            <annotation>
-              <appinfo>
-                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
-              </appinfo>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="consistsOf" type="FWEB:WaterSurveyPropertyType">
-            <annotation>
-              <appinfo>
-                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
-              </appinfo>
-            </annotation>
-          </element>
-          <element minOccurs="0" name="consistsOf" type="FWEB:EnergySurveyPropertyType">
-            <annotation>
-              <appinfo>
-                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
-              </appinfo>
-            </annotation>
-          </element>
         </sequence>
       </extension>
     </complexContent>
@@ -150,5 +129,5 @@
       </appinfo>
     </annotation>
   </element>
-  <element name="buildingSurvey" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType"/>
+  <element name="consistsOfBuildingSurvey" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType"/>
 </schema>