diff --git a/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd b/public/FWEBuilding/v2.1/XSD/FWEBuilding.xsd
index 515b7304fd9fed18b0415d654fa54a440a383e6a..f993147215e15653c0fc5eae1556296203e153a3 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 abstract="true" name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
-  <complexType abstract="true" name="BuildingSurveyType">
+  <element name="BuildingSurvey" substitutionGroup="gml:_Feature" type="FWEB:BuildingSurveyType"/>
+  <complexType name="BuildingSurveyType">
     <complexContent>
       <extension base="gml:AbstractFeatureType">
         <sequence>
@@ -15,6 +15,29 @@
           <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 minOccurs="0" name="buildingFootprintArea" type="gml:AreaType"/>
+          <element minOccurs="0" name="totalFloorArea" type="gml:AreaType"/>
+          <element maxOccurs="unbounded" minOccurs="0" name="foodSurvey" type="FWEB:FoodSurveyPropertyType">
+            <annotation>
+              <appinfo>
+                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+              </appinfo>
+            </annotation>
+          </element>
+          <element maxOccurs="unbounded" minOccurs="0" name="waterSurvey" type="FWEB:WaterSurveyPropertyType">
+            <annotation>
+              <appinfo>
+                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+              </appinfo>
+            </annotation>
+          </element>
+          <element maxOccurs="unbounded" minOccurs="0" name="energySurvey" type="FWEB:EnergySurveyPropertyType">
+            <annotation>
+              <appinfo>
+                <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
+              </appinfo>
+            </annotation>
+          </element>
         </sequence>
       </extension>
     </complexContent>
@@ -101,33 +124,25 @@
     </sequence>
     <attributeGroup ref="gml:AssociationAttributeGroup"/>
   </complexType>
-  <element name="buildingFootprintArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType">
-    <annotation>
-      <appinfo>
-        <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
-      </appinfo>
-    </annotation>
-  </element>
-  <element name="totalFloorArea" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="gml:AreaType">
+  <element name="fweAreaName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
     <annotation>
       <appinfo>
         <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
       </appinfo>
     </annotation>
   </element>
-  <element name="fweAreaName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
+  <element name="fweSystemName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
     <annotation>
       <appinfo>
         <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
       </appinfo>
     </annotation>
   </element>
-  <element name="fweSystemName" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="string">
+  <element name="consistsOfBuildingSurveyTypes" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType">
     <annotation>
       <appinfo>
-        <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="maxOccurs">1</taggedValue>
+        <taggedValue xmlns="http://www.interactive-instruments.de/ShapeChange/AppInfo" tag="relationType">composition</taggedValue>
       </appinfo>
     </annotation>
   </element>
-  <element name="consistsOfBuildingSurvey" substitutionGroup="bldg:_GenericApplicationPropertyOfAbstractBuilding" type="FWEB:BuildingSurveyPropertyType"/>
 </schema>