changed to beta8 classes

src-gen/org/sig3d/citygml/energyADE3beta8/MonthlyTimeSeriesType.java

+//
+// Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
+// ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
+// Any modifications to this file will be lost upon recompilation of the source
+// Generated: Wed Dec 10 10:52:09 CET 2025
+//
+
+
+package org.sig3d.citygml.energyADE3beta8;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import net.opengis.gml.MeasureListType;
+import net.opengis.gml.TimePeriodPropertyType;
+
+
+/**
+ * <p>Java class for MonthlyTimeSeriesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MonthlyTimeSeriesType"&gt;
+ *   &lt;complexContent&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType"&gt;
+ *       &lt;sequence&gt;
+ *         &lt;element name="temporalExtent" type="{http://www.opengis.net/gml}TimePeriodPropertyType"/&gt;
+ *         &lt;element name="valuesList" type="{http://www.opengis.net/gml}MeasureListType"/&gt;
+ *       &lt;/sequence&gt;
+ *     &lt;/extension&gt;
+ *   &lt;/complexContent&gt;
+ * &lt;/complexType&gt;
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MonthlyTimeSeriesType", propOrder = {
+    "temporalExtent",
+    "valuesList"
+})
+public class MonthlyTimeSeriesType
+    extends AbstractTimeSeriesType
+{
+
+    @XmlElement(required = true)
+    protected TimePeriodPropertyType temporalExtent;
+    @XmlElement(required = true)
+    protected MeasureListType valuesList;
+
+    /**
+     * Gets the value of the temporalExtent property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TimePeriodPropertyType }
+     *     
+     */
+    public TimePeriodPropertyType getTemporalExtent() {
+        return temporalExtent;
+    }
+
+    /**
+     * Sets the value of the temporalExtent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TimePeriodPropertyType }
+     *     
+     */
+    public void setTemporalExtent(TimePeriodPropertyType value) {
+        this.temporalExtent = value;
+    }
+
+    public boolean isSetTemporalExtent() {
+        return (this.temporalExtent!= null);
+    }
+
+    /**
+     * Gets the value of the valuesList property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MeasureListType }
+     *     
+     */
+    public MeasureListType getValuesList() {
+        return valuesList;
+    }
+
+    /**
+     * Sets the value of the valuesList property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MeasureListType }
+     *     
+     */
+    public void setValuesList(MeasureListType value) {
+        this.valuesList = value;
+    }
+
+    public boolean isSetValuesList() {
+        return (this.valuesList!= null);
+    }
+
+}

src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDevicePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/MovableShadingDevicePropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDeviceType.java → src-gen/org/sig3d/citygml/energyADE3beta8/MovableShadingDeviceType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/NetworkConnectionStatusValueType.java → src-gen/org/sig3d/citygml/energyADE3beta8/NetworkConnectionStatusValueType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;

src-gen/org/sig3d/citygml/energyADE3beta7/ObjectFactory.java → src-gen/org/sig3d/citygml/energyADE3beta8/ObjectFactory.java

@@ -2,15 +2,16 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 import net.opengis.gml.AngleType;
 import net.opengis.gml.AreaType;
@@ -24,7 +25,7 @@ import net.opengis.gml.ScaleType;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the org.sig3d.citygml.energyADE3beta7 package. 
+ * generated in the org.sig3d.citygml.energyADE3beta8 package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -39,6 +40,7 @@ import net.opengis.gml.ScaleType;
 public class ObjectFactory {
 
     private final static QName _AbstractOpticalProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractOpticalProperty");
+    private final static QName _Absorptance_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Absorptance");
     private final static QName _Emissivity_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Emissivity");
     private final static QName _Reflectance_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Reflectance");
     private final static QName _Transmittance_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Transmittance");
@@ -47,97 +49,110 @@ public class ObjectFactory {
     private final static QName _QualifiedHeight_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "QualifiedHeight");
     private final static QName _QualifiedVolume_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "QualifiedVolume");
     private final static QName _SuitabilityProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Suitability");
+    private final static QName _AbstractADEFeature_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractADEFeature");
+    private final static QName _AbstractLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractLayeredConstruction");
+    private final static QName _AbstractSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractSchedule");
     private final static QName _AbstractTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractTimeSeries");
+    private final static QName _DeviceOperation_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "DeviceOperation");
+    private final static QName _SensorData_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "SensorData");
+    private final static QName _AbstractFeatureWithLifeSpan_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractFeatureWithLifeSpan");
+    private final static QName _AbstractResource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractResource");
+    private final static QName _UtilityNetworkConnection_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UtilityNetworkConnection");
     private final static QName _RegularTimeSeriesProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "RegularTimeSeries");
     private final static QName _RegularTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "RegularTimeSeriesFile");
     private final static QName _TypicalValuesTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "TypicalValuesTimeSeries");
     private final static QName _TypicalValuesTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "TypicalValuesTimeSeriesFile");
+    private final static QName _MonthlyTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "MonthlyTimeSeries");
+    private final static QName _MonthlyTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "MonthlyTimeSeriesFile");
+    private final static QName _TypicalValuesMonthlyTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "TypicalValuesMonthlyTimeSeries");
+    private final static QName _TypicalValuesMonthlyTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "TypicalValuesMonthlyTimeSeriesFile");
     private final static QName _SensorConnection_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "SensorConnection");
-    private final static QName _AbstractSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractSchedule");
-    private final static QName _DualValueSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "DualValueSchedule");
+    private final static QName _AtomicScheduleValue_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AtomicScheduleValue");
     private final static QName _AtomicSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AtomicSchedule");
+    private final static QName _DualValueSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "DualValueSchedule");
     private final static QName _CompositeSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "CompositeSchedule");
     private final static QName _ScheduleComponent_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ScheduleComponent");
     private final static QName _ScheduleLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ScheduleLibrary");
     private final static QName _AbstractLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractLibrary");
-    private final static QName _AbstractBuildingPartition_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractBuildingPartition");
-    private final static QName _AbstractBuildingUnit_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractBuildingUnit");
+    private final static QName _AbstractCityObjectSpace_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractCityObjectSpace");
     private final static QName _AbstractDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractDevice");
-    private final static QName _AbstractLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractLayeredConstruction");
-    private final static QName _AbstractResource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractResource");
-    private final static QName _AbstractThermalZone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractThermalZone");
-    private final static QName _AbstractUsageZone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractUsageZone");
+    private final static QName _CityObjectRelation_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "CityObjectRelation");
+    private final static QName _PermanentIdentifier_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "permanentIdentifier");
+    private final static QName _ValidFrom_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "validFrom");
+    private final static QName _ValidTo_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "validTo");
+    private final static QName _RelatedTo_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "relatedTo");
+    private final static QName _Device_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "device");
+    private final static QName _LayeredConstructionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "layeredConstruction");
+    private final static QName _LibraryLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "libraryLayeredConstruction");
+    private final static QName _Resource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "resource");
+    private final static QName _Suitability_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "suitability");
+    private final static QName _UtilityNetworkConnectionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "utilityNetworkConnection");
+    private final static QName _SensorDataProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "sensorData");
+    private final static QName _ReferencePoint_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "referencePoint");
     private final static QName _EnergyPerformanceCertificate_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "EnergyPerformanceCertificate");
+    private final static QName _Occupants_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Occupants");
     private final static QName _RefurbishmentMeasure_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "RefurbishmentMeasure");
-    private final static QName _UtilityNetworkConnection_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UtilityNetworkConnection");
-    private final static QName _WeatherData_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "WeatherData");
+    private final static QName _AbstractBuildingSpace_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractBuildingSpace");
+    private final static QName _BuildingUnit_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "BuildingUnit");
+    private final static QName _AbstractZone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractZone");
+    private final static QName _Zone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Zone");
+    private final static QName _ZonePart_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZonePart");
+    private final static QName _AbstractZoneBoundarySurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractZoneBoundarySurface");
+    private final static QName _AbstractZoneOpening_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractZoneOpening");
+    private final static QName _ZoneAtticFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneAtticFloorSurface");
+    private final static QName _ZoneBasementCeilingSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneBasementCeilingSurface");
+    private final static QName _ZoneClosureSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneClosureSurface");
+    private final static QName _ZoneExteriorWallSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneExteriorWallSurface");
+    private final static QName _ZoneGroundSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneGroundSurface");
+    private final static QName _ZoneIntermediateFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneIntermediateFloorSurface");
+    private final static QName _ZoneRoofSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneRoofSurface");
+    private final static QName _ZoneUndergroundWallSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneUndergroundWallSurface");
+    private final static QName _ZoneDoor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneDoor");
+    private final static QName _ZoneWindow_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ZoneWindow");
+    private final static QName _BdgHeight_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgHeight");
+    private final static QName _BdgArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgArea");
+    private final static QName _BdgVolume_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgVolume");
+    private final static QName _BdgOwnerName_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOwnerName");
+    private final static QName _BdgOwnershipType_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOwnershipType");
     private final static QName _BdgAtticThermalStatus_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgAtticThermalStatus");
     private final static QName _BdgBasementThermalStatus_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBasementThermalStatus");
     private final static QName _BdgConstructionWeight_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgConstructionWeight");
-    private final static QName _BdgArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgArea");
-    private final static QName _BdgHeight_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgHeight");
-    private final static QName _BdgVolume_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgVolume");
     private final static QName _BdgIsProtected_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgIsProtected");
     private final static QName _BdgType_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgType");
+    private final static QName _OccupiedBy_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "occupiedBy");
     private final static QName _BuildingUnitProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "buildingUnit");
+    private final static QName _ZoneProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "zone");
     private final static QName _EnergyPerformanceCertificateProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "energyPerformanceCertificate");
     private final static QName _RefurbishmentMeasureProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "refurbishmentMeasure");
-    private final static QName _ThermalZoneProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "thermalZone");
-    private final static QName _UsageZoneProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "usageZone");
-    private final static QName _CityObjectRelation_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "CityObjectRelation");
-    private final static QName _RelatedTo_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "relatedTo");
-    private final static QName _Device_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "device");
-    private final static QName _LayeredConstructionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "layeredConstruction");
-    private final static QName _Resource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "resource");
-    private final static QName _Suitability_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "suitability");
-    private final static QName _UtilityNetworkConnectionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "utilityNetworkConnection");
-    private final static QName _WeatherDataProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "weatherData");
-    private final static QName _ReferencePoint_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "referencePoint");
-    private final static QName _ConstructionMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ConstructionMaterial");
-    private final static QName _Energy_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Energy");
-    private final static QName _Food_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Food");
-    private final static QName _OtherResource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "OtherResource");
-    private final static QName _UrbanSpace_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UrbanSpace");
-    private final static QName _Waste_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Waste");
-    private final static QName _Water_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Water");
-    private final static QName _AbstractMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractMaterial");
-    private final static QName _Gas_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Gas");
-    private final static QName _LayeredConstructionLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "LayeredConstructionLibrary");
-    private final static QName _Layer_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Layer");
-    private final static QName _LayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "LayeredConstruction");
-    private final static QName _MaterialLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "MaterialLibrary");
-    private final static QName _ReverseLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ReverseLayeredConstruction");
-    private final static QName _SolidMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "SolidMaterial");
-    private final static QName _AtticFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AtticFloorSurface");
-    private final static QName _BasementCeilingSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "BasementCeilingSurface");
-    private final static QName _IntermediateFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "IntermediateFloorSurface");
-    private final static QName _PartyWallSurface_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "PartyWallSurface");
-    private final static QName _ThermalZone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ThermalZone");
-    private final static QName _BdgBdrySurfAzimuth_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfAzimuth");
-    private final static QName _BdgBdrySurfGroundViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfGroundViewFactor");
-    private final static QName _BdgBdrySurfHeatCapacity_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfHeatCapacity");
-    private final static QName _BdgBdrySurfInclination_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfInclination");
-    private final static QName _BdgBdrySurfIsAdiabatic_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfIsAdiabatic");
+    private final static QName _BdgBdrySurfIsShared_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfIsShared");
+    private final static QName _BdgBdrySurfThickness_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfThickness");
+    private final static QName _BdgBdrySurfTotalSurfaceArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfTotalSurfaceArea");
     private final static QName _BdgBdrySurfOpaqueSurfaceArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfOpaqueSurfaceArea");
     private final static QName _BdgBdrySurfOpeningToSurfaceRatio_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfOpeningToSurfaceRatio");
+    private final static QName _BdgBdrySurfHeatCapacity_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfHeatCapacity");
+    private final static QName _BdgBdrySurfAzimuth_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfAzimuth");
+    private final static QName _BdgBdrySurfInclination_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfInclination");
+    private final static QName _BdgBdrySurfGroundViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfGroundViewFactor");
     private final static QName _BdgBdrySurfSkyViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfSkyViewFactor");
-    private final static QName _BdgBdrySurfThickness_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfThickness");
-    private final static QName _BdgBdrySurfTotalSurfaceArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgBdrySurfTotalSurfaceArea");
     private final static QName _BdgOpnArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnArea");
+    private final static QName _BdgOpnInclination_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnInclination");
     private final static QName _BdgOpnAzimuth_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnAzimuth");
     private final static QName _BdgOpnGroundViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnGroundViewFactor");
-    private final static QName _BdgOpnInclination_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnInclination");
     private final static QName _BdgOpnSkyViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "bdgOpnSkyViewFactor");
-    private final static QName _BuildingUnit_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "BuildingUnit");
-    private final static QName _Occupants_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Occupants");
-    private final static QName _UsageZone_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UsageZone");
+    private final static QName _ConstructionMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ConstructionMaterial");
+    private final static QName _Energy_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Energy");
+    private final static QName _Food_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Food");
+    private final static QName _OtherResource_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "OtherResource");
+    private final static QName _UrbanSpace_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UrbanSpace");
+    private final static QName _Waste_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Waste");
+    private final static QName _Water_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Water");
     private final static QName _AbstractSolarCollector_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractSolarCollector");
     private final static QName _Boiler_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Boiler");
-    private final static QName _DeviceOperation_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "DeviceOperation");
     private final static QName _ElectricalStorageDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ElectricalStorageDevice");
     private final static QName _GenericDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "GenericDevice");
     private final static QName _GenericElectricalDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "GenericElectricalDevice");
     private final static QName _GenericSolarCollector_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "GenericSolarCollector");
+    private final static QName _GenericStorageDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "GenericStorageDevice");
     private final static QName _HeatPump_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "HeatPump");
     private final static QName _LightingDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "LightingDevice");
     private final static QName _MovableShadingDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "MovableShadingDevice");
@@ -147,14 +162,32 @@ public class ObjectFactory {
     private final static QName _ThermalStorageDevice_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ThermalStorageDevice");
     private final static QName _UrbanFunctionArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "UrbanFunctionArea");
     private final static QName _WeatherStation_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "WeatherStation");
+    private final static QName _WeatherData_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "WeatherData");
+    private final static QName _AbstractMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractMaterial");
+    private final static QName _LayeredConstructionLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "LayeredConstructionLibrary");
+    private final static QName _Layer_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Layer");
+    private final static QName _LayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "LayeredConstruction");
+    private final static QName _MaterialLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "MaterialLibrary");
+    private final static QName _ReverseLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "ReverseLayeredConstruction");
+    private final static QName _Gas_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Gas");
+    private final static QName _Liquid_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "Liquid");
+    private final static QName _SolidMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "SolidMaterial");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.sig3d.citygml.energyADE3beta7
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.sig3d.citygml.energyADE3beta8
      * 
      */
     public ObjectFactory() {
     }
 
+    /**
+     * Create an instance of {@link AbsorptanceType }
+     * 
+     */
+    public AbsorptanceType createAbsorptanceType() {
+        return new AbsorptanceType();
+    }
+
     /**
      * Create an instance of {@link EmissivityType }
      * 
@@ -212,179 +245,147 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link RegularTimeSeriesType }
-     * 
-     */
-    public RegularTimeSeriesType createRegularTimeSeriesType() {
-        return new RegularTimeSeriesType();
-    }
-
-    /**
-     * Create an instance of {@link RegularTimeSeriesFileType }
-     * 
-     */
-    public RegularTimeSeriesFileType createRegularTimeSeriesFileType() {
-        return new RegularTimeSeriesFileType();
-    }
-
-    /**
-     * Create an instance of {@link TypicalValuesTimeSeriesType }
-     * 
-     */
-    public TypicalValuesTimeSeriesType createTypicalValuesTimeSeriesType() {
-        return new TypicalValuesTimeSeriesType();
-    }
-
-    /**
-     * Create an instance of {@link TypicalValuesTimeSeriesFileType }
-     * 
-     */
-    public TypicalValuesTimeSeriesFileType createTypicalValuesTimeSeriesFileType() {
-        return new TypicalValuesTimeSeriesFileType();
-    }
-
-    /**
-     * Create an instance of {@link SensorConnectionType }
+     * Create an instance of {@link DeviceOperationType }
      * 
      */
-    public SensorConnectionType createSensorConnectionType() {
-        return new SensorConnectionType();
+    public DeviceOperationType createDeviceOperationType() {
+        return new DeviceOperationType();
     }
 
     /**
-     * Create an instance of {@link DualValueScheduleType }
+     * Create an instance of {@link SensorDataType }
      * 
      */
-    public DualValueScheduleType createDualValueScheduleType() {
-        return new DualValueScheduleType();
+    public SensorDataType createSensorDataType() {
+        return new SensorDataType();
     }
 
     /**
-     * Create an instance of {@link AtomicScheduleType }
+     * Create an instance of {@link UtilityNetworkConnectionType }
      * 
      */
-    public AtomicScheduleType createAtomicScheduleType() {
-        return new AtomicScheduleType();
+    public UtilityNetworkConnectionType createUtilityNetworkConnectionType() {
+        return new UtilityNetworkConnectionType();
     }
 
     /**
-     * Create an instance of {@link CompositeScheduleType }
+     * Create an instance of {@link RegularTimeSeriesType }
      * 
      */
-    public CompositeScheduleType createCompositeScheduleType() {
-        return new CompositeScheduleType();
+    public RegularTimeSeriesType createRegularTimeSeriesType() {
+        return new RegularTimeSeriesType();
     }
 
     /**
-     * Create an instance of {@link ScheduleComponentType }
+     * Create an instance of {@link RegularTimeSeriesFileType }
      * 
      */
-    public ScheduleComponentType createScheduleComponentType() {
-        return new ScheduleComponentType();
+    public RegularTimeSeriesFileType createRegularTimeSeriesFileType() {
+        return new RegularTimeSeriesFileType();
     }
 
     /**
-     * Create an instance of {@link ScheduleLibraryType }
+     * Create an instance of {@link TypicalValuesTimeSeriesType }
      * 
      */
-    public ScheduleLibraryType createScheduleLibraryType() {
-        return new ScheduleLibraryType();
+    public TypicalValuesTimeSeriesType createTypicalValuesTimeSeriesType() {
+        return new TypicalValuesTimeSeriesType();
     }
 
     /**
-     * Create an instance of {@link EnergyPerformanceCertificateType }
+     * Create an instance of {@link TypicalValuesTimeSeriesFileType }
      * 
      */
-    public EnergyPerformanceCertificateType createEnergyPerformanceCertificateType() {
-        return new EnergyPerformanceCertificateType();
+    public TypicalValuesTimeSeriesFileType createTypicalValuesTimeSeriesFileType() {
+        return new TypicalValuesTimeSeriesFileType();
     }
 
     /**
-     * Create an instance of {@link RefurbishmentMeasureType }
+     * Create an instance of {@link MonthlyTimeSeriesType }
      * 
      */
-    public RefurbishmentMeasureType createRefurbishmentMeasureType() {
-        return new RefurbishmentMeasureType();
+    public MonthlyTimeSeriesType createMonthlyTimeSeriesType() {
+        return new MonthlyTimeSeriesType();
     }
 
     /**
-     * Create an instance of {@link UtilityNetworkConnectionType }
+     * Create an instance of {@link MonthlyTimeSeriesFileType }
      * 
      */
-    public UtilityNetworkConnectionType createUtilityNetworkConnectionType() {
-        return new UtilityNetworkConnectionType();
+    public MonthlyTimeSeriesFileType createMonthlyTimeSeriesFileType() {
+        return new MonthlyTimeSeriesFileType();
     }
 
     /**
-     * Create an instance of {@link WeatherDataType }
+     * Create an instance of {@link TypicalValuesMonthlyTimeSeriesType }
      * 
      */
-    public WeatherDataType createWeatherDataType() {
-        return new WeatherDataType();
+    public TypicalValuesMonthlyTimeSeriesType createTypicalValuesMonthlyTimeSeriesType() {
+        return new TypicalValuesMonthlyTimeSeriesType();
     }
 
     /**
-     * Create an instance of {@link QualifiedAreaPropertyType }
+     * Create an instance of {@link TypicalValuesMonthlyTimeSeriesFileType }
      * 
      */
-    public QualifiedAreaPropertyType createQualifiedAreaPropertyType() {
-        return new QualifiedAreaPropertyType();
+    public TypicalValuesMonthlyTimeSeriesFileType createTypicalValuesMonthlyTimeSeriesFileType() {
+        return new TypicalValuesMonthlyTimeSeriesFileType();
     }
 
     /**
-     * Create an instance of {@link QualifiedHeightPropertyType }
+     * Create an instance of {@link SensorConnectionType }
      * 
      */
-    public QualifiedHeightPropertyType createQualifiedHeightPropertyType() {
-        return new QualifiedHeightPropertyType();
+    public SensorConnectionType createSensorConnectionType() {
+        return new SensorConnectionType();
     }
 
     /**
-     * Create an instance of {@link QualifiedVolumePropertyType }
+     * Create an instance of {@link AtomicScheduleValueType }
      * 
      */
-    public QualifiedVolumePropertyType createQualifiedVolumePropertyType() {
-        return new QualifiedVolumePropertyType();
+    public AtomicScheduleValueType createAtomicScheduleValueType() {
+        return new AtomicScheduleValueType();
     }
 
     /**
-     * Create an instance of {@link AbstractBuildingUnitPropertyType }
+     * Create an instance of {@link AtomicScheduleType }
      * 
      */
-    public AbstractBuildingUnitPropertyType createAbstractBuildingUnitPropertyType() {
-        return new AbstractBuildingUnitPropertyType();
+    public AtomicScheduleType createAtomicScheduleType() {
+        return new AtomicScheduleType();
     }
 
     /**
-     * Create an instance of {@link EnergyPerformanceCertificatePropertyType }
+     * Create an instance of {@link DualValueScheduleType }
      * 
      */
-    public EnergyPerformanceCertificatePropertyType createEnergyPerformanceCertificatePropertyType() {
-        return new EnergyPerformanceCertificatePropertyType();
+    public DualValueScheduleType createDualValueScheduleType() {
+        return new DualValueScheduleType();
     }
 
     /**
-     * Create an instance of {@link RefurbishmentMeasurePropertyType }
+     * Create an instance of {@link CompositeScheduleType }
      * 
      */
-    public RefurbishmentMeasurePropertyType createRefurbishmentMeasurePropertyType() {
-        return new RefurbishmentMeasurePropertyType();
+    public CompositeScheduleType createCompositeScheduleType() {
+        return new CompositeScheduleType();
     }
 
     /**
-     * Create an instance of {@link AbstractThermalZonePropertyType }
+     * Create an instance of {@link ScheduleComponentType }
      * 
      */
-    public AbstractThermalZonePropertyType createAbstractThermalZonePropertyType() {
-        return new AbstractThermalZonePropertyType();
+    public ScheduleComponentType createScheduleComponentType() {
+        return new ScheduleComponentType();
     }
 
     /**
-     * Create an instance of {@link AbstractUsageZonePropertyType }
+     * Create an instance of {@link ScheduleLibraryType }
      * 
      */
-    public AbstractUsageZonePropertyType createAbstractUsageZonePropertyType() {
-        return new AbstractUsageZonePropertyType();
+    public ScheduleLibraryType createScheduleLibraryType() {
+        return new ScheduleLibraryType();
     }
 
     /**
@@ -444,203 +445,267 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link WeatherDataPropertyType }
+     * Create an instance of {@link SensorDataPropertyType }
      * 
      */
-    public WeatherDataPropertyType createWeatherDataPropertyType() {
-        return new WeatherDataPropertyType();
+    public SensorDataPropertyType createSensorDataPropertyType() {
+        return new SensorDataPropertyType();
     }
 
     /**
-     * Create an instance of {@link ConstructionMaterialType }
+     * Create an instance of {@link EnergyPerformanceCertificateType }
      * 
      */
-    public ConstructionMaterialType createConstructionMaterialType() {
-        return new ConstructionMaterialType();
+    public EnergyPerformanceCertificateType createEnergyPerformanceCertificateType() {
+        return new EnergyPerformanceCertificateType();
     }
 
     /**
-     * Create an instance of {@link EnergyType }
+     * Create an instance of {@link OccupantsType }
      * 
      */
-    public EnergyType createEnergyType() {
-        return new EnergyType();
+    public OccupantsType createOccupantsType() {
+        return new OccupantsType();
     }
 
     /**
-     * Create an instance of {@link FoodType }
+     * Create an instance of {@link RefurbishmentMeasureType }
      * 
      */
-    public FoodType createFoodType() {
-        return new FoodType();
+    public RefurbishmentMeasureType createRefurbishmentMeasureType() {
+        return new RefurbishmentMeasureType();
     }
 
     /**
-     * Create an instance of {@link OtherResourceType }
+     * Create an instance of {@link BuildingUnitType }
      * 
      */
-    public OtherResourceType createOtherResourceType() {
-        return new OtherResourceType();
+    public BuildingUnitType createBuildingUnitType() {
+        return new BuildingUnitType();
     }
 
     /**
-     * Create an instance of {@link UrbanSpaceType }
+     * Create an instance of {@link ZoneType }
      * 
      */
-    public UrbanSpaceType createUrbanSpaceType() {
-        return new UrbanSpaceType();
+    public ZoneType createZoneType() {
+        return new ZoneType();
     }
 
     /**
-     * Create an instance of {@link WasteType }
+     * Create an instance of {@link ZonePartType }
      * 
      */
-    public WasteType createWasteType() {
-        return new WasteType();
+    public ZonePartType createZonePartType() {
+        return new ZonePartType();
     }
 
     /**
-     * Create an instance of {@link WaterType }
+     * Create an instance of {@link ZoneAtticFloorSurfaceType }
      * 
      */
-    public WaterType createWaterType() {
-        return new WaterType();
+    public ZoneAtticFloorSurfaceType createZoneAtticFloorSurfaceType() {
+        return new ZoneAtticFloorSurfaceType();
     }
 
     /**
-     * Create an instance of {@link GasType }
+     * Create an instance of {@link ZoneBasementCeilingSurfaceType }
      * 
      */
-    public GasType createGasType() {
-        return new GasType();
+    public ZoneBasementCeilingSurfaceType createZoneBasementCeilingSurfaceType() {
+        return new ZoneBasementCeilingSurfaceType();
     }
 
     /**
-     * Create an instance of {@link LayeredConstructionLibraryType }
+     * Create an instance of {@link ZoneClosureSurfaceType }
      * 
      */
-    public LayeredConstructionLibraryType createLayeredConstructionLibraryType() {
-        return new LayeredConstructionLibraryType();
+    public ZoneClosureSurfaceType createZoneClosureSurfaceType() {
+        return new ZoneClosureSurfaceType();
     }
 
     /**
-     * Create an instance of {@link LayerType }
+     * Create an instance of {@link ZoneExteriorWallSurfaceType }
      * 
      */
-    public LayerType createLayerType() {
-        return new LayerType();
+    public ZoneExteriorWallSurfaceType createZoneExteriorWallSurfaceType() {
+        return new ZoneExteriorWallSurfaceType();
     }
 
     /**
-     * Create an instance of {@link LayeredConstructionType }
+     * Create an instance of {@link ZoneGroundSurfaceType }
      * 
      */
-    public LayeredConstructionType createLayeredConstructionType() {
-        return new LayeredConstructionType();
+    public ZoneGroundSurfaceType createZoneGroundSurfaceType() {
+        return new ZoneGroundSurfaceType();
     }
 
     /**
-     * Create an instance of {@link MaterialLibraryType }
+     * Create an instance of {@link ZoneIntermediateFloorSurfaceType }
      * 
      */
-    public MaterialLibraryType createMaterialLibraryType() {
-        return new MaterialLibraryType();
+    public ZoneIntermediateFloorSurfaceType createZoneIntermediateFloorSurfaceType() {
+        return new ZoneIntermediateFloorSurfaceType();
     }
 
     /**
-     * Create an instance of {@link ReverseLayeredConstructionType }
+     * Create an instance of {@link ZoneRoofSurfaceType }
      * 
      */
-    public ReverseLayeredConstructionType createReverseLayeredConstructionType() {
-        return new ReverseLayeredConstructionType();
+    public ZoneRoofSurfaceType createZoneRoofSurfaceType() {
+        return new ZoneRoofSurfaceType();
     }
 
     /**
-     * Create an instance of {@link SolidMaterialType }
+     * Create an instance of {@link ZoneUndergroundWallSurfaceType }
      * 
      */
-    public SolidMaterialType createSolidMaterialType() {
-        return new SolidMaterialType();
+    public ZoneUndergroundWallSurfaceType createZoneUndergroundWallSurfaceType() {
+        return new ZoneUndergroundWallSurfaceType();
     }
 
     /**
-     * Create an instance of {@link AtticFloorSurfaceType }
+     * Create an instance of {@link ZoneDoorType }
      * 
      */
-    public AtticFloorSurfaceType createAtticFloorSurfaceType() {
-        return new AtticFloorSurfaceType();
+    public ZoneDoorType createZoneDoorType() {
+        return new ZoneDoorType();
     }
 
     /**
-     * Create an instance of {@link BasementCeilingSurfaceType }
+     * Create an instance of {@link ZoneWindowType }
      * 
      */
-    public BasementCeilingSurfaceType createBasementCeilingSurfaceType() {
-        return new BasementCeilingSurfaceType();
+    public ZoneWindowType createZoneWindowType() {
+        return new ZoneWindowType();
     }
 
     /**
-     * Create an instance of {@link IntermediateFloorSurfaceType }
+     * Create an instance of {@link QualifiedHeightPropertyType }
      * 
      */
-    public IntermediateFloorSurfaceType createIntermediateFloorSurfaceType() {
-        return new IntermediateFloorSurfaceType();
+    public QualifiedHeightPropertyType createQualifiedHeightPropertyType() {
+        return new QualifiedHeightPropertyType();
     }
 
     /**
-     * Create an instance of {@link PartyWallSurfaceType }
+     * Create an instance of {@link QualifiedAreaPropertyType }
      * 
      */
-    public PartyWallSurfaceType createPartyWallSurfaceType() {
-        return new PartyWallSurfaceType();
+    public QualifiedAreaPropertyType createQualifiedAreaPropertyType() {
+        return new QualifiedAreaPropertyType();
     }
 
     /**
-     * Create an instance of {@link ThermalZoneType }
+     * Create an instance of {@link QualifiedVolumePropertyType }
      * 
      */
-    public ThermalZoneType createThermalZoneType() {
-        return new ThermalZoneType();
+    public QualifiedVolumePropertyType createQualifiedVolumePropertyType() {
+        return new QualifiedVolumePropertyType();
     }
 
     /**
-     * Create an instance of {@link BuildingUnitType }
+     * Create an instance of {@link OccupantsPropertyType }
      * 
      */
-    public BuildingUnitType createBuildingUnitType() {
-        return new BuildingUnitType();
+    public OccupantsPropertyType createOccupantsPropertyType() {
+        return new OccupantsPropertyType();
     }
 
     /**
-     * Create an instance of {@link OccupantsType }
+     * Create an instance of {@link BuildingUnitPropertyType }
      * 
      */
-    public OccupantsType createOccupantsType() {
-        return new OccupantsType();
+    public BuildingUnitPropertyType createBuildingUnitPropertyType() {
+        return new BuildingUnitPropertyType();
     }
 
     /**
-     * Create an instance of {@link UsageZoneType }
+     * Create an instance of {@link AbstractZonePropertyType }
      * 
      */
-    public UsageZoneType createUsageZoneType() {
-        return new UsageZoneType();
+    public AbstractZonePropertyType createAbstractZonePropertyType() {
+        return new AbstractZonePropertyType();
     }
 
     /**
-     * Create an instance of {@link BoilerType }
+     * Create an instance of {@link EnergyPerformanceCertificatePropertyType }
      * 
      */
-    public BoilerType createBoilerType() {
-        return new BoilerType();
+    public EnergyPerformanceCertificatePropertyType createEnergyPerformanceCertificatePropertyType() {
+        return new EnergyPerformanceCertificatePropertyType();
     }
 
     /**
-     * Create an instance of {@link DeviceOperationType }
+     * Create an instance of {@link RefurbishmentMeasurePropertyType }
      * 
      */
-    public DeviceOperationType createDeviceOperationType() {
-        return new DeviceOperationType();
+    public RefurbishmentMeasurePropertyType createRefurbishmentMeasurePropertyType() {
+        return new RefurbishmentMeasurePropertyType();
+    }
+
+    /**
+     * Create an instance of {@link ConstructionMaterialType }
+     * 
+     */
+    public ConstructionMaterialType createConstructionMaterialType() {
+        return new ConstructionMaterialType();
+    }
+
+    /**
+     * Create an instance of {@link EnergyType }
+     * 
+     */
+    public EnergyType createEnergyType() {
+        return new EnergyType();
+    }
+
+    /**
+     * Create an instance of {@link FoodType }
+     * 
+     */
+    public FoodType createFoodType() {
+        return new FoodType();
+    }
+
+    /**
+     * Create an instance of {@link OtherResourceType }
+     * 
+     */
+    public OtherResourceType createOtherResourceType() {
+        return new OtherResourceType();
+    }
+
+    /**
+     * Create an instance of {@link UrbanSpaceType }
+     * 
+     */
+    public UrbanSpaceType createUrbanSpaceType() {
+        return new UrbanSpaceType();
+    }
+
+    /**
+     * Create an instance of {@link WasteType }
+     * 
+     */
+    public WasteType createWasteType() {
+        return new WasteType();
+    }
+
+    /**
+     * Create an instance of {@link WaterType }
+     * 
+     */
+    public WaterType createWaterType() {
+        return new WaterType();
+    }
+
+    /**
+     * Create an instance of {@link BoilerType }
+     * 
+     */
+    public BoilerType createBoilerType() {
+        return new BoilerType();
     }
 
     /**
@@ -675,6 +740,14 @@ public class ObjectFactory {
         return new GenericSolarCollectorType();
     }
 
+    /**
+     * Create an instance of {@link GenericStorageDeviceType }
+     * 
+     */
+    public GenericStorageDeviceType createGenericStorageDeviceType() {
+        return new GenericStorageDeviceType();
+    }
+
     /**
      * Create an instance of {@link HeatPumpType }
      * 
@@ -747,6 +820,78 @@ public class ObjectFactory {
         return new WeatherStationType();
     }
 
+    /**
+     * Create an instance of {@link WeatherDataType }
+     * 
+     */
+    public WeatherDataType createWeatherDataType() {
+        return new WeatherDataType();
+    }
+
+    /**
+     * Create an instance of {@link LayeredConstructionLibraryType }
+     * 
+     */
+    public LayeredConstructionLibraryType createLayeredConstructionLibraryType() {
+        return new LayeredConstructionLibraryType();
+    }
+
+    /**
+     * Create an instance of {@link LayerType }
+     * 
+     */
+    public LayerType createLayerType() {
+        return new LayerType();
+    }
+
+    /**
+     * Create an instance of {@link LayeredConstructionType }
+     * 
+     */
+    public LayeredConstructionType createLayeredConstructionType() {
+        return new LayeredConstructionType();
+    }
+
+    /**
+     * Create an instance of {@link MaterialLibraryType }
+     * 
+     */
+    public MaterialLibraryType createMaterialLibraryType() {
+        return new MaterialLibraryType();
+    }
+
+    /**
+     * Create an instance of {@link ReverseLayeredConstructionType }
+     * 
+     */
+    public ReverseLayeredConstructionType createReverseLayeredConstructionType() {
+        return new ReverseLayeredConstructionType();
+    }
+
+    /**
+     * Create an instance of {@link GasType }
+     * 
+     */
+    public GasType createGasType() {
+        return new GasType();
+    }
+
+    /**
+     * Create an instance of {@link LiquidType }
+     * 
+     */
+    public LiquidType createLiquidType() {
+        return new LiquidType();
+    }
+
+    /**
+     * Create an instance of {@link SolidMaterialType }
+     * 
+     */
+    public SolidMaterialType createSolidMaterialType() {
+        return new SolidMaterialType();
+    }
+
     /**
      * Create an instance of {@link AbstractOpticalProperty_PropertyType }
      * 
@@ -755,6 +900,14 @@ public class ObjectFactory {
         return new AbstractOpticalProperty_PropertyType();
     }
 
+    /**
+     * Create an instance of {@link AbsorptancePropertyType }
+     * 
+     */
+    public AbsorptancePropertyType createAbsorptancePropertyType() {
+        return new AbsorptancePropertyType();
+    }
+
     /**
      * Create an instance of {@link EmissivityPropertyType }
      * 
@@ -787,6 +940,22 @@ public class ObjectFactory {
         return new AbstractQualifiedAttributePropertyType();
     }
 
+    /**
+     * Create an instance of {@link AbstractADEFeaturePropertyType }
+     * 
+     */
+    public AbstractADEFeaturePropertyType createAbstractADEFeaturePropertyType() {
+        return new AbstractADEFeaturePropertyType();
+    }
+
+    /**
+     * Create an instance of {@link AbstractSchedulePropertyType }
+     * 
+     */
+    public AbstractSchedulePropertyType createAbstractSchedulePropertyType() {
+        return new AbstractSchedulePropertyType();
+    }
+
     /**
      * Create an instance of {@link AbstractTimeSeriesPropertyType }
      * 
@@ -795,6 +964,22 @@ public class ObjectFactory {
         return new AbstractTimeSeriesPropertyType();
     }
 
+    /**
+     * Create an instance of {@link DeviceOperationPropertyType }
+     * 
+     */
+    public DeviceOperationPropertyType createDeviceOperationPropertyType() {
+        return new DeviceOperationPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link AbstractFeatureWithLifeSpanPropertyType }
+     * 
+     */
+    public AbstractFeatureWithLifeSpanPropertyType createAbstractFeatureWithLifeSpanPropertyType() {
+        return new AbstractFeatureWithLifeSpanPropertyType();
+    }
+
     /**
      * Create an instance of {@link RegularTimeSeriesPropertyType }
      * 
@@ -828,27 +1013,51 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link SensorConnectionPropertyType }
+     * Create an instance of {@link MonthlyTimeSeriesPropertyType }
      * 
      */
-    public SensorConnectionPropertyType createSensorConnectionPropertyType() {
-        return new SensorConnectionPropertyType();
+    public MonthlyTimeSeriesPropertyType createMonthlyTimeSeriesPropertyType() {
+        return new MonthlyTimeSeriesPropertyType();
     }
 
     /**
-     * Create an instance of {@link AbstractSchedulePropertyType }
+     * Create an instance of {@link MonthlyTimeSeriesFilePropertyType }
      * 
      */
-    public AbstractSchedulePropertyType createAbstractSchedulePropertyType() {
-        return new AbstractSchedulePropertyType();
+    public MonthlyTimeSeriesFilePropertyType createMonthlyTimeSeriesFilePropertyType() {
+        return new MonthlyTimeSeriesFilePropertyType();
     }
 
     /**
-     * Create an instance of {@link DualValueSchedulePropertyType }
+     * Create an instance of {@link TypicalValuesMonthlyTimeSeriesPropertyType }
      * 
      */
-    public DualValueSchedulePropertyType createDualValueSchedulePropertyType() {
-        return new DualValueSchedulePropertyType();
+    public TypicalValuesMonthlyTimeSeriesPropertyType createTypicalValuesMonthlyTimeSeriesPropertyType() {
+        return new TypicalValuesMonthlyTimeSeriesPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link TypicalValuesMonthlyTimeSeriesFilePropertyType }
+     * 
+     */
+    public TypicalValuesMonthlyTimeSeriesFilePropertyType createTypicalValuesMonthlyTimeSeriesFilePropertyType() {
+        return new TypicalValuesMonthlyTimeSeriesFilePropertyType();
+    }
+
+    /**
+     * Create an instance of {@link SensorConnectionPropertyType }
+     * 
+     */
+    public SensorConnectionPropertyType createSensorConnectionPropertyType() {
+        return new SensorConnectionPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link AtomicScheduleValuePropertyType }
+     * 
+     */
+    public AtomicScheduleValuePropertyType createAtomicScheduleValuePropertyType() {
+        return new AtomicScheduleValuePropertyType();
     }
 
     /**
@@ -859,6 +1068,14 @@ public class ObjectFactory {
         return new AtomicSchedulePropertyType();
     }
 
+    /**
+     * Create an instance of {@link DualValueSchedulePropertyType }
+     * 
+     */
+    public DualValueSchedulePropertyType createDualValueSchedulePropertyType() {
+        return new DualValueSchedulePropertyType();
+    }
+
     /**
      * Create an instance of {@link CompositeSchedulePropertyType }
      * 
@@ -884,11 +1101,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link AbstractBuildingPartitionPropertyType }
+     * Create an instance of {@link AbstractCityObjectSpacePropertyType }
      * 
      */
-    public AbstractBuildingPartitionPropertyType createAbstractBuildingPartitionPropertyType() {
-        return new AbstractBuildingPartitionPropertyType();
+    public AbstractCityObjectSpacePropertyType createAbstractCityObjectSpacePropertyType() {
+        return new AbstractCityObjectSpacePropertyType();
     }
 
     /**
@@ -908,187 +1125,179 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ConstructionMaterialPropertyType }
+     * Create an instance of {@link AbstractBuildingSpacePropertyType }
      * 
      */
-    public ConstructionMaterialPropertyType createConstructionMaterialPropertyType() {
-        return new ConstructionMaterialPropertyType();
+    public AbstractBuildingSpacePropertyType createAbstractBuildingSpacePropertyType() {
+        return new AbstractBuildingSpacePropertyType();
     }
 
     /**
-     * Create an instance of {@link EnergyPropertyType }
+     * Create an instance of {@link ZonePropertyType }
      * 
      */
-    public EnergyPropertyType createEnergyPropertyType() {
-        return new EnergyPropertyType();
+    public ZonePropertyType createZonePropertyType() {
+        return new ZonePropertyType();
     }
 
     /**
-     * Create an instance of {@link FoodPropertyType }
+     * Create an instance of {@link ZonePartPropertyType }
      * 
      */
-    public FoodPropertyType createFoodPropertyType() {
-        return new FoodPropertyType();
+    public ZonePartPropertyType createZonePartPropertyType() {
+        return new ZonePartPropertyType();
     }
 
     /**
-     * Create an instance of {@link OtherResourcePropertyType }
+     * Create an instance of {@link AbstractZoneBoundarySurfacePropertyType }
      * 
      */
-    public OtherResourcePropertyType createOtherResourcePropertyType() {
-        return new OtherResourcePropertyType();
+    public AbstractZoneBoundarySurfacePropertyType createAbstractZoneBoundarySurfacePropertyType() {
+        return new AbstractZoneBoundarySurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link UrbanSpacePropertyType }
+     * Create an instance of {@link AbstractZoneOpeningPropertyType }
      * 
      */
-    public UrbanSpacePropertyType createUrbanSpacePropertyType() {
-        return new UrbanSpacePropertyType();
+    public AbstractZoneOpeningPropertyType createAbstractZoneOpeningPropertyType() {
+        return new AbstractZoneOpeningPropertyType();
     }
 
     /**
-     * Create an instance of {@link WastePropertyType }
+     * Create an instance of {@link ZoneAtticFloorSurfacePropertyType }
      * 
      */
-    public WastePropertyType createWastePropertyType() {
-        return new WastePropertyType();
-    }
-
-    /**
-     * Create an instance of {@link WaterPropertyType }
-     * 
-     */
-    public WaterPropertyType createWaterPropertyType() {
-        return new WaterPropertyType();
+    public ZoneAtticFloorSurfacePropertyType createZoneAtticFloorSurfacePropertyType() {
+        return new ZoneAtticFloorSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link AbstractMaterialPropertyType }
+     * Create an instance of {@link ZoneBasementCeilingSurfacePropertyType }
      * 
      */
-    public AbstractMaterialPropertyType createAbstractMaterialPropertyType() {
-        return new AbstractMaterialPropertyType();
+    public ZoneBasementCeilingSurfacePropertyType createZoneBasementCeilingSurfacePropertyType() {
+        return new ZoneBasementCeilingSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link GasPropertyType }
+     * Create an instance of {@link ZoneClosureSurfacePropertyType }
      * 
      */
-    public GasPropertyType createGasPropertyType() {
-        return new GasPropertyType();
+    public ZoneClosureSurfacePropertyType createZoneClosureSurfacePropertyType() {
+        return new ZoneClosureSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link LayeredConstructionLibraryPropertyType }
+     * Create an instance of {@link ZoneExteriorWallSurfacePropertyType }
      * 
      */
-    public LayeredConstructionLibraryPropertyType createLayeredConstructionLibraryPropertyType() {
-        return new LayeredConstructionLibraryPropertyType();
+    public ZoneExteriorWallSurfacePropertyType createZoneExteriorWallSurfacePropertyType() {
+        return new ZoneExteriorWallSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link LayerPropertyType }
+     * Create an instance of {@link ZoneGroundSurfacePropertyType }
      * 
      */
-    public LayerPropertyType createLayerPropertyType() {
-        return new LayerPropertyType();
+    public ZoneGroundSurfacePropertyType createZoneGroundSurfacePropertyType() {
+        return new ZoneGroundSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link LayeredConstructionPropertyType }
+     * Create an instance of {@link ZoneIntermediateFloorSurfacePropertyType }
      * 
      */
-    public LayeredConstructionPropertyType createLayeredConstructionPropertyType() {
-        return new LayeredConstructionPropertyType();
+    public ZoneIntermediateFloorSurfacePropertyType createZoneIntermediateFloorSurfacePropertyType() {
+        return new ZoneIntermediateFloorSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link MaterialLibraryPropertyType }
+     * Create an instance of {@link ZoneRoofSurfacePropertyType }
      * 
      */
-    public MaterialLibraryPropertyType createMaterialLibraryPropertyType() {
-        return new MaterialLibraryPropertyType();
+    public ZoneRoofSurfacePropertyType createZoneRoofSurfacePropertyType() {
+        return new ZoneRoofSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link ReverseLayeredConstructionPropertyType }
+     * Create an instance of {@link ZoneUndergroundWallSurfacePropertyType }
      * 
      */
-    public ReverseLayeredConstructionPropertyType createReverseLayeredConstructionPropertyType() {
-        return new ReverseLayeredConstructionPropertyType();
+    public ZoneUndergroundWallSurfacePropertyType createZoneUndergroundWallSurfacePropertyType() {
+        return new ZoneUndergroundWallSurfacePropertyType();
     }
 
     /**
-     * Create an instance of {@link SolidMaterialPropertyType }
+     * Create an instance of {@link ZoneDoorPropertyType }
      * 
      */
-    public SolidMaterialPropertyType createSolidMaterialPropertyType() {
-        return new SolidMaterialPropertyType();
+    public ZoneDoorPropertyType createZoneDoorPropertyType() {
+        return new ZoneDoorPropertyType();
     }
 
     /**
-     * Create an instance of {@link AtticFloorSurfacePropertyType }
+     * Create an instance of {@link ZoneWindowPropertyType }
      * 
      */
-    public AtticFloorSurfacePropertyType createAtticFloorSurfacePropertyType() {
-        return new AtticFloorSurfacePropertyType();
+    public ZoneWindowPropertyType createZoneWindowPropertyType() {
+        return new ZoneWindowPropertyType();
     }
 
     /**
-     * Create an instance of {@link BasementCeilingSurfacePropertyType }
+     * Create an instance of {@link ConstructionMaterialPropertyType }
      * 
      */
-    public BasementCeilingSurfacePropertyType createBasementCeilingSurfacePropertyType() {
-        return new BasementCeilingSurfacePropertyType();
+    public ConstructionMaterialPropertyType createConstructionMaterialPropertyType() {
+        return new ConstructionMaterialPropertyType();
     }
 
     /**
-     * Create an instance of {@link IntermediateFloorSurfacePropertyType }
+     * Create an instance of {@link EnergyPropertyType }
      * 
      */
-    public IntermediateFloorSurfacePropertyType createIntermediateFloorSurfacePropertyType() {
-        return new IntermediateFloorSurfacePropertyType();
+    public EnergyPropertyType createEnergyPropertyType() {
+        return new EnergyPropertyType();
     }
 
     /**
-     * Create an instance of {@link PartyWallSurfacePropertyType }
+     * Create an instance of {@link FoodPropertyType }
      * 
      */
-    public PartyWallSurfacePropertyType createPartyWallSurfacePropertyType() {
-        return new PartyWallSurfacePropertyType();
+    public FoodPropertyType createFoodPropertyType() {
+        return new FoodPropertyType();
     }
 
     /**
-     * Create an instance of {@link ThermalZonePropertyType }
+     * Create an instance of {@link OtherResourcePropertyType }
      * 
      */
-    public ThermalZonePropertyType createThermalZonePropertyType() {
-        return new ThermalZonePropertyType();
+    public OtherResourcePropertyType createOtherResourcePropertyType() {
+        return new OtherResourcePropertyType();
     }
 
     /**
-     * Create an instance of {@link BuildingUnitPropertyType }
+     * Create an instance of {@link UrbanSpacePropertyType }
      * 
      */
-    public BuildingUnitPropertyType createBuildingUnitPropertyType() {
-        return new BuildingUnitPropertyType();
+    public UrbanSpacePropertyType createUrbanSpacePropertyType() {
+        return new UrbanSpacePropertyType();
     }
 
     /**
-     * Create an instance of {@link OccupantsPropertyType }
+     * Create an instance of {@link WastePropertyType }
      * 
      */
-    public OccupantsPropertyType createOccupantsPropertyType() {
-        return new OccupantsPropertyType();
+    public WastePropertyType createWastePropertyType() {
+        return new WastePropertyType();
     }
 
     /**
-     * Create an instance of {@link UsageZonePropertyType }
+     * Create an instance of {@link WaterPropertyType }
      * 
      */
-    public UsageZonePropertyType createUsageZonePropertyType() {
-        return new UsageZonePropertyType();
+    public WaterPropertyType createWaterPropertyType() {
+        return new WaterPropertyType();
     }
 
     /**
@@ -1107,14 +1316,6 @@ public class ObjectFactory {
         return new BoilerPropertyType();
     }
 
-    /**
-     * Create an instance of {@link DeviceOperationPropertyType }
-     * 
-     */
-    public DeviceOperationPropertyType createDeviceOperationPropertyType() {
-        return new DeviceOperationPropertyType();
-    }
-
     /**
      * Create an instance of {@link ElectricalStorageDevicePropertyType }
      * 
@@ -1147,6 +1348,14 @@ public class ObjectFactory {
         return new GenericSolarCollectorPropertyType();
     }
 
+    /**
+     * Create an instance of {@link GenericStorageDevicePropertyType }
+     * 
+     */
+    public GenericStorageDevicePropertyType createGenericStorageDevicePropertyType() {
+        return new GenericStorageDevicePropertyType();
+    }
+
     /**
      * Create an instance of {@link HeatPumpPropertyType }
      * 
@@ -1219,6 +1428,86 @@ public class ObjectFactory {
         return new WeatherStationPropertyType();
     }
 
+    /**
+     * Create an instance of {@link WeatherDataPropertyType }
+     * 
+     */
+    public WeatherDataPropertyType createWeatherDataPropertyType() {
+        return new WeatherDataPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link AbstractMaterialPropertyType }
+     * 
+     */
+    public AbstractMaterialPropertyType createAbstractMaterialPropertyType() {
+        return new AbstractMaterialPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link LayeredConstructionLibraryPropertyType }
+     * 
+     */
+    public LayeredConstructionLibraryPropertyType createLayeredConstructionLibraryPropertyType() {
+        return new LayeredConstructionLibraryPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link LayerPropertyType }
+     * 
+     */
+    public LayerPropertyType createLayerPropertyType() {
+        return new LayerPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link LayeredConstructionPropertyType }
+     * 
+     */
+    public LayeredConstructionPropertyType createLayeredConstructionPropertyType() {
+        return new LayeredConstructionPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link MaterialLibraryPropertyType }
+     * 
+     */
+    public MaterialLibraryPropertyType createMaterialLibraryPropertyType() {
+        return new MaterialLibraryPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link ReverseLayeredConstructionPropertyType }
+     * 
+     */
+    public ReverseLayeredConstructionPropertyType createReverseLayeredConstructionPropertyType() {
+        return new ReverseLayeredConstructionPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link GasPropertyType }
+     * 
+     */
+    public GasPropertyType createGasPropertyType() {
+        return new GasPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link LiquidPropertyType }
+     * 
+     */
+    public LiquidPropertyType createLiquidPropertyType() {
+        return new LiquidPropertyType();
+    }
+
+    /**
+     * Create an instance of {@link SolidMaterialPropertyType }
+     * 
+     */
+    public SolidMaterialPropertyType createSolidMaterialPropertyType() {
+        return new SolidMaterialPropertyType();
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link AbstractOpticalProperty_Type }{@code >}
      * 
@@ -1232,6 +1521,19 @@ public class ObjectFactory {
         return new JAXBElement<AbstractOpticalProperty_Type>(_AbstractOpticalProperty_QNAME, AbstractOpticalProperty_Type.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbsorptanceType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbsorptanceType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Absorptance", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractOpticalProperty")
+    public JAXBElement<AbsorptanceType> createAbsorptance(AbsorptanceType value) {
+        return new JAXBElement<AbsorptanceType>(_Absorptance_QNAME, AbsorptanceType.class, null, value);
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link EmissivityType }{@code >}
      * 
@@ -1337,913 +1639,978 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractTimeSeriesType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractADEFeatureType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractTimeSeriesType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractADEFeatureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractTimeSeries", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<AbstractTimeSeriesType> createAbstractTimeSeries(AbstractTimeSeriesType value) {
-        return new JAXBElement<AbstractTimeSeriesType>(_AbstractTimeSeries_QNAME, AbstractTimeSeriesType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractADEFeature", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    public JAXBElement<AbstractADEFeatureType> createAbstractADEFeature(AbstractADEFeatureType value) {
+        return new JAXBElement<AbstractADEFeatureType>(_AbstractADEFeature_QNAME, AbstractADEFeatureType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RegularTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
-    public JAXBElement<RegularTimeSeriesType> createRegularTimeSeriesProperty(RegularTimeSeriesType value) {
-        return new JAXBElement<RegularTimeSeriesType>(_RegularTimeSeriesProperty_QNAME, RegularTimeSeriesType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<AbstractLayeredConstructionType> createAbstractLayeredConstruction(AbstractLayeredConstructionType value) {
+        return new JAXBElement<AbstractLayeredConstructionType>(_AbstractLayeredConstruction_QNAME, AbstractLayeredConstructionType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesFileType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractScheduleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesFileType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RegularTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
-    public JAXBElement<RegularTimeSeriesFileType> createRegularTimeSeriesFile(RegularTimeSeriesFileType value) {
-        return new JAXBElement<RegularTimeSeriesFileType>(_RegularTimeSeriesFile_QNAME, RegularTimeSeriesFileType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<AbstractScheduleType> createAbstractSchedule(AbstractScheduleType value) {
+        return new JAXBElement<AbstractScheduleType>(_AbstractSchedule_QNAME, AbstractScheduleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractTimeSeriesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
-    public JAXBElement<TypicalValuesTimeSeriesType> createTypicalValuesTimeSeries(TypicalValuesTimeSeriesType value) {
-        return new JAXBElement<TypicalValuesTimeSeriesType>(_TypicalValuesTimeSeries_QNAME, TypicalValuesTimeSeriesType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<AbstractTimeSeriesType> createAbstractTimeSeries(AbstractTimeSeriesType value) {
+        return new JAXBElement<AbstractTimeSeriesType>(_AbstractTimeSeries_QNAME, AbstractTimeSeriesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesFileType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DeviceOperationType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesFileType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link DeviceOperationType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
-    public JAXBElement<TypicalValuesTimeSeriesFileType> createTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFileType value) {
-        return new JAXBElement<TypicalValuesTimeSeriesFileType>(_TypicalValuesTimeSeriesFile_QNAME, TypicalValuesTimeSeriesFileType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "DeviceOperation", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<DeviceOperationType> createDeviceOperation(DeviceOperationType value) {
+        return new JAXBElement<DeviceOperationType>(_DeviceOperation_QNAME, DeviceOperationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SensorConnectionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SensorDataType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SensorConnectionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link SensorDataType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SensorConnection", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
-    public JAXBElement<SensorConnectionType> createSensorConnection(SensorConnectionType value) {
-        return new JAXBElement<SensorConnectionType>(_SensorConnection_QNAME, SensorConnectionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SensorData", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<SensorDataType> createSensorData(SensorDataType value) {
+        return new JAXBElement<SensorDataType>(_SensorData_QNAME, SensorDataType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractScheduleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractFeatureWithLifeSpanType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractScheduleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractFeatureWithLifeSpanType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractSchedule", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<AbstractScheduleType> createAbstractSchedule(AbstractScheduleType value) {
-        return new JAXBElement<AbstractScheduleType>(_AbstractSchedule_QNAME, AbstractScheduleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractFeatureWithLifeSpan", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<AbstractFeatureWithLifeSpanType> createAbstractFeatureWithLifeSpan(AbstractFeatureWithLifeSpanType value) {
+        return new JAXBElement<AbstractFeatureWithLifeSpanType>(_AbstractFeatureWithLifeSpan_QNAME, AbstractFeatureWithLifeSpanType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DualValueScheduleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractResourceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DualValueScheduleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "DualValueSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
-    public JAXBElement<DualValueScheduleType> createDualValueSchedule(DualValueScheduleType value) {
-        return new JAXBElement<DualValueScheduleType>(_DualValueSchedule_QNAME, DualValueScheduleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractResource", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractFeatureWithLifeSpan")
+    public JAXBElement<AbstractResourceType> createAbstractResource(AbstractResourceType value) {
+        return new JAXBElement<AbstractResourceType>(_AbstractResource_QNAME, AbstractResourceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AtomicScheduleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AtomicScheduleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AtomicSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
-    public JAXBElement<AtomicScheduleType> createAtomicSchedule(AtomicScheduleType value) {
-        return new JAXBElement<AtomicScheduleType>(_AtomicSchedule_QNAME, AtomicScheduleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UtilityNetworkConnection", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractFeatureWithLifeSpan")
+    public JAXBElement<UtilityNetworkConnectionType> createUtilityNetworkConnection(UtilityNetworkConnectionType value) {
+        return new JAXBElement<UtilityNetworkConnectionType>(_UtilityNetworkConnection_QNAME, UtilityNetworkConnectionType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CompositeScheduleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CompositeScheduleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "CompositeSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
-    public JAXBElement<CompositeScheduleType> createCompositeSchedule(CompositeScheduleType value) {
-        return new JAXBElement<CompositeScheduleType>(_CompositeSchedule_QNAME, CompositeScheduleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RegularTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<RegularTimeSeriesType> createRegularTimeSeriesProperty(RegularTimeSeriesType value) {
+        return new JAXBElement<RegularTimeSeriesType>(_RegularTimeSeriesProperty_QNAME, RegularTimeSeriesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ScheduleComponentType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesFileType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleComponentType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ScheduleComponent", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<ScheduleComponentType> createScheduleComponent(ScheduleComponentType value) {
-        return new JAXBElement<ScheduleComponentType>(_ScheduleComponent_QNAME, ScheduleComponentType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RegularTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<RegularTimeSeriesFileType> createRegularTimeSeriesFile(RegularTimeSeriesFileType value) {
+        return new JAXBElement<RegularTimeSeriesFileType>(_RegularTimeSeriesFile_QNAME, RegularTimeSeriesFileType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ScheduleLibraryType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleLibraryType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ScheduleLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
-    public JAXBElement<ScheduleLibraryType> createScheduleLibrary(ScheduleLibraryType value) {
-        return new JAXBElement<ScheduleLibraryType>(_ScheduleLibrary_QNAME, ScheduleLibraryType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<TypicalValuesTimeSeriesType> createTypicalValuesTimeSeries(TypicalValuesTimeSeriesType value) {
+        return new JAXBElement<TypicalValuesTimeSeriesType>(_TypicalValuesTimeSeries_QNAME, TypicalValuesTimeSeriesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLibraryType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesFileType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLibraryType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLibrary", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
-    public JAXBElement<AbstractLibraryType> createAbstractLibrary(AbstractLibraryType value) {
-        return new JAXBElement<AbstractLibraryType>(_AbstractLibrary_QNAME, AbstractLibraryType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<TypicalValuesTimeSeriesFileType> createTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFileType value) {
+        return new JAXBElement<TypicalValuesTimeSeriesFileType>(_TypicalValuesTimeSeriesFile_QNAME, TypicalValuesTimeSeriesFileType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractBuildingPartitionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MonthlyTimeSeriesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingPartitionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link MonthlyTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractBuildingPartition", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
-    public JAXBElement<AbstractBuildingPartitionType> createAbstractBuildingPartition(AbstractBuildingPartitionType value) {
-        return new JAXBElement<AbstractBuildingPartitionType>(_AbstractBuildingPartition_QNAME, AbstractBuildingPartitionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "MonthlyTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<MonthlyTimeSeriesType> createMonthlyTimeSeries(MonthlyTimeSeriesType value) {
+        return new JAXBElement<MonthlyTimeSeriesType>(_MonthlyTimeSeries_QNAME, MonthlyTimeSeriesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MonthlyTimeSeriesFileType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link MonthlyTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractBuildingUnit", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingPartition")
-    public JAXBElement<AbstractBuildingUnitType> createAbstractBuildingUnit(AbstractBuildingUnitType value) {
-        return new JAXBElement<AbstractBuildingUnitType>(_AbstractBuildingUnit_QNAME, AbstractBuildingUnitType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "MonthlyTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<MonthlyTimeSeriesFileType> createMonthlyTimeSeriesFile(MonthlyTimeSeriesFileType value) {
+        return new JAXBElement<MonthlyTimeSeriesFileType>(_MonthlyTimeSeriesFile_QNAME, MonthlyTimeSeriesFileType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractDeviceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesMonthlyTimeSeriesType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDeviceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesMonthlyTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractDevice", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
-    public JAXBElement<AbstractDeviceType> createAbstractDevice(AbstractDeviceType value) {
-        return new JAXBElement<AbstractDeviceType>(_AbstractDevice_QNAME, AbstractDeviceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesMonthlyTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<TypicalValuesMonthlyTimeSeriesType> createTypicalValuesMonthlyTimeSeries(TypicalValuesMonthlyTimeSeriesType value) {
+        return new JAXBElement<TypicalValuesMonthlyTimeSeriesType>(_TypicalValuesMonthlyTimeSeries_QNAME, TypicalValuesMonthlyTimeSeriesType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TypicalValuesMonthlyTimeSeriesFileType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesMonthlyTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLayeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<AbstractLayeredConstructionType> createAbstractLayeredConstruction(AbstractLayeredConstructionType value) {
-        return new JAXBElement<AbstractLayeredConstructionType>(_AbstractLayeredConstruction_QNAME, AbstractLayeredConstructionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "TypicalValuesMonthlyTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<TypicalValuesMonthlyTimeSeriesFileType> createTypicalValuesMonthlyTimeSeriesFile(TypicalValuesMonthlyTimeSeriesFileType value) {
+        return new JAXBElement<TypicalValuesMonthlyTimeSeriesFileType>(_TypicalValuesMonthlyTimeSeriesFile_QNAME, TypicalValuesMonthlyTimeSeriesFileType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractResourceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SensorConnectionType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link SensorConnectionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractResource", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<AbstractResourceType> createAbstractResource(AbstractResourceType value) {
-        return new JAXBElement<AbstractResourceType>(_AbstractResource_QNAME, AbstractResourceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SensorConnection", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractTimeSeries")
+    public JAXBElement<SensorConnectionType> createSensorConnection(SensorConnectionType value) {
+        return new JAXBElement<SensorConnectionType>(_SensorConnection_QNAME, SensorConnectionType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractThermalZoneType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AtomicScheduleValueType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractThermalZoneType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AtomicScheduleValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractThermalZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingPartition")
-    public JAXBElement<AbstractThermalZoneType> createAbstractThermalZone(AbstractThermalZoneType value) {
-        return new JAXBElement<AbstractThermalZoneType>(_AbstractThermalZone_QNAME, AbstractThermalZoneType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AtomicScheduleValue", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    public JAXBElement<AtomicScheduleValueType> createAtomicScheduleValue(AtomicScheduleValueType value) {
+        return new JAXBElement<AtomicScheduleValueType>(_AtomicScheduleValue_QNAME, AtomicScheduleValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractUsageZoneType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AtomicScheduleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractUsageZoneType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AtomicScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractUsageZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingPartition")
-    public JAXBElement<AbstractUsageZoneType> createAbstractUsageZone(AbstractUsageZoneType value) {
-        return new JAXBElement<AbstractUsageZoneType>(_AbstractUsageZone_QNAME, AbstractUsageZoneType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AtomicSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
+    public JAXBElement<AtomicScheduleType> createAtomicSchedule(AtomicScheduleType value) {
+        return new JAXBElement<AtomicScheduleType>(_AtomicSchedule_QNAME, AtomicScheduleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificateType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link DualValueScheduleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificateType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link DualValueScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "EnergyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<EnergyPerformanceCertificateType> createEnergyPerformanceCertificate(EnergyPerformanceCertificateType value) {
-        return new JAXBElement<EnergyPerformanceCertificateType>(_EnergyPerformanceCertificate_QNAME, EnergyPerformanceCertificateType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "DualValueSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
+    public JAXBElement<DualValueScheduleType> createDualValueSchedule(DualValueScheduleType value) {
+        return new JAXBElement<DualValueScheduleType>(_DualValueSchedule_QNAME, DualValueScheduleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasureType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CompositeScheduleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasureType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CompositeScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RefurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<RefurbishmentMeasureType> createRefurbishmentMeasure(RefurbishmentMeasureType value) {
-        return new JAXBElement<RefurbishmentMeasureType>(_RefurbishmentMeasure_QNAME, RefurbishmentMeasureType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "CompositeSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSchedule")
+    public JAXBElement<CompositeScheduleType> createCompositeSchedule(CompositeScheduleType value) {
+        return new JAXBElement<CompositeScheduleType>(_CompositeSchedule_QNAME, CompositeScheduleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ScheduleComponentType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleComponentType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UtilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<UtilityNetworkConnectionType> createUtilityNetworkConnection(UtilityNetworkConnectionType value) {
-        return new JAXBElement<UtilityNetworkConnectionType>(_UtilityNetworkConnection_QNAME, UtilityNetworkConnectionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ScheduleComponent", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<ScheduleComponentType> createScheduleComponent(ScheduleComponentType value) {
+        return new JAXBElement<ScheduleComponentType>(_ScheduleComponent_QNAME, ScheduleComponentType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WeatherDataType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ScheduleLibraryType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link WeatherDataType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "WeatherData", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<WeatherDataType> createWeatherData(WeatherDataType value) {
-        return new JAXBElement<WeatherDataType>(_WeatherData_QNAME, WeatherDataType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ScheduleLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
+    public JAXBElement<ScheduleLibraryType> createScheduleLibrary(ScheduleLibraryType value) {
+        return new JAXBElement<ScheduleLibraryType>(_ScheduleLibrary_QNAME, ScheduleLibraryType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLibraryType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgAtticThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<ThermalStatusValueType> createBdgAtticThermalStatus(ThermalStatusValueType value) {
-        return new JAXBElement<ThermalStatusValueType>(_BdgAtticThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLibrary", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    public JAXBElement<AbstractLibraryType> createAbstractLibrary(AbstractLibraryType value) {
+        return new JAXBElement<AbstractLibraryType>(_AbstractLibrary_QNAME, AbstractLibraryType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractCityObjectSpaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractCityObjectSpaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBasementThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<ThermalStatusValueType> createBdgBasementThermalStatus(ThermalStatusValueType value) {
-        return new JAXBElement<ThermalStatusValueType>(_BdgBasementThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractCityObjectSpace", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    public JAXBElement<AbstractCityObjectSpaceType> createAbstractCityObjectSpace(AbstractCityObjectSpaceType value) {
+        return new JAXBElement<AbstractCityObjectSpaceType>(_AbstractCityObjectSpace_QNAME, AbstractCityObjectSpaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractDeviceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgConstructionWeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<CodeType> createBdgConstructionWeight(CodeType value) {
-        return new JAXBElement<CodeType>(_BdgConstructionWeight_QNAME, CodeType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractDevice", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    public JAXBElement<AbstractDeviceType> createAbstractDevice(AbstractDeviceType value) {
+        return new JAXBElement<AbstractDeviceType>(_AbstractDevice_QNAME, AbstractDeviceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedAreaPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CityObjectRelationType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedAreaPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<QualifiedAreaPropertyType> createBdgArea(QualifiedAreaPropertyType value) {
-        return new JAXBElement<QualifiedAreaPropertyType>(_BdgArea_QNAME, QualifiedAreaPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "CityObjectRelation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    public JAXBElement<CityObjectRelationType> createCityObjectRelation(CityObjectRelationType value) {
+        return new JAXBElement<CityObjectRelationType>(_CityObjectRelation_QNAME, CityObjectRelationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedHeightPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedHeightPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgHeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<QualifiedHeightPropertyType> createBdgHeight(QualifiedHeightPropertyType value) {
-        return new JAXBElement<QualifiedHeightPropertyType>(_BdgHeight_QNAME, QualifiedHeightPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "permanentIdentifier", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<CodeType> createPermanentIdentifier(CodeType value) {
+        return new JAXBElement<CodeType>(_PermanentIdentifier_QNAME, CodeType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedVolumePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedVolumePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgVolume", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<QualifiedVolumePropertyType> createBdgVolume(QualifiedVolumePropertyType value) {
-        return new JAXBElement<QualifiedVolumePropertyType>(_BdgVolume_QNAME, QualifiedVolumePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "validFrom", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<XMLGregorianCalendar> createValidFrom(XMLGregorianCalendar value) {
+        return new JAXBElement<XMLGregorianCalendar>(_ValidFrom_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link XMLGregorianCalendar }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgIsProtected", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<Boolean> createBdgIsProtected(Boolean value) {
-        return new JAXBElement<Boolean>(_BdgIsProtected_QNAME, Boolean.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "validTo", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<XMLGregorianCalendar> createValidTo(XMLGregorianCalendar value) {
+        return new JAXBElement<XMLGregorianCalendar>(_ValidTo_QNAME, XMLGregorianCalendar.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CityObjectRelationPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgType", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<CodeType> createBdgType(CodeType value) {
-        return new JAXBElement<CodeType>(_BdgType_QNAME, CodeType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "relatedTo", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<CityObjectRelationPropertyType> createRelatedTo(CityObjectRelationPropertyType value) {
+        return new JAXBElement<CityObjectRelationPropertyType>(_RelatedTo_QNAME, CityObjectRelationPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractDevicePropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDevicePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "buildingUnit", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<AbstractBuildingUnitPropertyType> createBuildingUnitProperty(AbstractBuildingUnitPropertyType value) {
-        return new JAXBElement<AbstractBuildingUnitPropertyType>(_BuildingUnitProperty_QNAME, AbstractBuildingUnitPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "device", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<AbstractDevicePropertyType> createDevice(AbstractDevicePropertyType value) {
+        return new JAXBElement<AbstractDevicePropertyType>(_Device_QNAME, AbstractDevicePropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificatePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificatePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "energyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<EnergyPerformanceCertificatePropertyType> createEnergyPerformanceCertificateProperty(EnergyPerformanceCertificatePropertyType value) {
-        return new JAXBElement<EnergyPerformanceCertificatePropertyType>(_EnergyPerformanceCertificateProperty_QNAME, EnergyPerformanceCertificatePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "layeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<AbstractLayeredConstructionPropertyType> createLayeredConstructionProperty(AbstractLayeredConstructionPropertyType value) {
+        return new JAXBElement<AbstractLayeredConstructionPropertyType>(_LayeredConstructionProperty_QNAME, AbstractLayeredConstructionPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasurePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasurePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "refurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<RefurbishmentMeasurePropertyType> createRefurbishmentMeasureProperty(RefurbishmentMeasurePropertyType value) {
-        return new JAXBElement<RefurbishmentMeasurePropertyType>(_RefurbishmentMeasureProperty_QNAME, RefurbishmentMeasurePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "libraryLayeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<AbstractLayeredConstructionPropertyType> createLibraryLayeredConstruction(AbstractLayeredConstructionPropertyType value) {
+        return new JAXBElement<AbstractLayeredConstructionPropertyType>(_LibraryLayeredConstruction_QNAME, AbstractLayeredConstructionPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractThermalZonePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractResourcePropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractThermalZonePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourcePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "thermalZone", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<AbstractThermalZonePropertyType> createThermalZoneProperty(AbstractThermalZonePropertyType value) {
-        return new JAXBElement<AbstractThermalZonePropertyType>(_ThermalZoneProperty_QNAME, AbstractThermalZonePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "resource", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<AbstractResourcePropertyType> createResource(AbstractResourcePropertyType value) {
+        return new JAXBElement<AbstractResourcePropertyType>(_Resource_QNAME, AbstractResourcePropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractUsageZonePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SuitabilityPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractUsageZonePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link SuitabilityPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "usageZone", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
-    public JAXBElement<AbstractUsageZonePropertyType> createUsageZoneProperty(AbstractUsageZonePropertyType value) {
-        return new JAXBElement<AbstractUsageZonePropertyType>(_UsageZoneProperty_QNAME, AbstractUsageZonePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "suitability", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<SuitabilityPropertyType> createSuitability(SuitabilityPropertyType value) {
+        return new JAXBElement<SuitabilityPropertyType>(_Suitability_QNAME, SuitabilityPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CityObjectRelationType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "CityObjectRelation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
-    public JAXBElement<CityObjectRelationType> createCityObjectRelation(CityObjectRelationType value) {
-        return new JAXBElement<CityObjectRelationType>(_CityObjectRelation_QNAME, CityObjectRelationType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "utilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<UtilityNetworkConnectionPropertyType> createUtilityNetworkConnectionProperty(UtilityNetworkConnectionPropertyType value) {
+        return new JAXBElement<UtilityNetworkConnectionPropertyType>(_UtilityNetworkConnectionProperty_QNAME, UtilityNetworkConnectionPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CityObjectRelationPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link SensorDataPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link SensorDataPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "relatedTo", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<CityObjectRelationPropertyType> createRelatedTo(CityObjectRelationPropertyType value) {
-        return new JAXBElement<CityObjectRelationPropertyType>(_RelatedTo_QNAME, CityObjectRelationPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "sensorData", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<SensorDataPropertyType> createSensorDataProperty(SensorDataPropertyType value) {
+        return new JAXBElement<SensorDataPropertyType>(_SensorDataProperty_QNAME, SensorDataPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractDevicePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PointPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDevicePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link PointPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "device", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<AbstractDevicePropertyType> createDevice(AbstractDevicePropertyType value) {
-        return new JAXBElement<AbstractDevicePropertyType>(_Device_QNAME, AbstractDevicePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "referencePoint", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    public JAXBElement<PointPropertyType> createReferencePoint(PointPropertyType value) {
+        return new JAXBElement<PointPropertyType>(_ReferencePoint_QNAME, PointPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificateType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificateType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "layeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<AbstractLayeredConstructionPropertyType> createLayeredConstructionProperty(AbstractLayeredConstructionPropertyType value) {
-        return new JAXBElement<AbstractLayeredConstructionPropertyType>(_LayeredConstructionProperty_QNAME, AbstractLayeredConstructionPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "EnergyPerformanceCertificate", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractFeatureWithLifeSpan")
+    public JAXBElement<EnergyPerformanceCertificateType> createEnergyPerformanceCertificate(EnergyPerformanceCertificateType value) {
+        return new JAXBElement<EnergyPerformanceCertificateType>(_EnergyPerformanceCertificate_QNAME, EnergyPerformanceCertificateType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractResourcePropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link OccupantsType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourcePropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link OccupantsType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "resource", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<AbstractResourcePropertyType> createResource(AbstractResourcePropertyType value) {
-        return new JAXBElement<AbstractResourcePropertyType>(_Resource_QNAME, AbstractResourcePropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Occupants", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractFeatureWithLifeSpan")
+    public JAXBElement<OccupantsType> createOccupants(OccupantsType value) {
+        return new JAXBElement<OccupantsType>(_Occupants_QNAME, OccupantsType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SuitabilityPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasureType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SuitabilityPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "suitability", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<SuitabilityPropertyType> createSuitability(SuitabilityPropertyType value) {
-        return new JAXBElement<SuitabilityPropertyType>(_Suitability_QNAME, SuitabilityPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RefurbishmentMeasure", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractFeatureWithLifeSpan")
+    public JAXBElement<RefurbishmentMeasureType> createRefurbishmentMeasure(RefurbishmentMeasureType value) {
+        return new JAXBElement<RefurbishmentMeasureType>(_RefurbishmentMeasure_QNAME, RefurbishmentMeasureType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractBuildingSpaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingSpaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "utilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<UtilityNetworkConnectionPropertyType> createUtilityNetworkConnectionProperty(UtilityNetworkConnectionPropertyType value) {
-        return new JAXBElement<UtilityNetworkConnectionPropertyType>(_UtilityNetworkConnectionProperty_QNAME, UtilityNetworkConnectionPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractBuildingSpace", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractCityObjectSpace")
+    public JAXBElement<AbstractBuildingSpaceType> createAbstractBuildingSpace(AbstractBuildingSpaceType value) {
+        return new JAXBElement<AbstractBuildingSpaceType>(_AbstractBuildingSpace_QNAME, AbstractBuildingSpaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WeatherDataPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BuildingUnitType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link WeatherDataPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link BuildingUnitType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "weatherData", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<WeatherDataPropertyType> createWeatherDataProperty(WeatherDataPropertyType value) {
-        return new JAXBElement<WeatherDataPropertyType>(_WeatherDataProperty_QNAME, WeatherDataPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "BuildingUnit", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingSpace")
+    public JAXBElement<BuildingUnitType> createBuildingUnit(BuildingUnitType value) {
+        return new JAXBElement<BuildingUnitType>(_BuildingUnit_QNAME, BuildingUnitType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PointPropertyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractZoneType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link PointPropertyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "referencePoint", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
-    public JAXBElement<PointPropertyType> createReferencePoint(PointPropertyType value) {
-        return new JAXBElement<PointPropertyType>(_ReferencePoint_QNAME, PointPropertyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingSpace")
+    public JAXBElement<AbstractZoneType> createAbstractZone(AbstractZoneType value) {
+        return new JAXBElement<AbstractZoneType>(_AbstractZone_QNAME, AbstractZoneType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ConstructionMaterialType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ConstructionMaterialType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ConstructionMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<ConstructionMaterialType> createConstructionMaterial(ConstructionMaterialType value) {
-        return new JAXBElement<ConstructionMaterialType>(_ConstructionMaterial_QNAME, ConstructionMaterialType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Zone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZone")
+    public JAXBElement<ZoneType> createZone(ZoneType value) {
+        return new JAXBElement<ZoneType>(_Zone_QNAME, ZoneType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZonePartType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZonePartType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Energy", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<EnergyType> createEnergy(EnergyType value) {
-        return new JAXBElement<EnergyType>(_Energy_QNAME, EnergyType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZonePart", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZone")
+    public JAXBElement<ZonePartType> createZonePart(ZonePartType value) {
+        return new JAXBElement<ZonePartType>(_ZonePart_QNAME, ZonePartType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link FoodType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractZoneBoundarySurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link FoodType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractZoneBoundarySurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Food", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<FoodType> createFood(FoodType value) {
-        return new JAXBElement<FoodType>(_Food_QNAME, FoodType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractZoneBoundarySurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
+    public JAXBElement<AbstractZoneBoundarySurfaceType> createAbstractZoneBoundarySurface(AbstractZoneBoundarySurfaceType value) {
+        return new JAXBElement<AbstractZoneBoundarySurfaceType>(_AbstractZoneBoundarySurface_QNAME, AbstractZoneBoundarySurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OtherResourceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractZoneOpeningType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link OtherResourceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractZoneOpeningType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "OtherResource", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<OtherResourceType> createOtherResource(OtherResourceType value) {
-        return new JAXBElement<OtherResourceType>(_OtherResource_QNAME, OtherResourceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractZoneOpening", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_Opening")
+    public JAXBElement<AbstractZoneOpeningType> createAbstractZoneOpening(AbstractZoneOpeningType value) {
+        return new JAXBElement<AbstractZoneOpeningType>(_AbstractZoneOpening_QNAME, AbstractZoneOpeningType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UrbanSpaceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneAtticFloorSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link UrbanSpaceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneAtticFloorSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UrbanSpace", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<UrbanSpaceType> createUrbanSpace(UrbanSpaceType value) {
-        return new JAXBElement<UrbanSpaceType>(_UrbanSpace_QNAME, UrbanSpaceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneAtticFloorSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneAtticFloorSurfaceType> createZoneAtticFloorSurface(ZoneAtticFloorSurfaceType value) {
+        return new JAXBElement<ZoneAtticFloorSurfaceType>(_ZoneAtticFloorSurface_QNAME, ZoneAtticFloorSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WasteType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneBasementCeilingSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link WasteType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneBasementCeilingSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Waste", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<WasteType> createWaste(WasteType value) {
-        return new JAXBElement<WasteType>(_Waste_QNAME, WasteType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneBasementCeilingSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneBasementCeilingSurfaceType> createZoneBasementCeilingSurface(ZoneBasementCeilingSurfaceType value) {
+        return new JAXBElement<ZoneBasementCeilingSurfaceType>(_ZoneBasementCeilingSurface_QNAME, ZoneBasementCeilingSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link WaterType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneClosureSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link WaterType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneClosureSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Water", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
-    public JAXBElement<WaterType> createWater(WaterType value) {
-        return new JAXBElement<WaterType>(_Water_QNAME, WaterType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneClosureSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneClosureSurfaceType> createZoneClosureSurface(ZoneClosureSurfaceType value) {
+        return new JAXBElement<ZoneClosureSurfaceType>(_ZoneClosureSurface_QNAME, ZoneClosureSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractMaterialType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneExteriorWallSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractMaterialType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneExteriorWallSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractMaterial", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<AbstractMaterialType> createAbstractMaterial(AbstractMaterialType value) {
-        return new JAXBElement<AbstractMaterialType>(_AbstractMaterial_QNAME, AbstractMaterialType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneExteriorWallSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneExteriorWallSurfaceType> createZoneExteriorWallSurface(ZoneExteriorWallSurfaceType value) {
+        return new JAXBElement<ZoneExteriorWallSurfaceType>(_ZoneExteriorWallSurface_QNAME, ZoneExteriorWallSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GasType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneGroundSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link GasType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneGroundSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Gas", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractMaterial")
-    public JAXBElement<GasType> createGas(GasType value) {
-        return new JAXBElement<GasType>(_Gas_QNAME, GasType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneGroundSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneGroundSurfaceType> createZoneGroundSurface(ZoneGroundSurfaceType value) {
+        return new JAXBElement<ZoneGroundSurfaceType>(_ZoneGroundSurface_QNAME, ZoneGroundSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LayeredConstructionLibraryType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneIntermediateFloorSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionLibraryType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneIntermediateFloorSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "LayeredConstructionLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
-    public JAXBElement<LayeredConstructionLibraryType> createLayeredConstructionLibrary(LayeredConstructionLibraryType value) {
-        return new JAXBElement<LayeredConstructionLibraryType>(_LayeredConstructionLibrary_QNAME, LayeredConstructionLibraryType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneIntermediateFloorSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneIntermediateFloorSurfaceType> createZoneIntermediateFloorSurface(ZoneIntermediateFloorSurfaceType value) {
+        return new JAXBElement<ZoneIntermediateFloorSurfaceType>(_ZoneIntermediateFloorSurface_QNAME, ZoneIntermediateFloorSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LayerType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneRoofSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link LayerType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneRoofSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Layer", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<LayerType> createLayer(LayerType value) {
-        return new JAXBElement<LayerType>(_Layer_QNAME, LayerType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneRoofSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneRoofSurfaceType> createZoneRoofSurface(ZoneRoofSurfaceType value) {
+        return new JAXBElement<ZoneRoofSurfaceType>(_ZoneRoofSurface_QNAME, ZoneRoofSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LayeredConstructionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneUndergroundWallSurfaceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneUndergroundWallSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "LayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLayeredConstruction")
-    public JAXBElement<LayeredConstructionType> createLayeredConstruction(LayeredConstructionType value) {
-        return new JAXBElement<LayeredConstructionType>(_LayeredConstruction_QNAME, LayeredConstructionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneUndergroundWallSurface", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneBoundarySurface")
+    public JAXBElement<ZoneUndergroundWallSurfaceType> createZoneUndergroundWallSurface(ZoneUndergroundWallSurfaceType value) {
+        return new JAXBElement<ZoneUndergroundWallSurfaceType>(_ZoneUndergroundWallSurface_QNAME, ZoneUndergroundWallSurfaceType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MaterialLibraryType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneDoorType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link MaterialLibraryType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneDoorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "MaterialLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
-    public JAXBElement<MaterialLibraryType> createMaterialLibrary(MaterialLibraryType value) {
-        return new JAXBElement<MaterialLibraryType>(_MaterialLibrary_QNAME, MaterialLibraryType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneDoor", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneOpening")
+    public JAXBElement<ZoneDoorType> createZoneDoor(ZoneDoorType value) {
+        return new JAXBElement<ZoneDoorType>(_ZoneDoor_QNAME, ZoneDoorType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReverseLayeredConstructionType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ZoneWindowType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ReverseLayeredConstructionType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ZoneWindowType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ReverseLayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLayeredConstruction")
-    public JAXBElement<ReverseLayeredConstructionType> createReverseLayeredConstruction(ReverseLayeredConstructionType value) {
-        return new JAXBElement<ReverseLayeredConstructionType>(_ReverseLayeredConstruction_QNAME, ReverseLayeredConstructionType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ZoneWindow", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractZoneOpening")
+    public JAXBElement<ZoneWindowType> createZoneWindow(ZoneWindowType value) {
+        return new JAXBElement<ZoneWindowType>(_ZoneWindow_QNAME, ZoneWindowType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SolidMaterialType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedHeightPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link SolidMaterialType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedHeightPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SolidMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractMaterial")
-    public JAXBElement<SolidMaterialType> createSolidMaterial(SolidMaterialType value) {
-        return new JAXBElement<SolidMaterialType>(_SolidMaterial_QNAME, SolidMaterialType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgHeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<QualifiedHeightPropertyType> createBdgHeight(QualifiedHeightPropertyType value) {
+        return new JAXBElement<QualifiedHeightPropertyType>(_BdgHeight_QNAME, QualifiedHeightPropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedAreaPropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedAreaPropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<QualifiedAreaPropertyType> createBdgArea(QualifiedAreaPropertyType value) {
+        return new JAXBElement<QualifiedAreaPropertyType>(_BdgArea_QNAME, QualifiedAreaPropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AtticFloorSurfaceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link QualifiedVolumePropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AtticFloorSurfaceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedVolumePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AtticFloorSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
-    public JAXBElement<AtticFloorSurfaceType> createAtticFloorSurface(AtticFloorSurfaceType value) {
-        return new JAXBElement<AtticFloorSurfaceType>(_AtticFloorSurface_QNAME, AtticFloorSurfaceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgVolume", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<QualifiedVolumePropertyType> createBdgVolume(QualifiedVolumePropertyType value) {
+        return new JAXBElement<QualifiedVolumePropertyType>(_BdgVolume_QNAME, QualifiedVolumePropertyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BasementCeilingSurfaceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link BasementCeilingSurfaceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link String }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "BasementCeilingSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
-    public JAXBElement<BasementCeilingSurfaceType> createBasementCeilingSurface(BasementCeilingSurfaceType value) {
-        return new JAXBElement<BasementCeilingSurfaceType>(_BasementCeilingSurface_QNAME, BasementCeilingSurfaceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOwnerName", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<String> createBdgOwnerName(String value) {
+        return new JAXBElement<String>(_BdgOwnerName_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IntermediateFloorSurfaceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link IntermediateFloorSurfaceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "IntermediateFloorSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
-    public JAXBElement<IntermediateFloorSurfaceType> createIntermediateFloorSurface(IntermediateFloorSurfaceType value) {
-        return new JAXBElement<IntermediateFloorSurfaceType>(_IntermediateFloorSurface_QNAME, IntermediateFloorSurfaceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOwnershipType", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<CodeType> createBdgOwnershipType(CodeType value) {
+        return new JAXBElement<CodeType>(_BdgOwnershipType_QNAME, CodeType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PartyWallSurfaceType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link PartyWallSurfaceType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "PartyWallSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
-    public JAXBElement<PartyWallSurfaceType> createPartyWallSurface(PartyWallSurfaceType value) {
-        return new JAXBElement<PartyWallSurfaceType>(_PartyWallSurface_QNAME, PartyWallSurfaceType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgAtticThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<ThermalStatusValueType> createBdgAtticThermalStatus(ThermalStatusValueType value) {
+        return new JAXBElement<ThermalStatusValueType>(_BdgAtticThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ThermalZoneType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ThermalZoneType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ThermalZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractThermalZone")
-    public JAXBElement<ThermalZoneType> createThermalZone(ThermalZoneType value) {
-        return new JAXBElement<ThermalZoneType>(_ThermalZone_QNAME, ThermalZoneType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBasementThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<ThermalStatusValueType> createBdgBasementThermalStatus(ThermalStatusValueType value) {
+        return new JAXBElement<ThermalStatusValueType>(_BdgBasementThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfAzimuth", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<AngleType> createBdgBdrySurfAzimuth(AngleType value) {
-        return new JAXBElement<AngleType>(_BdgBdrySurfAzimuth_QNAME, AngleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgConstructionWeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<CodeType> createBdgConstructionWeight(CodeType value) {
+        return new JAXBElement<CodeType>(_BdgConstructionWeight_QNAME, CodeType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfGroundViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<ScaleType> createBdgBdrySurfGroundViewFactor(ScaleType value) {
-        return new JAXBElement<ScaleType>(_BdgBdrySurfGroundViewFactor_QNAME, ScaleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgIsProtected", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<Boolean> createBdgIsProtected(Boolean value) {
+        return new JAXBElement<Boolean>(_BdgIsProtected_QNAME, Boolean.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MeasureType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link MeasureType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfHeatCapacity", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<MeasureType> createBdgBdrySurfHeatCapacity(MeasureType value) {
-        return new JAXBElement<MeasureType>(_BdgBdrySurfHeatCapacity_QNAME, MeasureType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgType", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<CodeType> createBdgType(CodeType value) {
+        return new JAXBElement<CodeType>(_BdgType_QNAME, CodeType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link OccupantsPropertyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link OccupantsPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<AngleType> createBdgBdrySurfInclination(AngleType value) {
-        return new JAXBElement<AngleType>(_BdgBdrySurfInclination_QNAME, AngleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "occupiedBy", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<OccupantsPropertyType> createOccupiedBy(OccupantsPropertyType value) {
+        return new JAXBElement<OccupantsPropertyType>(_OccupiedBy_QNAME, OccupantsPropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link BuildingUnitPropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link BuildingUnitPropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "buildingUnit", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<BuildingUnitPropertyType> createBuildingUnitProperty(BuildingUnitPropertyType value) {
+        return new JAXBElement<BuildingUnitPropertyType>(_BuildingUnitProperty_QNAME, BuildingUnitPropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractZonePropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractZonePropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "zone", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<AbstractZonePropertyType> createZoneProperty(AbstractZonePropertyType value) {
+        return new JAXBElement<AbstractZonePropertyType>(_ZoneProperty_QNAME, AbstractZonePropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificatePropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificatePropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "energyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<EnergyPerformanceCertificatePropertyType> createEnergyPerformanceCertificateProperty(EnergyPerformanceCertificatePropertyType value) {
+        return new JAXBElement<EnergyPerformanceCertificatePropertyType>(_EnergyPerformanceCertificateProperty_QNAME, EnergyPerformanceCertificatePropertyType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasurePropertyType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasurePropertyType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "refurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    public JAXBElement<RefurbishmentMeasurePropertyType> createRefurbishmentMeasureProperty(RefurbishmentMeasurePropertyType value) {
+        return new JAXBElement<RefurbishmentMeasurePropertyType>(_RefurbishmentMeasureProperty_QNAME, RefurbishmentMeasurePropertyType.class, null, value);
     }
 
     /**
@@ -2254,9 +2621,35 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfIsAdiabatic", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<Boolean> createBdgBdrySurfIsAdiabatic(Boolean value) {
-        return new JAXBElement<Boolean>(_BdgBdrySurfIsAdiabatic_QNAME, Boolean.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfIsShared", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<Boolean> createBdgBdrySurfIsShared(Boolean value) {
+        return new JAXBElement<Boolean>(_BdgBdrySurfIsShared_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfThickness", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<LengthType> createBdgBdrySurfThickness(LengthType value) {
+        return new JAXBElement<LengthType>(_BdgBdrySurfThickness_QNAME, LengthType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfTotalSurfaceArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<AreaType> createBdgBdrySurfTotalSurfaceArea(AreaType value) {
+        return new JAXBElement<AreaType>(_BdgBdrySurfTotalSurfaceArea_QNAME, AreaType.class, null, value);
     }
 
     /**
@@ -2286,42 +2679,68 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MeasureType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link MeasureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<ScaleType> createBdgBdrySurfSkyViewFactor(ScaleType value) {
-        return new JAXBElement<ScaleType>(_BdgBdrySurfSkyViewFactor_QNAME, ScaleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfHeatCapacity", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<MeasureType> createBdgBdrySurfHeatCapacity(MeasureType value) {
+        return new JAXBElement<MeasureType>(_BdgBdrySurfHeatCapacity_QNAME, MeasureType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfThickness", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<LengthType> createBdgBdrySurfThickness(LengthType value) {
-        return new JAXBElement<LengthType>(_BdgBdrySurfThickness_QNAME, LengthType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfAzimuth", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<AngleType> createBdgBdrySurfAzimuth(AngleType value) {
+        return new JAXBElement<AngleType>(_BdgBdrySurfAzimuth_QNAME, AngleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfTotalSurfaceArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
-    public JAXBElement<AreaType> createBdgBdrySurfTotalSurfaceArea(AreaType value) {
-        return new JAXBElement<AreaType>(_BdgBdrySurfTotalSurfaceArea_QNAME, AreaType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<AngleType> createBdgBdrySurfInclination(AngleType value) {
+        return new JAXBElement<AngleType>(_BdgBdrySurfInclination_QNAME, AngleType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfGroundViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<ScaleType> createBdgBdrySurfGroundViewFactor(ScaleType value) {
+        return new JAXBElement<ScaleType>(_BdgBdrySurfGroundViewFactor_QNAME, ScaleType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    public JAXBElement<ScaleType> createBdgBdrySurfSkyViewFactor(ScaleType value) {
+        return new JAXBElement<ScaleType>(_BdgBdrySurfSkyViewFactor_QNAME, ScaleType.class, null, value);
     }
 
     /**
@@ -2337,6 +2756,19 @@ public class ObjectFactory {
         return new JAXBElement<AreaType>(_BdgOpnArea_QNAME, AreaType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    public JAXBElement<AngleType> createBdgOpnInclination(AngleType value) {
+        return new JAXBElement<AngleType>(_BdgOpnInclination_QNAME, AngleType.class, null, value);
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      * 
@@ -2364,68 +2796,107 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
-    public JAXBElement<AngleType> createBdgOpnInclination(AngleType value) {
-        return new JAXBElement<AngleType>(_BdgOpnInclination_QNAME, AngleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    public JAXBElement<ScaleType> createBdgOpnSkyViewFactor(ScaleType value) {
+        return new JAXBElement<ScaleType>(_BdgOpnSkyViewFactor_QNAME, ScaleType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link ConstructionMaterialType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link ConstructionMaterialType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
-    public JAXBElement<ScaleType> createBdgOpnSkyViewFactor(ScaleType value) {
-        return new JAXBElement<ScaleType>(_BdgOpnSkyViewFactor_QNAME, ScaleType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ConstructionMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<ConstructionMaterialType> createConstructionMaterial(ConstructionMaterialType value) {
+        return new JAXBElement<ConstructionMaterialType>(_ConstructionMaterial_QNAME, ConstructionMaterialType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BuildingUnitType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link EnergyType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link BuildingUnitType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link EnergyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "BuildingUnit", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractBuildingUnit")
-    public JAXBElement<BuildingUnitType> createBuildingUnit(BuildingUnitType value) {
-        return new JAXBElement<BuildingUnitType>(_BuildingUnit_QNAME, BuildingUnitType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Energy", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<EnergyType> createEnergy(EnergyType value) {
+        return new JAXBElement<EnergyType>(_Energy_QNAME, EnergyType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OccupantsType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link FoodType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link OccupantsType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link FoodType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Occupants", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<OccupantsType> createOccupants(OccupantsType value) {
-        return new JAXBElement<OccupantsType>(_Occupants_QNAME, OccupantsType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Food", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<FoodType> createFood(FoodType value) {
+        return new JAXBElement<FoodType>(_Food_QNAME, FoodType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link UsageZoneType }{@code >}
+     * Create an instance of {@link JAXBElement }{@code <}{@link OtherResourceType }{@code >}
      * 
      * @param value
      *     Java instance representing xml element's value.
      * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link UsageZoneType }{@code >}
+     *     the new instance of {@link JAXBElement }{@code <}{@link OtherResourceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UsageZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractUsageZone")
-    public JAXBElement<UsageZoneType> createUsageZone(UsageZoneType value) {
-        return new JAXBElement<UsageZoneType>(_UsageZone_QNAME, UsageZoneType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "OtherResource", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<OtherResourceType> createOtherResource(OtherResourceType value) {
+        return new JAXBElement<OtherResourceType>(_OtherResource_QNAME, OtherResourceType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link UrbanSpaceType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link UrbanSpaceType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UrbanSpace", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<UrbanSpaceType> createUrbanSpace(UrbanSpaceType value) {
+        return new JAXBElement<UrbanSpaceType>(_UrbanSpace_QNAME, UrbanSpaceType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link WasteType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link WasteType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Waste", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<WasteType> createWaste(WasteType value) {
+        return new JAXBElement<WasteType>(_Waste_QNAME, WasteType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link WaterType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link WaterType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Water", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractResource")
+    public JAXBElement<WaterType> createWater(WaterType value) {
+        return new JAXBElement<WaterType>(_Water_QNAME, WaterType.class, null, value);
     }
 
     /**
@@ -2454,19 +2925,6 @@ public class ObjectFactory {
         return new JAXBElement<BoilerType>(_Boiler_QNAME, BoilerType.class, null, value);
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DeviceOperationType }{@code >}
-     * 
-     * @param value
-     *     Java instance representing xml element's value.
-     * @return
-     *     the new instance of {@link JAXBElement }{@code <}{@link DeviceOperationType }{@code >}
-     */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "DeviceOperation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
-    public JAXBElement<DeviceOperationType> createDeviceOperation(DeviceOperationType value) {
-        return new JAXBElement<DeviceOperationType>(_DeviceOperation_QNAME, DeviceOperationType.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ElectricalStorageDeviceType }{@code >}
      * 
@@ -2519,6 +2977,19 @@ public class ObjectFactory {
         return new JAXBElement<GenericSolarCollectorType>(_GenericSolarCollector_QNAME, GenericSolarCollectorType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GenericStorageDeviceType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link GenericStorageDeviceType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "GenericStorageDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
+    public JAXBElement<GenericStorageDeviceType> createGenericStorageDevice(GenericStorageDeviceType value) {
+        return new JAXBElement<GenericStorageDeviceType>(_GenericStorageDevice_QNAME, GenericStorageDeviceType.class, null, value);
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link HeatPumpType }{@code >}
      * 
@@ -2636,4 +3107,134 @@ public class ObjectFactory {
         return new JAXBElement<WeatherStationType>(_WeatherStation_QNAME, WeatherStationType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link WeatherDataType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link WeatherDataType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "WeatherData", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "SensorData")
+    public JAXBElement<WeatherDataType> createWeatherData(WeatherDataType value) {
+        return new JAXBElement<WeatherDataType>(_WeatherData_QNAME, WeatherDataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractMaterialType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link AbstractMaterialType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<AbstractMaterialType> createAbstractMaterial(AbstractMaterialType value) {
+        return new JAXBElement<AbstractMaterialType>(_AbstractMaterial_QNAME, AbstractMaterialType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link LayeredConstructionLibraryType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionLibraryType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "LayeredConstructionLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
+    public JAXBElement<LayeredConstructionLibraryType> createLayeredConstructionLibrary(LayeredConstructionLibraryType value) {
+        return new JAXBElement<LayeredConstructionLibraryType>(_LayeredConstructionLibrary_QNAME, LayeredConstructionLibraryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link LayerType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LayerType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Layer", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractADEFeature")
+    public JAXBElement<LayerType> createLayer(LayerType value) {
+        return new JAXBElement<LayerType>(_Layer_QNAME, LayerType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link LayeredConstructionType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "LayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLayeredConstruction")
+    public JAXBElement<LayeredConstructionType> createLayeredConstruction(LayeredConstructionType value) {
+        return new JAXBElement<LayeredConstructionType>(_LayeredConstruction_QNAME, LayeredConstructionType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link MaterialLibraryType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link MaterialLibraryType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "MaterialLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLibrary")
+    public JAXBElement<MaterialLibraryType> createMaterialLibrary(MaterialLibraryType value) {
+        return new JAXBElement<MaterialLibraryType>(_MaterialLibrary_QNAME, MaterialLibraryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ReverseLayeredConstructionType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link ReverseLayeredConstructionType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ReverseLayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractLayeredConstruction")
+    public JAXBElement<ReverseLayeredConstructionType> createReverseLayeredConstruction(ReverseLayeredConstructionType value) {
+        return new JAXBElement<ReverseLayeredConstructionType>(_ReverseLayeredConstruction_QNAME, ReverseLayeredConstructionType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link GasType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link GasType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Gas", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractMaterial")
+    public JAXBElement<GasType> createGas(GasType value) {
+        return new JAXBElement<GasType>(_Gas_QNAME, GasType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link LiquidType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link LiquidType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Liquid", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractMaterial")
+    public JAXBElement<LiquidType> createLiquid(LiquidType value) {
+        return new JAXBElement<LiquidType>(_Liquid_QNAME, LiquidType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SolidMaterialType }{@code >}
+     * 
+     * @param value
+     *     Java instance representing xml element's value.
+     * @return
+     *     the new instance of {@link JAXBElement }{@code <}{@link SolidMaterialType }{@code >}
+     */
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SolidMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractMaterial")
+    public JAXBElement<SolidMaterialType> createSolidMaterial(SolidMaterialType value) {
+        return new JAXBElement<SolidMaterialType>(_SolidMaterial_QNAME, SolidMaterialType.class, null, value);
+    }
+
 }

src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/OccupantsPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsType.java → src-gen/org/sig3d/citygml/energyADE3beta8/OccupantsType.java

@@ -2,18 +2,17 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import net.opengis.gml.AbstractFeatureType;
 import net.opengis.gml.CodeType;
 import net.opengis.gml.MeasureType;
 import net.opengis.gml.ScaleType;
@@ -27,18 +26,18 @@ import net.opengis.gml.ScaleType;
  * <pre>
  * &lt;complexType name="OccupantsType"&gt;
  *   &lt;complexContent&gt;
- *     &lt;extension base="{http://www.opengis.net/gml}AbstractFeatureType"&gt;
+ *     &lt;extension base="{http://www.citygml.org/ade/energy/3.0}AbstractFeatureWithLifeSpanType"&gt;
  *       &lt;sequence&gt;
  *         &lt;element name="type" type="{http://www.opengis.net/gml}CodeType"/&gt;
  *         &lt;element name="numberOfOccupants" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/&gt;
- *         &lt;element name="heatDissipation" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
- *         &lt;element name="heatDissipationConvectiveFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
- *         &lt;element name="heatDissipationLatentFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
- *         &lt;element name="heatDissipationRadiantFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
- *         &lt;element name="occupancyRate" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/&gt;
  *         &lt;element name="averageDietType" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/&gt;
  *         &lt;element name="averageIncomeLevel" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/&gt;
  *         &lt;element name="averageInstructionLevel" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/&gt;
+ *         &lt;element name="heatDissipation" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/&gt;
+ *         &lt;element name="heatDissipationConvectiveFactor" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
+ *         &lt;element name="heatDissipationLatentFactor" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
+ *         &lt;element name="heatDissipationRadiantFactor" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/&gt;
+ *         &lt;element name="occupancySchedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -51,30 +50,30 @@ import net.opengis.gml.ScaleType;
 @XmlType(name = "OccupantsType", propOrder = {
     "type",
     "numberOfOccupants",
-    "heatDissipation",
-    "heatDissipationConvectiveFraction",
-    "heatDissipationLatentFraction",
-    "heatDissipationRadiantFraction",
-    "occupancyRate",
     "averageDietType",
     "averageIncomeLevel",
-    "averageInstructionLevel"
+    "averageInstructionLevel",
+    "heatDissipation",
+    "heatDissipationConvectiveFactor",
+    "heatDissipationLatentFactor",
+    "heatDissipationRadiantFactor",
+    "occupancySchedule"
 })
 public class OccupantsType
-    extends AbstractFeatureType
+    extends AbstractFeatureWithLifeSpanType
 {
 
     @XmlElement(required = true)
     protected CodeType type;
     protected BigInteger numberOfOccupants;
-    protected MeasureType heatDissipation;
-    protected ScaleType heatDissipationConvectiveFraction;
-    protected ScaleType heatDissipationLatentFraction;
-    protected ScaleType heatDissipationRadiantFraction;
-    protected AbstractSchedulePropertyType occupancyRate;
     protected CodeType averageDietType;
     protected CodeType averageIncomeLevel;
     protected CodeType averageInstructionLevel;
+    protected MeasureType heatDissipation;
+    protected ScaleType heatDissipationConvectiveFactor;
+    protected ScaleType heatDissipationLatentFactor;
+    protected ScaleType heatDissipationRadiantFactor;
+    protected AbstractSchedulePropertyType occupancySchedule;
 
     /**
      * Gets the value of the type property.
@@ -133,227 +132,227 @@ public class OccupantsType
     }
 
     /**
-     * Gets the value of the heatDissipation property.
+     * Gets the value of the averageDietType property.
      * 
      * @return
      *     possible object is
-     *     {@link MeasureType }
+     *     {@link CodeType }
      *     
      */
-    public MeasureType getHeatDissipation() {
-        return heatDissipation;
+    public CodeType getAverageDietType() {
+        return averageDietType;
     }
 
     /**
-     * Sets the value of the heatDissipation property.
+     * Sets the value of the averageDietType property.
      * 
      * @param value
      *     allowed object is
-     *     {@link MeasureType }
+     *     {@link CodeType }
      *     
      */
-    public void setHeatDissipation(MeasureType value) {
-        this.heatDissipation = value;
+    public void setAverageDietType(CodeType value) {
+        this.averageDietType = value;
     }
 
-    public boolean isSetHeatDissipation() {
-        return (this.heatDissipation!= null);
+    public boolean isSetAverageDietType() {
+        return (this.averageDietType!= null);
     }
 
     /**
-     * Gets the value of the heatDissipationConvectiveFraction property.
+     * Gets the value of the averageIncomeLevel property.
      * 
      * @return
      *     possible object is
-     *     {@link ScaleType }
+     *     {@link CodeType }
      *     
      */
-    public ScaleType getHeatDissipationConvectiveFraction() {
-        return heatDissipationConvectiveFraction;
+    public CodeType getAverageIncomeLevel() {
+        return averageIncomeLevel;
     }
 
     /**
-     * Sets the value of the heatDissipationConvectiveFraction property.
+     * Sets the value of the averageIncomeLevel property.
      * 
      * @param value
      *     allowed object is
-     *     {@link ScaleType }
+     *     {@link CodeType }
      *     
      */
-    public void setHeatDissipationConvectiveFraction(ScaleType value) {
-        this.heatDissipationConvectiveFraction = value;
+    public void setAverageIncomeLevel(CodeType value) {
+        this.averageIncomeLevel = value;
     }
 
-    public boolean isSetHeatDissipationConvectiveFraction() {
-        return (this.heatDissipationConvectiveFraction!= null);
+    public boolean isSetAverageIncomeLevel() {
+        return (this.averageIncomeLevel!= null);
     }
 
     /**
-     * Gets the value of the heatDissipationLatentFraction property.
+     * Gets the value of the averageInstructionLevel property.
      * 
      * @return
      *     possible object is
-     *     {@link ScaleType }
+     *     {@link CodeType }
      *     
      */
-    public ScaleType getHeatDissipationLatentFraction() {
-        return heatDissipationLatentFraction;
+    public CodeType getAverageInstructionLevel() {
+        return averageInstructionLevel;
     }
 
     /**
-     * Sets the value of the heatDissipationLatentFraction property.
+     * Sets the value of the averageInstructionLevel property.
      * 
      * @param value
      *     allowed object is
-     *     {@link ScaleType }
+     *     {@link CodeType }
      *     
      */
-    public void setHeatDissipationLatentFraction(ScaleType value) {
-        this.heatDissipationLatentFraction = value;
+    public void setAverageInstructionLevel(CodeType value) {
+        this.averageInstructionLevel = value;
     }
 
-    public boolean isSetHeatDissipationLatentFraction() {
-        return (this.heatDissipationLatentFraction!= null);
+    public boolean isSetAverageInstructionLevel() {
+        return (this.averageInstructionLevel!= null);
     }
 
     /**
-     * Gets the value of the heatDissipationRadiantFraction property.
+     * Gets the value of the heatDissipation property.
      * 
      * @return
      *     possible object is
-     *     {@link ScaleType }
+     *     {@link MeasureType }
      *     
      */
-    public ScaleType getHeatDissipationRadiantFraction() {
-        return heatDissipationRadiantFraction;
+    public MeasureType getHeatDissipation() {
+        return heatDissipation;
     }
 
     /**
-     * Sets the value of the heatDissipationRadiantFraction property.
+     * Sets the value of the heatDissipation property.
      * 
      * @param value
      *     allowed object is
-     *     {@link ScaleType }
+     *     {@link MeasureType }
      *     
      */
-    public void setHeatDissipationRadiantFraction(ScaleType value) {
-        this.heatDissipationRadiantFraction = value;
+    public void setHeatDissipation(MeasureType value) {
+        this.heatDissipation = value;
     }
 
-    public boolean isSetHeatDissipationRadiantFraction() {
-        return (this.heatDissipationRadiantFraction!= null);
+    public boolean isSetHeatDissipation() {
+        return (this.heatDissipation!= null);
     }
 
     /**
-     * Gets the value of the occupancyRate property.
+     * Gets the value of the heatDissipationConvectiveFactor property.
      * 
      * @return
      *     possible object is
-     *     {@link AbstractSchedulePropertyType }
+     *     {@link ScaleType }
      *     
      */
-    public AbstractSchedulePropertyType getOccupancyRate() {
-        return occupancyRate;
+    public ScaleType getHeatDissipationConvectiveFactor() {
+        return heatDissipationConvectiveFactor;
     }
 
     /**
-     * Sets the value of the occupancyRate property.
+     * Sets the value of the heatDissipationConvectiveFactor property.
      * 
      * @param value
      *     allowed object is
-     *     {@link AbstractSchedulePropertyType }
+     *     {@link ScaleType }
      *     
      */
-    public void setOccupancyRate(AbstractSchedulePropertyType value) {
-        this.occupancyRate = value;
+    public void setHeatDissipationConvectiveFactor(ScaleType value) {
+        this.heatDissipationConvectiveFactor = value;
     }
 
-    public boolean isSetOccupancyRate() {
-        return (this.occupancyRate!= null);
+    public boolean isSetHeatDissipationConvectiveFactor() {
+        return (this.heatDissipationConvectiveFactor!= null);
     }
 
     /**
-     * Gets the value of the averageDietType property.
+     * Gets the value of the heatDissipationLatentFactor property.
      * 
      * @return
      *     possible object is
-     *     {@link CodeType }
+     *     {@link ScaleType }
      *     
      */
-    public CodeType getAverageDietType() {
-        return averageDietType;
+    public ScaleType getHeatDissipationLatentFactor() {
+        return heatDissipationLatentFactor;
     }
 
     /**
-     * Sets the value of the averageDietType property.
+     * Sets the value of the heatDissipationLatentFactor property.
      * 
      * @param value
      *     allowed object is
-     *     {@link CodeType }
+     *     {@link ScaleType }
      *     
      */
-    public void setAverageDietType(CodeType value) {
-        this.averageDietType = value;
+    public void setHeatDissipationLatentFactor(ScaleType value) {
+        this.heatDissipationLatentFactor = value;
     }
 
-    public boolean isSetAverageDietType() {
-        return (this.averageDietType!= null);
+    public boolean isSetHeatDissipationLatentFactor() {
+        return (this.heatDissipationLatentFactor!= null);
     }
 
     /**
-     * Gets the value of the averageIncomeLevel property.
+     * Gets the value of the heatDissipationRadiantFactor property.
      * 
      * @return
      *     possible object is
-     *     {@link CodeType }
+     *     {@link ScaleType }
      *     
      */
-    public CodeType getAverageIncomeLevel() {
-        return averageIncomeLevel;
+    public ScaleType getHeatDissipationRadiantFactor() {
+        return heatDissipationRadiantFactor;
     }
 
     /**
-     * Sets the value of the averageIncomeLevel property.
+     * Sets the value of the heatDissipationRadiantFactor property.
      * 
      * @param value
      *     allowed object is
-     *     {@link CodeType }
+     *     {@link ScaleType }
      *     
      */
-    public void setAverageIncomeLevel(CodeType value) {
-        this.averageIncomeLevel = value;
+    public void setHeatDissipationRadiantFactor(ScaleType value) {
+        this.heatDissipationRadiantFactor = value;
     }
 
-    public boolean isSetAverageIncomeLevel() {
-        return (this.averageIncomeLevel!= null);
+    public boolean isSetHeatDissipationRadiantFactor() {
+        return (this.heatDissipationRadiantFactor!= null);
     }
 
     /**
-     * Gets the value of the averageInstructionLevel property.
+     * Gets the value of the occupancySchedule property.
      * 
      * @return
      *     possible object is
-     *     {@link CodeType }
+     *     {@link AbstractSchedulePropertyType }
      *     
      */
-    public CodeType getAverageInstructionLevel() {
-        return averageInstructionLevel;
+    public AbstractSchedulePropertyType getOccupancySchedule() {
+        return occupancySchedule;
     }
 
     /**
-     * Sets the value of the averageInstructionLevel property.
+     * Sets the value of the occupancySchedule property.
      * 
      * @param value
      *     allowed object is
-     *     {@link CodeType }
+     *     {@link AbstractSchedulePropertyType }
      *     
      */
-    public void setAverageInstructionLevel(CodeType value) {
-        this.averageInstructionLevel = value;
+    public void setOccupancySchedule(AbstractSchedulePropertyType value) {
+        this.occupancySchedule = value;
     }
 
-    public boolean isSetAverageInstructionLevel() {
-        return (this.averageInstructionLevel!= null);
+    public boolean isSetOccupancySchedule() {
+        return (this.occupancySchedule!= null);
     }
 
 }

src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourcePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/OtherResourcePropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourceType.java → src-gen/org/sig3d/citygml/energyADE3beta8/OtherResourceType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/PhotovoltaicCollectorPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorType.java → src-gen/org/sig3d/citygml/energyADE3beta8/PhotovoltaicCollectorType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/PhotovoltaicThermalCollectorPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorType.java → src-gen/org/sig3d/citygml/energyADE3beta8/PhotovoltaicThermalCollectorType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedAreaPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedAreaType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightPropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedHeightPropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedHeightType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedVolumePropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumeType.java → src-gen/org/sig3d/citygml/energyADE3beta8/QualifiedVolumeType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src-gen/org/sig3d/citygml/energyADE3beta7/ReflectancePropertyType.java → src-gen/org/sig3d/citygml/energyADE3beta8/ReflectancePropertyType.java

@@ -2,11 +2,11 @@
 // Generated with ade-xjc - XML Schema binding compiler for CityGML ADEs, version 2.10.0
 // ade-xjc is part of the citygml4j project, see https://github.com/citygml4j
 // Any modifications to this file will be lost upon recompilation of the source
-// Generated: Mon Oct 27 13:17:28 CET 2025
+// Generated: Wed Dec 10 10:52:09 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE3beta7;
+package org.sig3d.citygml.energyADE3beta8;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;