diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 11adc51d680b277910716c97a92444a858af26e6..0f403a148b54daf73922d22f2dc1f64adc8376eb 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index f75c070b6c74aadd9ca309410379ba2931dbcd46..8f8344908639ab95c94e9a3545b9d6b8e972ebf3 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f9e84cedadfdbfe51035b6d011510a000d670f32..6fb6f7676e792f75550bca0db0e97018179f6e03 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 985b68b270d049400be53d9528c8323bf14a5145..401ce4a16ae129635ea9be95c5d4eb26374de5de 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/README.md b/README.md index 46afffb0994935a77e17a05136b1760b733efb8d..33db983bd4ba2275621b387f2ed224d523549fb4 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,12 @@ Currently, there are _no plans to migrate_ the Energy ADE 3 citygml4j module to The following modules are supported at the moment: -- Core (AbstractBuilding, Refurbishment Measures) +- Core (AbstractBuilding, RefurbishmentMeasures, WeatherData) - Resource - UrbanFunctionArea - WeatherStation - Timeseries -- DataTypes +- DataTypes (AbstractQualifiedAttribute) The following modules are currently in development: @@ -26,6 +26,7 @@ The following modules are currently in development: - LayeredConstruction - Schedule - Devices +- DataTypes (AbstractOpticalProperties) The Energy ADE 3 module for citygml4j uses [Gradle](https://gradle.org/) as build system. diff --git a/build.gradle b/build.gradle index 88f4bb56ac07743a4e61fae06e9d999c728b0ce4..1c221db6c6550e457d089edff0a513e85f7e9c1b 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ java { allprojects { group 'org.citygml4j.ade' - version 'beta7-0.1' - description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.1' + version 'beta7-0.2' + description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.2' ext { citygml4jVersion = '2.13.1' diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionPropertyType.java similarity index 97% rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionPropertyType.java rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionPropertyType.java index 752f7f3ab71107438a7eeb9026b093426fae0192..127ecc06633bcfec7bbe7ad0e745c2e1d758a7c5 100644 --- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionPropertyType.java +++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025 +// Generated: Mon Oct 27 13:17:28 CET 2025 // -package org.sig3d.citygml.energyADE2beta7; +package org.sig3d.citygml.energyADE3beta7; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; @@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence minOccurs="0"> - * <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartition"/> + * <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartition"/> * </sequence> * <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/> * </restriction> @@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; }) public class AbstractBuildingPartitionPropertyType { - @XmlElementRef(name = "AbstractBuildingPartition", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) + @XmlElementRef(name = "AbstractBuildingPartition", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false) protected JAXBElement abstractBuildingPartition; @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlSchemaType(name = "anyURI") diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionType.java similarity index 96% rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionType.java rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionType.java index 03af19710f4b659f21a97337d27eba1b0b0e2331..34ba8cce86e575d66c27e114325f77d633d0b7e3 100644 --- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingPartitionType.java +++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingPartitionType.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: Wed Jul 02 10:53:09 CEST 2025 +// Generated: Mon Oct 27 13:17:28 CET 2025 // -package org.sig3d.citygml.energyADE2beta7; +package org.sig3d.citygml.energyADE3beta7; import java.util.ArrayList; import java.util.List; @@ -28,8 +28,8 @@ import net.opengis.gml.SolidPropertyType; * <complexContent> * <extension base="{http://www.opengis.net/citygml/2.0}AbstractCityObjectType"> * <sequence> - * <element name="area" type="{http://www.citygml.org/ade/energy/2.0}QualifiedAreaPropertyType" maxOccurs="unbounded" minOccurs="0"/> - * <element name="volume" type="{http://www.citygml.org/ade/energy/2.0}QualifiedVolumePropertyType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="area" type="{http://www.citygml.org/ade/energy/3.0}QualifiedAreaPropertyType" maxOccurs="unbounded" minOccurs="0"/> + * <element name="volume" type="{http://www.citygml.org/ade/energy/3.0}QualifiedVolumePropertyType" maxOccurs="unbounded" minOccurs="0"/> * <element name="lod1Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/> * <element name="lod2Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/> * <element name="lod3Solid" type="{http://www.opengis.net/gml}SolidPropertyType" minOccurs="0"/> diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitPropertyType.java similarity index 97% rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitPropertyType.java rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitPropertyType.java index f34baaecc7412f9ea204a48e4076822a6e3e146a..4d4de1e309564a2a946c9aee6d005eaafebad2c3 100644 --- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitPropertyType.java +++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitPropertyType.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: Wed Jul 02 10:53:09 CEST 2025 +// Generated: Mon Oct 27 13:17:28 CET 2025 // -package org.sig3d.citygml.energyADE2beta7; +package org.sig3d.citygml.energyADE3beta7; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlAccessType; @@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence minOccurs="0"> - * <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingUnit"/> + * <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnit"/> * </sequence> * <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/> * </restriction> @@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType; }) public class AbstractBuildingUnitPropertyType { - @XmlElementRef(name = "AbstractBuildingUnit", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false) + @XmlElementRef(name = "AbstractBuildingUnit", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false) protected JAXBElement abstractBuildingUnit; @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml") @XmlSchemaType(name = "anyURI") diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitType.java similarity index 88% rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitType.java rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitType.java index ddc6cc30454b192594e67ffc82c75e83dcabae76..a2d106dab025fe4b7f7868f5901835e5bad184cf 100644 --- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractBuildingUnitType.java +++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractBuildingUnitType.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: Wed Jul 02 10:53:09 CEST 2025 +// Generated: Mon Oct 27 13:17:28 CET 2025 // -package org.sig3d.citygml.energyADE2beta7; +package org.sig3d.citygml.energyADE3beta7; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlType; * 
  * <complexType name="AbstractBuildingUnitType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartitionType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartitionType">
  *       <sequence>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDevicePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDevicePropertyType.java
index 1f07fced5c9b45e248188a34c65764b444599d0a..3e358c408da4a96388b21066d6f00ed2687b49c4 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractDevicePropertyType {
 
-    @XmlElementRef(name = "AbstractDevice", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractDevice", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractDevice;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDeviceType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDeviceType.java
index d773bfbf3f2ebcdc48e5a984922f6bb497cce20b..099c867423cee8b0a428c031a8a63cf314f2bee5 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import net.opengis.gml.ScaleType;
  *         <element name="heatDissipationConvectiveFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationLatentFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationRadiantFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="deviceOperation" type="{http://www.citygml.org/ade/energy/2.0}DeviceOperationPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="deviceOperation" type="{http://www.citygml.org/ade/energy/3.0}DeviceOperationPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionPropertyType.java
index 4488aa9e9fbdb8cf25f5319942ff8f3cd0ce2302..97691dd4fe8fec3753f07c81ab28b01bfb7c6337 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractLayeredConstruction"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractLayeredConstruction"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractLayeredConstructionPropertyType {
 
-    @XmlElementRef(name = "AbstractLayeredConstruction", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractLayeredConstruction", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractLayeredConstruction;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionType.java
similarity index 93%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionType.java
index 99cddfe652fb67be6cd2333fc3716e35bc366a15..ed8b8805398a8a1e91793380798b3eff410bcaf8 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLayeredConstructionType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLayeredConstructionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryPropertyType.java
index 8e589488f2bb8a8df83aec0bae3cadbe9b163c8d..302df5d872fa85d894170a29520f0818d99fd7c7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractLibrary"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractLibrary"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractLibraryPropertyType {
 
-    @XmlElementRef(name = "AbstractLibrary", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractLibrary", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractLibrary;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryType.java
index b1dd3e365a1cfc20b46f11f6b36930d3f311356b..f5d0b6d6544cec92c08a5c38ac823394efee4abe 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractLibraryType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractLibraryType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialPropertyType.java
index d5586a6d5a9f4cc4a7d63420174d658a1baa4596..b861662301339a6baf6d81101f8253f42a5206c2 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractMaterial"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractMaterial"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractMaterialPropertyType {
 
-    @XmlElementRef(name = "AbstractMaterial", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractMaterial", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractMaterial;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialType.java
index 6a38de83b675c8528d6dab46bbafd582c7793160..36ccbce58772c76da969555fa6d2a54e0518a3e6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractMaterialType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractMaterialType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_PropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_PropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_PropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_PropertyType.java
index abe4adc5b86eb8dbabc20d30db9a6b2b03e20b55..9346d5d84b5e63c1ec95984bf202894e671ad9c7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_PropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_PropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractOpticalProperty"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractOpticalProperty"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class AbstractOpticalProperty_PropertyType {
 
-    @XmlElementRef(name = "AbstractOpticalProperty", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class)
+    @XmlElementRef(name = "AbstractOpticalProperty", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class)
     protected JAXBElement abstractOpticalProperty;
 
     /**
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_Type.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_Type.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_Type.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_Type.java
index 11c35069bc38569d11565cc4bc8630bad88d9a6d..b1d110cd5e99601b4bbd040e9342fac839bee742 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractOpticalProperty_Type.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractOpticalProperty_Type.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributePropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributePropertyType.java
index 048845c3d1c16bc0a16603d3de7f183fc1de5b3b..e1f292ecc5b4bb8e5e8664a3844300da7b80af85 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractQualifiedAttribute"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractQualifiedAttribute"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class AbstractQualifiedAttributePropertyType {
 
-    @XmlElementRef(name = "AbstractQualifiedAttribute", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class)
+    @XmlElementRef(name = "AbstractQualifiedAttribute", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class)
     protected JAXBElement abstractQualifiedAttribute;
 
     /**
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributeType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributeType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributeType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributeType.java
index 6dbeb9d93f3c4adf13073cf0a2540e28cfa612dd..e33e3d2837f74ff152243d110f77f61540fe7fd8 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractQualifiedAttributeType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractQualifiedAttributeType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourcePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourcePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourcePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourcePropertyType.java
index 2050e078a3be1222697b6fdfb91d8e622a473d87..742fd6620b639cede9373c03672069467c7c4969 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourcePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourcePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractResource"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractResource"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractResourcePropertyType {
 
-    @XmlElementRef(name = "AbstractResource", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractResource", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractResource;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourceType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourceType.java
index 6585d16897c7b68b56f11553078e4401a75d7929..9be20a4e71d7af7f9298e117438bb67060033e52 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractResourceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractResourceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,12 +30,12 @@ import net.opengis.gml.MeasureType;
  *   <complexContent>
  *     <extension base="{http://www.opengis.net/gml}AbstractFeatureType">
  *       <sequence>
- *         <element name="status" type="{http://www.citygml.org/ade/energy/2.0}ResourceStatusValueType"/>
+ *         <element name="status" type="{http://www.citygml.org/ade/energy/3.0}ResourceStatusValueType"/>
  *         <element name="operationType" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="amountType" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="year" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="amount" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
- *         <element name="timeDependentAmount" type="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
+ *         <element name="timeDependentAmount" type="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
  *         <element name="isAmountNormalized" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="normalizationValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
  *         <element name="normalizationParameter" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSchedulePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSchedulePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSchedulePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSchedulePropertyType.java
index 9bb4442940ddbbacbbf0e04955a8282f2cee76cb..a58229ad04c027f33b085f16c9f5ca6f7ea9db61 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSchedulePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSchedulePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractSchedule"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractSchedule"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractSchedulePropertyType {
 
-    @XmlElementRef(name = "AbstractSchedule", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractSchedule", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractSchedule;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractScheduleType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractScheduleType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractScheduleType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractScheduleType.java
index 0afe1af2cb1ce0a0af49be6cf170396ebe508c55..cd9b1980c089062df330bd7d6e58094ebfc21f7b 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractScheduleType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractScheduleType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorPropertyType.java
index 78e9c66c2d4454c5ddac3e5f4cbed8decc049c87..946d0570bf50b83b757779b364cec87e072092e0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollector"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollector"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractSolarCollectorPropertyType {
 
-    @XmlElementRef(name = "AbstractSolarCollector", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractSolarCollector", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractSolarCollector;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorType.java
index df5de07dedfebe209a1f198a92620c1254b72f40..9e69525e2519ccb7e09ec45b4c413f2b844b1b91 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractSolarCollectorType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractSolarCollectorType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,7 +25,7 @@ import net.opengis.gml.MultiSurfacePropertyType;
  * 
  * <complexType name="AbstractSolarCollectorType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="moduleArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/>
  *         <element name="apertureArea" type="{http://www.opengis.net/gml}AreaType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZonePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZonePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZonePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZonePropertyType.java
index 002e0252a0008c4e194017d111695564157d2c95..899826be33112ac835249fec4f1b3cfe26af8035 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZonePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZonePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractThermalZone"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractThermalZone"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractThermalZonePropertyType {
 
-    @XmlElementRef(name = "AbstractThermalZone", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractThermalZone", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractThermalZone;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZoneType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZoneType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZoneType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZoneType.java
index 73fcc7d15baba6b4a06a96a203406b02aa7e01b5..b22dd8a466f100d4f0b98bff9f5f3d7c9ac2d7b0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractThermalZoneType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractThermalZoneType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="AbstractThermalZoneType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartitionType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartitionType">
  *       <sequence>
- *         <element name="usageZone" type="{http://www.citygml.org/ade/energy/2.0}AbstractUsageZonePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="usageZone" type="{http://www.citygml.org/ade/energy/3.0}AbstractUsageZonePropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesPropertyType.java
index 3380fa1d75cf60bf40d53ebff132c57016dab7e4..f75d475a4e28d7d46804479e8422d801c07cf0b0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeries"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeries"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractTimeSeriesPropertyType {
 
-    @XmlElementRef(name = "AbstractTimeSeries", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractTimeSeries", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractTimeSeries;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesType.java
index 564fc03f4da8e1634862d037966946ca05acc4b7..4e9494f545161ad4ef52028e94fabc4be825e2e6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractTimeSeriesType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractTimeSeriesType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import net.opengis.gml.CodeType;
  *     <extension base="{http://www.opengis.net/gml}AbstractFeatureType">
  *       <sequence>
  *         <element name="acquisitionMethod" type="{http://www.opengis.net/gml}CodeType"/>
- *         <element name="interpolationType" type="{http://www.citygml.org/ade/energy/2.0}InterpolationTypeValueType"/>
+ *         <element name="interpolationType" type="{http://www.citygml.org/ade/energy/3.0}InterpolationTypeValueType"/>
  *         <element name="source" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZonePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZonePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZonePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZonePropertyType.java
index 82fc1d1d34a6aebf17d83f36cd84d98d01a5bdb0..9ee2114a81fd390a1996e1d73eed2efbce413463 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZonePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZonePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -30,7 +30,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AbstractUsageZone"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AbstractUsageZone"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
@@ -46,7 +46,7 @@ import org.w3._1999.xlink.TypeType;
 })
 public class AbstractUsageZonePropertyType {
 
-    @XmlElementRef(name = "AbstractUsageZone", namespace = "http://www.citygml.org/ade/energy/2.0", type = JAXBElement.class, required = false)
+    @XmlElementRef(name = "AbstractUsageZone", namespace = "http://www.citygml.org/ade/energy/3.0", type = JAXBElement.class, required = false)
     protected JAXBElement abstractUsageZone;
     @XmlAttribute(name = "remoteSchema", namespace = "http://www.opengis.net/gml")
     @XmlSchemaType(name = "anyURI")
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZoneType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZoneType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZoneType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZoneType.java
index ed2b9e9ca5daa7c59fdfacc25ca9b90d814feb34..75207c62b9eb40ece578d704408273d5dec3cfb7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AbstractUsageZoneType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AbstractUsageZoneType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="AbstractUsageZoneType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingPartitionType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingPartitionType">
  *       <sequence>
- *         <element name="buildingUnit" type="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingUnitPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="buildingUnit" type="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnitPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AtomicSchedulePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AtomicSchedulePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AtomicSchedulePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AtomicSchedulePropertyType.java
index ac54ec0af558835760e45eb4c994f4299e879982..8c441db22d60c2c13f727213855f16220fd9148b 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AtomicSchedulePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AtomicSchedulePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AtomicSchedule"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AtomicSchedule"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AtomicScheduleType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AtomicScheduleType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AtomicScheduleType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AtomicScheduleType.java
index 7a63ef27ecfe3683c96b7d00e5fff0c75d2f4e17..8949ea978c809e054c7e6070dd6528da482c2042 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AtomicScheduleType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AtomicScheduleType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -22,10 +22,10 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="AtomicScheduleType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractScheduleType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractScheduleType">
  *       <sequence>
  *         <element name="constantValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
- *         <element name="timeSeries" type="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
+ *         <element name="timeSeries" type="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfacePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfacePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfacePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfacePropertyType.java
index 0ac0d13007fffbc39a6fa6ef490d2f9d2feabaca..e7e4b5398fd357dccc53015bba310ac5d9c50882 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfacePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfacePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}AtticFloorSurface"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}AtticFloorSurface"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfaceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfaceType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfaceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfaceType.java
index c9b1658ac8776086b9365241183a86e26653bc51..1881a90d84cbfaab2dfa6703815a73cbd9174171 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/AtticFloorSurfaceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/AtticFloorSurfaceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfacePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfacePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfacePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfacePropertyType.java
index a52d0cd7661adc56a4f487afea75c6e7a1693fc4..b7bf0cb53a2c0f685f262122207ae05e3aaa5f7c 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfacePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfacePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}BasementCeilingSurface"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}BasementCeilingSurface"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfaceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfaceType.java
similarity index 93%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfaceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfaceType.java
index 4ed3122481fef8b401333a26bb54958ebfc67d61..acd0218b8cb56e16329134a97a2664ddba53b34a 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BasementCeilingSurfaceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BasementCeilingSurfaceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BoilerPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BoilerPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BoilerPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BoilerPropertyType.java
index 4380d743c7a0e3d1abeed262786d92d3401ee875..bc47f58653d0620113aed4dee03373160ee22e1a 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BoilerPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BoilerPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Boiler"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Boiler"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BoilerType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BoilerType.java
similarity index 90%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BoilerType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BoilerType.java
index ddcc82f8c0e839107072364f2abf8089f1f9680f..a1867ae936af6e2eb35c54afc8f09183ce627375 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BoilerType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BoilerType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="BoilerType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="hasCondensation" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *       </sequence>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitPropertyType.java
index 480e6eceb444a75736c21b229d9c388b7b1f8d7f..070403e75c0c5888b8fcedb1ea40f4cb19245a0d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}BuildingUnit"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}BuildingUnit"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitType.java
index 3e7b72a0a0a91d32824ea982dd08d4d19a93c13b..3aff5d0b0a9d8238ae4f0c0f4ea35e8e654949bd 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/BuildingUnitType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/BuildingUnitType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -27,16 +27,16 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="BuildingUnitType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractBuildingUnitType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractBuildingUnitType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="numberOfRooms" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="ownerName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="ownershipType" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="address" type="{http://www.opengis.net/citygml/2.0}AddressPropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="energyPerformanceCertificate" type="{http://www.citygml.org/ade/energy/2.0}EnergyPerformanceCertificatePropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="refurbishmentMeasure" type="{http://www.citygml.org/ade/energy/2.0}RefurbishmentMeasurePropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="occupiedBy" type="{http://www.citygml.org/ade/energy/2.0}OccupantsPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="energyPerformanceCertificate" type="{http://www.citygml.org/ade/energy/3.0}EnergyPerformanceCertificatePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="refurbishmentMeasure" type="{http://www.citygml.org/ade/energy/3.0}RefurbishmentMeasurePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="occupiedBy" type="{http://www.citygml.org/ade/energy/3.0}OccupantsPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationPropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationPropertyType.java
index 5dae28ccf0e62d8c79499f0be3ccf4d2d9083f61..9eb235b4755bc6cb0272a6ad19045f367e71bcc3 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}CityObjectRelation" minOccurs="0"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}CityObjectRelation" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationType.java
index 0a32afddcd46e3d33c4959f4640483adf76efa1f..9665a6edf80414b6c8b523d603110601ea14dc2a 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/CityObjectRelationType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/CityObjectRelationType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -26,7 +26,7 @@ import net.opengis.gml.CodeType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="relationType" type="{http://www.opengis.net/gml}CodeType"/>
- *         <element name="relatedTo" type="{http://www.citygml.org/ade/energy/2.0}RelatedToPropertyType"/>
+ *         <element name="relatedTo" type="{http://www.citygml.org/ade/energy/3.0}RelatedToPropertyType"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/CompositeSchedulePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/CompositeSchedulePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/CompositeSchedulePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/CompositeSchedulePropertyType.java
index fb3c802fc55abbab379bd12eb33c39dba04d53c8..99c6f961ed338c720c9c3785ab05ec65d50eba9d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/CompositeSchedulePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/CompositeSchedulePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}CompositeSchedule"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}CompositeSchedule"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/CompositeScheduleType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/CompositeScheduleType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/CompositeScheduleType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/CompositeScheduleType.java
index 6ab815b1e85f75db183501c843d0626aacdfc980..d095289534b28cab50ad43371c7e0df665ba93fd 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/CompositeScheduleType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/CompositeScheduleType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="CompositeScheduleType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractScheduleType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractScheduleType">
  *       <sequence>
- *         <element name="scheduleComponent" type="{http://www.citygml.org/ade/energy/2.0}ScheduleComponentPropertyType" maxOccurs="unbounded"/>
+ *         <element name="scheduleComponent" type="{http://www.citygml.org/ade/energy/3.0}ScheduleComponentPropertyType" maxOccurs="unbounded"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialPropertyType.java
index 0950f8c5b1661b5c1cd07589883ffdaefa5e51ef..8f08af72c4af25da4805a8a7a3434bfe217d72f0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ConstructionMaterial"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ConstructionMaterial"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialType.java
index 27fa5cae60d080af701a9f4a00eedd8121274530..ee2f2537d8316603a591f65028934079c13ca56e 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ConstructionMaterialType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ConstructionMaterialType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="ConstructionMaterialType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationPropertyType.java
index 43fcbc47ac6501d88f3f6673e042b116f91961a5..c2d37fc37b236358676f1e25137c5e15c6b7b5e1 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}DeviceOperation"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}DeviceOperation"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationType.java
index 57f25eb43e37c80ed298df5f4f49c0d2d2208e8c..8a5421227bb8ea8860059a7d7997c9987d52adb0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/DeviceOperationType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/DeviceOperationType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -28,7 +28,7 @@ import net.opengis.gml.CodeType;
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="yearlyGlobalEfficiency" type="{http://www.w3.org/2001/XMLSchema}double" minOccurs="0"/>
- *         <element name="schedule" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="schedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/DualValueSchedulePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/DualValueSchedulePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/DualValueSchedulePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/DualValueSchedulePropertyType.java
index 5ebad2719220ecf7397431e282c42154682d2175..4d6c80e6450142967f5a8de872a40cbf65580484 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/DualValueSchedulePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/DualValueSchedulePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}DualValueSchedule"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}DualValueSchedule"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/DualValueScheduleType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/DualValueScheduleType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/DualValueScheduleType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/DualValueScheduleType.java
index f6bf801312079d07b07512b3454c4453accbeabf..d66f016d21b92f564e9718cde5c93c616ad6de18 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/DualValueScheduleType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/DualValueScheduleType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,7 +25,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="DualValueScheduleType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractScheduleType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractScheduleType">
  *       <sequence>
  *         <element name="idleValue" type="{http://www.opengis.net/gml}MeasureType"/>
  *         <element name="usageValue" type="{http://www.opengis.net/gml}MeasureType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDevicePropertyType.java
index 6fcb194a48b50a9183b2ff15e18cba537bea4e06..13a2581951c62a46bcfbd87050e8a23f8d4018cc 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ElectricalStorageDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ElectricalStorageDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDeviceType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDeviceType.java
index e72926c7c9f7aef4e830b362a8194c5264c289c1..2331c20ec1ffc1eb75e4132cdd83f1d12fc0665b 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ElectricalStorageDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ElectricalStorageDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="ElectricalStorageDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="batteryTechnology" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="powerCapacity" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityPropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityPropertyType.java
index f042c0e5533b9877fa5efec81e3294cfba856575..6a204d72856de8601063f603aca442cee4c6116e 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Emissivity"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Emissivity"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityType.java
similarity index 90%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityType.java
index ef1768f5f241635e1c41008bebb9476de8da8fe8..2c7a626fec02d0a3694654e20e35980f8ca78f98 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EmissivityType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EmissivityType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="EmissivityType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractOpticalProperty_Type">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractOpticalProperty_Type">
  *       <sequence>
- *         <element name="surface" type="{http://www.citygml.org/ade/energy/2.0}SurfaceSideType"/>
+ *         <element name="surface" type="{http://www.citygml.org/ade/energy/3.0}SurfaceSideType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificatePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificatePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificatePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificatePropertyType.java
index bd4a9a67fcbd9f8f969d7a3952e909d82b2bc8c9..5f7c42e9ce349cacf375b669dce8cc6d1355c253 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificatePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificatePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}EnergyPerformanceCertificate"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}EnergyPerformanceCertificate"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificateType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificateType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificateType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificateType.java
index 91f01ce746a2b9852c44b07d68e6bbda12ef1134..afe80c15764ae12167031fb4bf2cb12d7021532f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPerformanceCertificateType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPerformanceCertificateType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPropertyType.java
index e3724897107bc2c5361a4ca73f069804355ad90c..0d6b4ff6cef965a6138519f0f42627d7d9750aa9 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Energy"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Energy"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/EnergyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/EnergyType.java
index 2fef01d47bc373b38baea85e87f0499581084f68..350867d534b42a985e0729cea891331c97612773 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/EnergyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/EnergyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="EnergyType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/FoodPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/FoodPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/FoodPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/FoodPropertyType.java
index 2831002dfa21fede9d794b052c866d99c9f5e5f4..70153e7b8368b16e29b2e7ddabdd2805c20873ae 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/FoodPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/FoodPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Food"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Food"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/FoodType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/FoodType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/FoodType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/FoodType.java
index 6c375b3f80df4692bb50ce62f5afdb5b37f5b0dc..26ee90413a59ccfc0868b61c8bf76620e3a57bb0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/FoodType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/FoodType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="FoodType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GasPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GasPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GasPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GasPropertyType.java
index f22d7ccbc428268ae45150a032bc87af7215fbe6..406f4f7b0d67df0a9f58537e2938493fbae006ff 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GasPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GasPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Gas"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Gas"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GasType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GasType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GasType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GasType.java
index ec4c3ed89116ace93c5ad3a871d16a3cbae5e940..7a6d6e8c014de382b1e9d0925771453ca235c8f7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GasType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GasType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="GasType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialType">
  *       <sequence>
  *         <element name="isVentilated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="rValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericDevicePropertyType.java
index 292ac158284e9a7f61004624afdba7646f28c811..61239932e88c8309922b68dbe50579142ea2f193 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}GenericDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}GenericDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericDeviceType.java
similarity index 86%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericDeviceType.java
index 5fb7627b66dc90f7f4569b16137c2f1816fac458..cbc19dcd12ab03a16f82898e2f4a54c71a54d677 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="GenericDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDevicePropertyType.java
index 7d44c5866c8f0508094a1c8500620c417fcc693d..39ff3bdb2021a6320860ccb0d792b3f82d638fbf 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}GenericElectricalDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}GenericElectricalDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDeviceType.java
similarity index 86%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDeviceType.java
index 1397a0420eb44262b73e4d5fe845d7c1b7f7389d..1230dac2987faf79fde1ef7b3a2f96d2eeccecca 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericElectricalDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericElectricalDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="GenericElectricalDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorPropertyType.java
index 1019e16f557871bf5d90ae2c5d113f01cbb25f20..a04b8c7dec652d4bdd9ad394d771663e92d1d75d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}GenericSolarCollector"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}GenericSolarCollector"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorType.java
similarity index 87%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorType.java
index 848cc40f4548394b6f20f0dafe97a23bf4bf574a..6ceb543c4515a20eda43105385d4845dfab90162 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/GenericSolarCollectorType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/GenericSolarCollectorType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="GenericSolarCollectorType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollectorType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollectorType">
  *       <sequence>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpPropertyType.java
index 23b061e203070c29b56febc745453d16678e3b91..eb8f3753c1a857956323508b2b94286f4b2263e2 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}HeatPump"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}HeatPump"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpType.java
index f428e7a50a7ea01f1c04f6d4f21512180d7413fd..7cb820961c8e0cf7793c4acc0b69f3244d9c5050 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/HeatPumpType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/HeatPumpType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="HeatPumpType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="heatSource" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="copSourceTemperature" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfacePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfacePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfacePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfacePropertyType.java
index 3940d675ff8bd05d2bd7bc8ef024495f9483482e..94f3427d8b6637325acc0559b28165c872c4492e 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfacePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfacePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}IntermediateFloorSurface"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}IntermediateFloorSurface"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfaceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfaceType.java
similarity index 93%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfaceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfaceType.java
index 307f48dc4e5154dc275f43a79107496e3c4292d6..8dec32270a30d47a9ca9b8a48894826676960a13 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/IntermediateFloorSurfaceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/IntermediateFloorSurfaceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/InterpolationTypeValueType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/InterpolationTypeValueType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/InterpolationTypeValueType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/InterpolationTypeValueType.java
index 9293ab5e4a4f534ad4eabb8b19d56f6e8335b796..b96d51d111ee42a5b46977bda0b7730a9ab7e9c8 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/InterpolationTypeValueType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/InterpolationTypeValueType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayerPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayerPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayerPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayerPropertyType.java
index c6c88b1242ad59ba427c7e61f99b65105ee886b4..67a65acd2840873ea17e63f9a0183ebd541c9d29 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayerPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayerPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Layer"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Layer"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayerType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayerType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayerType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayerType.java
index 4289cf42993b09070ebd42f2680c9d22ad0de0aa..a8f3856ef06ec834119708673156d7e7dbe435e0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayerType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayerType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -27,7 +27,7 @@ import net.opengis.gml.MeasureType;
  *     <extension base="{http://www.opengis.net/gml}AbstractFeatureType">
  *       <sequence>
  *         <element name="thickness" type="{http://www.opengis.net/gml}MeasureType"/>
- *         <element name="material" type="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialPropertyType"/>
+ *         <element name="material" type="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialPropertyType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryPropertyType.java
index 3636d9297d3e18a2174bd3d7d4a32e3288efe4b5..9b99ee654f4ba79df08635d3735980154e0a2460 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}LayeredConstructionLibrary"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}LayeredConstructionLibrary"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryType.java
index ece6ba1b79157383fa54790d8b51f7ff1816e0da..a8737a26e8d6d3dec5e55d2f5e3a3067dbbbc2e5 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionLibraryType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionLibraryType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="LayeredConstructionLibraryType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractLibraryType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractLibraryType">
  *       <sequence>
- *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/2.0}AbstractLayeredConstructionPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/3.0}AbstractLayeredConstructionPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionPropertyType.java
index 5943c29ba7d9fdd135eeb58bf50fac878216e648..79d5d3480ed361f5a0e7ce7949e31f394d16bad0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}LayeredConstruction"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}LayeredConstruction"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionType.java
index 910c5e75325181cd4cf10eb46dce7290c1fbc528..5b22f7bc975a000036cca95f0a146bcfdea86de6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LayeredConstructionType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LayeredConstructionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,16 +26,16 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="LayeredConstructionType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractLayeredConstructionType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractLayeredConstructionType">
  *       <sequence>
  *         <element name="libraryCode" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="uValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
  *         <element name="gValue" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="glazingRatio" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="emissivity" type="{http://www.citygml.org/ade/energy/2.0}EmissivityPropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="reflectance" type="{http://www.citygml.org/ade/energy/2.0}ReflectancePropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="transmittance" type="{http://www.citygml.org/ade/energy/2.0}TransmittancePropertyType" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="layer" type="{http://www.citygml.org/ade/energy/2.0}LayerPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="emissivity" type="{http://www.citygml.org/ade/energy/3.0}EmissivityPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="reflectance" type="{http://www.citygml.org/ade/energy/3.0}ReflectancePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="transmittance" type="{http://www.citygml.org/ade/energy/3.0}TransmittancePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="layer" type="{http://www.citygml.org/ade/energy/3.0}LayerPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LightingDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LightingDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LightingDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LightingDevicePropertyType.java
index c3365aa035ba3763f8cfc313d42882c64ccf2a4a..3057c2ec0be8a1ef7be4d8e2260b995c391a3c48 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LightingDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LightingDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}LightingDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}LightingDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/LightingDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/LightingDeviceType.java
similarity index 86%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/LightingDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/LightingDeviceType.java
index 655e3a57200984773845a677b2d113bbc75c9fea..98a787fd9f83e2dbe2527157a79d18c39a817916 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/LightingDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/LightingDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -21,7 +21,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="LightingDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryPropertyType.java
index 052f22da2690b4ca56fdce7f2d0d2a8cbb9bfa93..a48b263605716e0e11de94420d8d9498588de098 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}MaterialLibrary"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}MaterialLibrary"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryType.java
index ee86fbb13eb32a7cb083b1ce95f83504d40d8edb..d5a3cc96508ac067a81458101de1da67d533bd6c 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/MaterialLibraryType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/MaterialLibraryType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="MaterialLibraryType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractLibraryType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractLibraryType">
  *       <sequence>
- *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDevicePropertyType.java
index 12684805acaff106a5b1ac666c08570579538f40..44e139dab05e5ac98e71ca6e13eac868af90c67d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}MovableShadingDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}MovableShadingDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDeviceType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/MovableShadingDeviceType.java
index 9d94a1d4f513f75f43fd8f8ced3e080bb119eb22..85649f2db048cb8c9ea7f5b4e5349bbc1368bf8f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/MovableShadingDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,12 +25,12 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="MovableShadingDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
- *         <element name="installationSide" type="{http://www.citygml.org/ade/energy/2.0}SurfaceSideType"/>
+ *         <element name="installationSide" type="{http://www.citygml.org/ade/energy/3.0}SurfaceSideType"/>
  *         <element name="maximumCoverRatio" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="transmittance" type="{http://www.citygml.org/ade/energy/2.0}TransmittancePropertyType" minOccurs="0"/>
+ *         <element name="transmittance" type="{http://www.citygml.org/ade/energy/3.0}TransmittancePropertyType" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/NetworkConnectionStatusValueType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/NetworkConnectionStatusValueType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/NetworkConnectionStatusValueType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/NetworkConnectionStatusValueType.java
index 112988b7671f60bc0f6781ec98be88ea99dab989..1bb322052cc7eae3b428a6dc2e994dac2428f2b1 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/NetworkConnectionStatusValueType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ObjectFactory.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ObjectFactory.java
similarity index 87%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ObjectFactory.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ObjectFactory.java
index 4452a9ef89ff370f93321bd3995089e5d4a2fb57..691ff4103bc8fdc8f6fb9623c91b343dfcc5abcb 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ObjectFactory.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ObjectFactory.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
@@ -24,7 +24,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.energyADE2beta7 package. 
+ * generated in the org.sig3d.citygml.energyADE3beta7 package. 
  * 
An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -38,118 +38,118 @@ import net.opengis.gml.ScaleType;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _AbstractOpticalProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractOpticalProperty");
-    private final static QName _Emissivity_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Emissivity");
-    private final static QName _Reflectance_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Reflectance");
-    private final static QName _Transmittance_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Transmittance");
-    private final static QName _AbstractQualifiedAttribute_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractQualifiedAttribute");
-    private final static QName _QualifiedArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "QualifiedArea");
-    private final static QName _QualifiedHeight_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "QualifiedHeight");
-    private final static QName _QualifiedVolume_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "QualifiedVolume");
-    private final static QName _SuitabilityProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Suitability");
-    private final static QName _AbstractTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractTimeSeries");
-    private final static QName _RegularTimeSeriesProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "RegularTimeSeries");
-    private final static QName _RegularTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "RegularTimeSeriesFile");
-    private final static QName _TypicalValuesTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "TypicalValuesTimeSeries");
-    private final static QName _TypicalValuesTimeSeriesFile_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "TypicalValuesTimeSeriesFile");
-    private final static QName _SensorConnection_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "SensorConnection");
-    private final static QName _AbstractSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractSchedule");
-    private final static QName _DualValueSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "DualValueSchedule");
-    private final static QName _AtomicSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AtomicSchedule");
-    private final static QName _CompositeSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "CompositeSchedule");
-    private final static QName _ScheduleComponent_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ScheduleComponent");
-    private final static QName _ScheduleLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ScheduleLibrary");
-    private final static QName _AbstractLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractLibrary");
-    private final static QName _AbstractBuildingPartition_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractBuildingPartition");
-    private final static QName _AbstractBuildingUnit_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractBuildingUnit");
-    private final static QName _AbstractDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractDevice");
-    private final static QName _AbstractLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractLayeredConstruction");
-    private final static QName _AbstractResource_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractResource");
-    private final static QName _AbstractThermalZone_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractThermalZone");
-    private final static QName _AbstractUsageZone_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractUsageZone");
-    private final static QName _EnergyPerformanceCertificate_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "EnergyPerformanceCertificate");
-    private final static QName _RefurbishmentMeasure_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "RefurbishmentMeasure");
-    private final static QName _UtilityNetworkConnection_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "UtilityNetworkConnection");
-    private final static QName _WeatherData_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "WeatherData");
-    private final static QName _BdgAtticThermalStatus_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgAtticThermalStatus");
-    private final static QName _BdgBasementThermalStatus_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBasementThermalStatus");
-    private final static QName _BdgConstructionWeight_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgConstructionWeight");
-    private final static QName _BdgArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgArea");
-    private final static QName _BdgHeight_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgHeight");
-    private final static QName _BdgVolume_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgVolume");
-    private final static QName _BdgIsProtected_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgIsProtected");
-    private final static QName _BdgType_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgType");
-    private final static QName _BuildingUnitProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "buildingUnit");
-    private final static QName _EnergyPerformanceCertificateProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "energyPerformanceCertificate");
-    private final static QName _RefurbishmentMeasureProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "refurbishmentMeasure");
-    private final static QName _ThermalZoneProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "thermalZone");
-    private final static QName _UsageZoneProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "usageZone");
-    private final static QName _CityObjectRelation_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "CityObjectRelation");
-    private final static QName _RelatedTo_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "relatedTo");
-    private final static QName _Device_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "device");
-    private final static QName _LayeredConstructionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "layeredConstruction");
-    private final static QName _Resource_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "resource");
-    private final static QName _Suitability_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "suitability");
-    private final static QName _UtilityNetworkConnectionProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "utilityNetworkConnection");
-    private final static QName _WeatherDataProperty_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "weatherData");
-    private final static QName _ReferencePoint_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "referencePoint");
-    private final static QName _ConstructionMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ConstructionMaterial");
-    private final static QName _Energy_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Energy");
-    private final static QName _Food_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Food");
-    private final static QName _OtherResource_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "OtherResource");
-    private final static QName _UrbanSpace_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "UrbanSpace");
-    private final static QName _Waste_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Waste");
-    private final static QName _Water_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Water");
-    private final static QName _AbstractMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractMaterial");
-    private final static QName _Gas_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Gas");
-    private final static QName _LayeredConstructionLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "LayeredConstructionLibrary");
-    private final static QName _Layer_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Layer");
-    private final static QName _LayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "LayeredConstruction");
-    private final static QName _MaterialLibrary_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "MaterialLibrary");
-    private final static QName _ReverseLayeredConstruction_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ReverseLayeredConstruction");
-    private final static QName _SolidMaterial_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "SolidMaterial");
-    private final static QName _AtticFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AtticFloorSurface");
-    private final static QName _BasementCeilingSurface_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "BasementCeilingSurface");
-    private final static QName _IntermediateFloorSurface_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "IntermediateFloorSurface");
-    private final static QName _PartyWallSurface_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "PartyWallSurface");
-    private final static QName _ThermalZone_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ThermalZone");
-    private final static QName _BdgBdrySurfAzimuth_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfAzimuth");
-    private final static QName _BdgBdrySurfGroundViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfGroundViewFactor");
-    private final static QName _BdgBdrySurfHeatCapacity_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfHeatCapacity");
-    private final static QName _BdgBdrySurfInclination_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfInclination");
-    private final static QName _BdgBdrySurfIsAdiabatic_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfIsAdiabatic");
-    private final static QName _BdgBdrySurfOpaqueSurfaceArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfOpaqueSurfaceArea");
-    private final static QName _BdgBdrySurfOpeningToSurfaceRatio_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfOpeningToSurfaceRatio");
-    private final static QName _BdgBdrySurfSkyViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfSkyViewFactor");
-    private final static QName _BdgBdrySurfThickness_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfThickness");
-    private final static QName _BdgBdrySurfTotalSurfaceArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgBdrySurfTotalSurfaceArea");
-    private final static QName _BdgOpnArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgOpnArea");
-    private final static QName _BdgOpnAzimuth_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgOpnAzimuth");
-    private final static QName _BdgOpnGroundViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgOpnGroundViewFactor");
-    private final static QName _BdgOpnInclination_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgOpnInclination");
-    private final static QName _BdgOpnSkyViewFactor_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "bdgOpnSkyViewFactor");
-    private final static QName _BuildingUnit_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "BuildingUnit");
-    private final static QName _Occupants_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Occupants");
-    private final static QName _UsageZone_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "UsageZone");
-    private final static QName _AbstractSolarCollector_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "AbstractSolarCollector");
-    private final static QName _Boiler_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "Boiler");
-    private final static QName _DeviceOperation_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "DeviceOperation");
-    private final static QName _ElectricalStorageDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ElectricalStorageDevice");
-    private final static QName _GenericDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "GenericDevice");
-    private final static QName _GenericElectricalDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "GenericElectricalDevice");
-    private final static QName _GenericSolarCollector_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "GenericSolarCollector");
-    private final static QName _HeatPump_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "HeatPump");
-    private final static QName _LightingDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "LightingDevice");
-    private final static QName _MovableShadingDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "MovableShadingDevice");
-    private final static QName _PhotovoltaicCollector_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "PhotovoltaicCollector");
-    private final static QName _PhotovoltaicThermalCollector_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "PhotovoltaicThermalCollector");
-    private final static QName _SolarThermalCollector_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "SolarThermalCollector");
-    private final static QName _ThermalStorageDevice_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "ThermalStorageDevice");
-    private final static QName _UrbanFunctionArea_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "UrbanFunctionArea");
-    private final static QName _WeatherStation_QNAME = new QName("http://www.citygml.org/ade/energy/2.0", "WeatherStation");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.sig3d.citygml.energyADE2beta7
+    private final static QName _AbstractOpticalProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractOpticalProperty");
+    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");
+    private final static QName _AbstractQualifiedAttribute_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractQualifiedAttribute");
+    private final static QName _QualifiedArea_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "QualifiedArea");
+    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 _AbstractTimeSeries_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AbstractTimeSeries");
+    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 _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 _AtomicSchedule_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "AtomicSchedule");
+    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 _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 _EnergyPerformanceCertificate_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "EnergyPerformanceCertificate");
+    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 _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 _BuildingUnitProperty_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "buildingUnit");
+    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 _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 _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 _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 _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 _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");
+    private final static QName _PhotovoltaicCollector_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "PhotovoltaicCollector");
+    private final static QName _PhotovoltaicThermalCollector_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "PhotovoltaicThermalCollector");
+    private final static QName _SolarThermalCollector_QNAME = new QName("http://www.citygml.org/ade/energy/3.0", "SolarThermalCollector");
+    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");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.sig3d.citygml.energyADE3beta7
      * 
      */
     public ObjectFactory() {
@@ -1227,7 +1227,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractOpticalProperty_Type }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractOpticalProperty", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractOpticalProperty", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
     public JAXBElement createAbstractOpticalProperty(AbstractOpticalProperty_Type value) {
         return new JAXBElement(_AbstractOpticalProperty_QNAME, AbstractOpticalProperty_Type.class, null, value);
     }
@@ -1240,7 +1240,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link EmissivityType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Emissivity", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractOpticalProperty")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Emissivity", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractOpticalProperty")
     public JAXBElement createEmissivity(EmissivityType value) {
         return new JAXBElement(_Emissivity_QNAME, EmissivityType.class, null, value);
     }
@@ -1253,7 +1253,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ReflectanceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Reflectance", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractOpticalProperty")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Reflectance", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractOpticalProperty")
     public JAXBElement createReflectance(ReflectanceType value) {
         return new JAXBElement(_Reflectance_QNAME, ReflectanceType.class, null, value);
     }
@@ -1266,7 +1266,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link TransmittanceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Transmittance", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractOpticalProperty")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Transmittance", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractOpticalProperty")
     public JAXBElement createTransmittance(TransmittanceType value) {
         return new JAXBElement(_Transmittance_QNAME, TransmittanceType.class, null, value);
     }
@@ -1279,7 +1279,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractQualifiedAttributeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractQualifiedAttribute", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractQualifiedAttribute", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
     public JAXBElement createAbstractQualifiedAttribute(AbstractQualifiedAttributeType value) {
         return new JAXBElement(_AbstractQualifiedAttribute_QNAME, AbstractQualifiedAttributeType.class, null, value);
     }
@@ -1292,7 +1292,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedAreaType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "QualifiedArea", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractQualifiedAttribute")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "QualifiedArea", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractQualifiedAttribute")
     public JAXBElement createQualifiedArea(QualifiedAreaType value) {
         return new JAXBElement(_QualifiedArea_QNAME, QualifiedAreaType.class, null, value);
     }
@@ -1305,7 +1305,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedHeightType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "QualifiedHeight", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractQualifiedAttribute")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "QualifiedHeight", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractQualifiedAttribute")
     public JAXBElement createQualifiedHeight(QualifiedHeightType value) {
         return new JAXBElement(_QualifiedHeight_QNAME, QualifiedHeightType.class, null, value);
     }
@@ -1318,7 +1318,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedVolumeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "QualifiedVolume", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractQualifiedAttribute")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "QualifiedVolume", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractQualifiedAttribute")
     public JAXBElement createQualifiedVolume(QualifiedVolumeType value) {
         return new JAXBElement(_QualifiedVolume_QNAME, QualifiedVolumeType.class, null, value);
     }
@@ -1331,7 +1331,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link SuitabilityType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Suitability", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Suitability", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
     public JAXBElement createSuitabilityProperty(SuitabilityType value) {
         return new JAXBElement(_SuitabilityProperty_QNAME, SuitabilityType.class, null, value);
     }
@@ -1344,7 +1344,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractTimeSeries", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractTimeSeries", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createAbstractTimeSeries(AbstractTimeSeriesType value) {
         return new JAXBElement(_AbstractTimeSeries_QNAME, AbstractTimeSeriesType.class, null, value);
     }
@@ -1357,7 +1357,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "RegularTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractTimeSeries")
+    @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 createRegularTimeSeriesProperty(RegularTimeSeriesType value) {
         return new JAXBElement(_RegularTimeSeriesProperty_QNAME, RegularTimeSeriesType.class, null, value);
     }
@@ -1370,7 +1370,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link RegularTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "RegularTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractTimeSeries")
+    @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 createRegularTimeSeriesFile(RegularTimeSeriesFileType value) {
         return new JAXBElement(_RegularTimeSeriesFile_QNAME, RegularTimeSeriesFileType.class, null, value);
     }
@@ -1383,7 +1383,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "TypicalValuesTimeSeries", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractTimeSeries")
+    @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 createTypicalValuesTimeSeries(TypicalValuesTimeSeriesType value) {
         return new JAXBElement(_TypicalValuesTimeSeries_QNAME, TypicalValuesTimeSeriesType.class, null, value);
     }
@@ -1396,7 +1396,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link TypicalValuesTimeSeriesFileType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "TypicalValuesTimeSeriesFile", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractTimeSeries")
+    @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 createTypicalValuesTimeSeriesFile(TypicalValuesTimeSeriesFileType value) {
         return new JAXBElement(_TypicalValuesTimeSeriesFile_QNAME, TypicalValuesTimeSeriesFileType.class, null, value);
     }
@@ -1409,7 +1409,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link SensorConnectionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "SensorConnection", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractTimeSeries")
+    @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 createSensorConnection(SensorConnectionType value) {
         return new JAXBElement(_SensorConnection_QNAME, SensorConnectionType.class, null, value);
     }
@@ -1422,7 +1422,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractSchedule", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractSchedule", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createAbstractSchedule(AbstractScheduleType value) {
         return new JAXBElement(_AbstractSchedule_QNAME, AbstractScheduleType.class, null, value);
     }
@@ -1435,7 +1435,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link DualValueScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "DualValueSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSchedule")
+    @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 createDualValueSchedule(DualValueScheduleType value) {
         return new JAXBElement(_DualValueSchedule_QNAME, DualValueScheduleType.class, null, value);
     }
@@ -1448,7 +1448,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AtomicScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AtomicSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSchedule")
+    @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 createAtomicSchedule(AtomicScheduleType value) {
         return new JAXBElement(_AtomicSchedule_QNAME, AtomicScheduleType.class, null, value);
     }
@@ -1461,7 +1461,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link CompositeScheduleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "CompositeSchedule", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSchedule")
+    @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 createCompositeSchedule(CompositeScheduleType value) {
         return new JAXBElement(_CompositeSchedule_QNAME, CompositeScheduleType.class, null, value);
     }
@@ -1474,7 +1474,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleComponentType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ScheduleComponent", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ScheduleComponent", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createScheduleComponent(ScheduleComponentType value) {
         return new JAXBElement(_ScheduleComponent_QNAME, ScheduleComponentType.class, null, value);
     }
@@ -1487,7 +1487,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScheduleLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ScheduleLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractLibrary")
+    @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 createScheduleLibrary(ScheduleLibraryType value) {
         return new JAXBElement(_ScheduleLibrary_QNAME, ScheduleLibraryType.class, null, value);
     }
@@ -1500,7 +1500,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractLibrary", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLibrary", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
     public JAXBElement createAbstractLibrary(AbstractLibraryType value) {
         return new JAXBElement(_AbstractLibrary_QNAME, AbstractLibraryType.class, null, value);
     }
@@ -1513,7 +1513,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingPartitionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractBuildingPartition", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractBuildingPartition", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
     public JAXBElement createAbstractBuildingPartition(AbstractBuildingPartitionType value) {
         return new JAXBElement(_AbstractBuildingPartition_QNAME, AbstractBuildingPartitionType.class, null, value);
     }
@@ -1526,7 +1526,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractBuildingUnit", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractBuildingPartition")
+    @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 createAbstractBuildingUnit(AbstractBuildingUnitType value) {
         return new JAXBElement(_AbstractBuildingUnit_QNAME, AbstractBuildingUnitType.class, null, value);
     }
@@ -1539,7 +1539,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractDevice", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractDevice", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
     public JAXBElement createAbstractDevice(AbstractDeviceType value) {
         return new JAXBElement(_AbstractDevice_QNAME, AbstractDeviceType.class, null, value);
     }
@@ -1552,7 +1552,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractLayeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractLayeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createAbstractLayeredConstruction(AbstractLayeredConstructionType value) {
         return new JAXBElement(_AbstractLayeredConstruction_QNAME, AbstractLayeredConstructionType.class, null, value);
     }
@@ -1565,7 +1565,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractResource", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractResource", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createAbstractResource(AbstractResourceType value) {
         return new JAXBElement(_AbstractResource_QNAME, AbstractResourceType.class, null, value);
     }
@@ -1578,7 +1578,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractThermalZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractThermalZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractBuildingPartition")
+    @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 createAbstractThermalZone(AbstractThermalZoneType value) {
         return new JAXBElement(_AbstractThermalZone_QNAME, AbstractThermalZoneType.class, null, value);
     }
@@ -1591,7 +1591,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractUsageZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractUsageZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractBuildingPartition")
+    @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 createAbstractUsageZone(AbstractUsageZoneType value) {
         return new JAXBElement(_AbstractUsageZone_QNAME, AbstractUsageZoneType.class, null, value);
     }
@@ -1604,7 +1604,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificateType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "EnergyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "EnergyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createEnergyPerformanceCertificate(EnergyPerformanceCertificateType value) {
         return new JAXBElement(_EnergyPerformanceCertificate_QNAME, EnergyPerformanceCertificateType.class, null, value);
     }
@@ -1617,7 +1617,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "RefurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "RefurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createRefurbishmentMeasure(RefurbishmentMeasureType value) {
         return new JAXBElement(_RefurbishmentMeasure_QNAME, RefurbishmentMeasureType.class, null, value);
     }
@@ -1630,7 +1630,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "UtilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UtilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createUtilityNetworkConnection(UtilityNetworkConnectionType value) {
         return new JAXBElement(_UtilityNetworkConnection_QNAME, UtilityNetworkConnectionType.class, null, value);
     }
@@ -1643,7 +1643,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link WeatherDataType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "WeatherData", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "WeatherData", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createWeatherData(WeatherDataType value) {
         return new JAXBElement(_WeatherData_QNAME, WeatherDataType.class, null, value);
     }
@@ -1656,7 +1656,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgAtticThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgAtticThermalStatus(ThermalStatusValueType value) {
         return new JAXBElement(_BdgAtticThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
     }
@@ -1669,7 +1669,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStatusValueType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBasementThermalStatus", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgBasementThermalStatus(ThermalStatusValueType value) {
         return new JAXBElement(_BdgBasementThermalStatus_QNAME, ThermalStatusValueType.class, null, value);
     }
@@ -1682,7 +1682,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgConstructionWeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgConstructionWeight(CodeType value) {
         return new JAXBElement(_BdgConstructionWeight_QNAME, CodeType.class, null, value);
     }
@@ -1695,7 +1695,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedAreaPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgArea(QualifiedAreaPropertyType value) {
         return new JAXBElement(_BdgArea_QNAME, QualifiedAreaPropertyType.class, null, value);
     }
@@ -1708,7 +1708,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedHeightPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgHeight", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgHeight(QualifiedHeightPropertyType value) {
         return new JAXBElement(_BdgHeight_QNAME, QualifiedHeightPropertyType.class, null, value);
     }
@@ -1721,7 +1721,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link QualifiedVolumePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgVolume", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgVolume(QualifiedVolumePropertyType value) {
         return new JAXBElement(_BdgVolume_QNAME, QualifiedVolumePropertyType.class, null, value);
     }
@@ -1734,7 +1734,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgIsProtected", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgIsProtected(Boolean value) {
         return new JAXBElement(_BdgIsProtected_QNAME, Boolean.class, null, value);
     }
@@ -1747,7 +1747,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link CodeType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgType", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBdgType(CodeType value) {
         return new JAXBElement(_BdgType_QNAME, CodeType.class, null, value);
     }
@@ -1760,7 +1760,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractBuildingUnitPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "buildingUnit", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createBuildingUnitProperty(AbstractBuildingUnitPropertyType value) {
         return new JAXBElement(_BuildingUnitProperty_QNAME, AbstractBuildingUnitPropertyType.class, null, value);
     }
@@ -1773,7 +1773,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link EnergyPerformanceCertificatePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "energyPerformanceCertificate", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createEnergyPerformanceCertificateProperty(EnergyPerformanceCertificatePropertyType value) {
         return new JAXBElement(_EnergyPerformanceCertificateProperty_QNAME, EnergyPerformanceCertificatePropertyType.class, null, value);
     }
@@ -1786,7 +1786,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link RefurbishmentMeasurePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "refurbishmentMeasure", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createRefurbishmentMeasureProperty(RefurbishmentMeasurePropertyType value) {
         return new JAXBElement(_RefurbishmentMeasureProperty_QNAME, RefurbishmentMeasurePropertyType.class, null, value);
     }
@@ -1799,7 +1799,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractThermalZonePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "thermalZone", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createThermalZoneProperty(AbstractThermalZonePropertyType value) {
         return new JAXBElement(_ThermalZoneProperty_QNAME, AbstractThermalZonePropertyType.class, null, value);
     }
@@ -1812,7 +1812,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractUsageZonePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "usageZone", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfAbstractBuilding")
+    @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 createUsageZoneProperty(AbstractUsageZonePropertyType value) {
         return new JAXBElement(_UsageZoneProperty_QNAME, AbstractUsageZonePropertyType.class, null, value);
     }
@@ -1825,7 +1825,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "CityObjectRelation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "CityObjectRelation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Object")
     public JAXBElement createCityObjectRelation(CityObjectRelationType value) {
         return new JAXBElement(_CityObjectRelation_QNAME, CityObjectRelationType.class, null, value);
     }
@@ -1838,7 +1838,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link CityObjectRelationPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "relatedTo", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "relatedTo", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createRelatedTo(CityObjectRelationPropertyType value) {
         return new JAXBElement(_RelatedTo_QNAME, CityObjectRelationPropertyType.class, null, value);
     }
@@ -1851,7 +1851,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractDevicePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "device", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "device", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createDevice(AbstractDevicePropertyType value) {
         return new JAXBElement(_Device_QNAME, AbstractDevicePropertyType.class, null, value);
     }
@@ -1864,7 +1864,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractLayeredConstructionPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "layeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "layeredConstruction", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createLayeredConstructionProperty(AbstractLayeredConstructionPropertyType value) {
         return new JAXBElement(_LayeredConstructionProperty_QNAME, AbstractLayeredConstructionPropertyType.class, null, value);
     }
@@ -1877,7 +1877,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractResourcePropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "resource", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "resource", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createResource(AbstractResourcePropertyType value) {
         return new JAXBElement(_Resource_QNAME, AbstractResourcePropertyType.class, null, value);
     }
@@ -1890,7 +1890,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link SuitabilityPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "suitability", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "suitability", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createSuitability(SuitabilityPropertyType value) {
         return new JAXBElement(_Suitability_QNAME, SuitabilityPropertyType.class, null, value);
     }
@@ -1903,7 +1903,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link UtilityNetworkConnectionPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "utilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "utilityNetworkConnection", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createUtilityNetworkConnectionProperty(UtilityNetworkConnectionPropertyType value) {
         return new JAXBElement(_UtilityNetworkConnectionProperty_QNAME, UtilityNetworkConnectionPropertyType.class, null, value);
     }
@@ -1916,7 +1916,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link WeatherDataPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "weatherData", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "weatherData", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createWeatherDataProperty(WeatherDataPropertyType value) {
         return new JAXBElement(_WeatherDataProperty_QNAME, WeatherDataPropertyType.class, null, value);
     }
@@ -1929,7 +1929,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link PointPropertyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "referencePoint", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "referencePoint", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_GenericApplicationPropertyOfCityObject")
     public JAXBElement createReferencePoint(PointPropertyType value) {
         return new JAXBElement(_ReferencePoint_QNAME, PointPropertyType.class, null, value);
     }
@@ -1942,7 +1942,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ConstructionMaterialType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ConstructionMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createConstructionMaterial(ConstructionMaterialType value) {
         return new JAXBElement(_ConstructionMaterial_QNAME, ConstructionMaterialType.class, null, value);
     }
@@ -1955,7 +1955,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link EnergyType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Energy", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createEnergy(EnergyType value) {
         return new JAXBElement(_Energy_QNAME, EnergyType.class, null, value);
     }
@@ -1968,7 +1968,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link FoodType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Food", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createFood(FoodType value) {
         return new JAXBElement(_Food_QNAME, FoodType.class, null, value);
     }
@@ -1981,7 +1981,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link OtherResourceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "OtherResource", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createOtherResource(OtherResourceType value) {
         return new JAXBElement(_OtherResource_QNAME, OtherResourceType.class, null, value);
     }
@@ -1994,7 +1994,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link UrbanSpaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "UrbanSpace", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createUrbanSpace(UrbanSpaceType value) {
         return new JAXBElement(_UrbanSpace_QNAME, UrbanSpaceType.class, null, value);
     }
@@ -2007,7 +2007,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link WasteType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Waste", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createWaste(WasteType value) {
         return new JAXBElement(_Waste_QNAME, WasteType.class, null, value);
     }
@@ -2020,7 +2020,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link WaterType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Water", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractResource")
+    @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 createWater(WaterType value) {
         return new JAXBElement(_Water_QNAME, WaterType.class, null, value);
     }
@@ -2033,7 +2033,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractMaterialType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractMaterial", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractMaterial", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createAbstractMaterial(AbstractMaterialType value) {
         return new JAXBElement(_AbstractMaterial_QNAME, AbstractMaterialType.class, null, value);
     }
@@ -2046,7 +2046,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link GasType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Gas", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractMaterial")
+    @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 createGas(GasType value) {
         return new JAXBElement(_Gas_QNAME, GasType.class, null, value);
     }
@@ -2059,7 +2059,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "LayeredConstructionLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractLibrary")
+    @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 createLayeredConstructionLibrary(LayeredConstructionLibraryType value) {
         return new JAXBElement(_LayeredConstructionLibrary_QNAME, LayeredConstructionLibraryType.class, null, value);
     }
@@ -2072,7 +2072,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link LayerType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Layer", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Layer", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createLayer(LayerType value) {
         return new JAXBElement(_Layer_QNAME, LayerType.class, null, value);
     }
@@ -2085,7 +2085,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link LayeredConstructionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "LayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractLayeredConstruction")
+    @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 createLayeredConstruction(LayeredConstructionType value) {
         return new JAXBElement(_LayeredConstruction_QNAME, LayeredConstructionType.class, null, value);
     }
@@ -2098,7 +2098,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link MaterialLibraryType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "MaterialLibrary", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractLibrary")
+    @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 createMaterialLibrary(MaterialLibraryType value) {
         return new JAXBElement(_MaterialLibrary_QNAME, MaterialLibraryType.class, null, value);
     }
@@ -2111,7 +2111,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ReverseLayeredConstructionType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ReverseLayeredConstruction", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractLayeredConstruction")
+    @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 createReverseLayeredConstruction(ReverseLayeredConstructionType value) {
         return new JAXBElement(_ReverseLayeredConstruction_QNAME, ReverseLayeredConstructionType.class, null, value);
     }
@@ -2124,7 +2124,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link SolidMaterialType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "SolidMaterial", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractMaterial")
+    @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 createSolidMaterial(SolidMaterialType value) {
         return new JAXBElement(_SolidMaterial_QNAME, SolidMaterialType.class, null, value);
     }
@@ -2137,7 +2137,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AtticFloorSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AtticFloorSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
+    @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 createAtticFloorSurface(AtticFloorSurfaceType value) {
         return new JAXBElement(_AtticFloorSurface_QNAME, AtticFloorSurfaceType.class, null, value);
     }
@@ -2150,7 +2150,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link BasementCeilingSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "BasementCeilingSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
+    @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 createBasementCeilingSurface(BasementCeilingSurfaceType value) {
         return new JAXBElement(_BasementCeilingSurface_QNAME, BasementCeilingSurfaceType.class, null, value);
     }
@@ -2163,7 +2163,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link IntermediateFloorSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "IntermediateFloorSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
+    @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 createIntermediateFloorSurface(IntermediateFloorSurfaceType value) {
         return new JAXBElement(_IntermediateFloorSurface_QNAME, IntermediateFloorSurfaceType.class, null, value);
     }
@@ -2176,7 +2176,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link PartyWallSurfaceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "PartyWallSurface", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_BoundarySurface")
+    @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 createPartyWallSurface(PartyWallSurfaceType value) {
         return new JAXBElement(_PartyWallSurface_QNAME, PartyWallSurfaceType.class, null, value);
     }
@@ -2189,7 +2189,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ThermalZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ThermalZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractThermalZone")
+    @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 createThermalZone(ThermalZoneType value) {
         return new JAXBElement(_ThermalZone_QNAME, ThermalZoneType.class, null, value);
     }
@@ -2202,7 +2202,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfAzimuth", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfAzimuth(AngleType value) {
         return new JAXBElement(_BdgBdrySurfAzimuth_QNAME, AngleType.class, null, value);
     }
@@ -2215,7 +2215,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfGroundViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfGroundViewFactor(ScaleType value) {
         return new JAXBElement(_BdgBdrySurfGroundViewFactor_QNAME, ScaleType.class, null, value);
     }
@@ -2228,7 +2228,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link MeasureType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfHeatCapacity", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfHeatCapacity(MeasureType value) {
         return new JAXBElement(_BdgBdrySurfHeatCapacity_QNAME, MeasureType.class, null, value);
     }
@@ -2241,7 +2241,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfInclination(AngleType value) {
         return new JAXBElement(_BdgBdrySurfInclination_QNAME, AngleType.class, null, value);
     }
@@ -2254,7 +2254,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfIsAdiabatic", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfIsAdiabatic(Boolean value) {
         return new JAXBElement(_BdgBdrySurfIsAdiabatic_QNAME, Boolean.class, null, value);
     }
@@ -2267,7 +2267,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfOpaqueSurfaceArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfOpaqueSurfaceArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
     public JAXBElement createBdgBdrySurfOpaqueSurfaceArea(AreaType value) {
         return new JAXBElement(_BdgBdrySurfOpaqueSurfaceArea_QNAME, AreaType.class, null, value);
     }
@@ -2280,7 +2280,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfOpeningToSurfaceRatio", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgBdrySurfOpeningToSurfaceRatio", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
     public JAXBElement createBdgBdrySurfOpeningToSurfaceRatio(ScaleType value) {
         return new JAXBElement(_BdgBdrySurfOpeningToSurfaceRatio_QNAME, ScaleType.class, null, value);
     }
@@ -2293,7 +2293,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfSkyViewFactor(ScaleType value) {
         return new JAXBElement(_BdgBdrySurfSkyViewFactor_QNAME, ScaleType.class, null, value);
     }
@@ -2306,7 +2306,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfThickness", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfThickness(LengthType value) {
         return new JAXBElement(_BdgBdrySurfThickness_QNAME, LengthType.class, null, value);
     }
@@ -2319,7 +2319,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgBdrySurfTotalSurfaceArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfBoundarySurface")
+    @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 createBdgBdrySurfTotalSurfaceArea(AreaType value) {
         return new JAXBElement(_BdgBdrySurfTotalSurfaceArea_QNAME, AreaType.class, null, value);
     }
@@ -2332,7 +2332,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AreaType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgOpnArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
     public JAXBElement createBdgOpnArea(AreaType value) {
         return new JAXBElement(_BdgOpnArea_QNAME, AreaType.class, null, value);
     }
@@ -2345,7 +2345,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgOpnAzimuth", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnAzimuth", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
     public JAXBElement createBdgOpnAzimuth(AngleType value) {
         return new JAXBElement(_BdgOpnAzimuth_QNAME, AngleType.class, null, value);
     }
@@ -2358,7 +2358,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgOpnGroundViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "bdgOpnGroundViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
     public JAXBElement createBdgOpnGroundViewFactor(ScaleType value) {
         return new JAXBElement(_BdgOpnGroundViewFactor_QNAME, ScaleType.class, null, value);
     }
@@ -2371,7 +2371,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AngleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgOpnInclination", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    @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 createBdgOpnInclination(AngleType value) {
         return new JAXBElement(_BdgOpnInclination_QNAME, AngleType.class, null, value);
     }
@@ -2384,7 +2384,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ScaleType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "bdgOpnSkyViewFactor", substitutionHeadNamespace = "http://www.opengis.net/citygml/building/2.0", substitutionHeadName = "_GenericApplicationPropertyOfOpening")
+    @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 createBdgOpnSkyViewFactor(ScaleType value) {
         return new JAXBElement(_BdgOpnSkyViewFactor_QNAME, ScaleType.class, null, value);
     }
@@ -2397,7 +2397,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link BuildingUnitType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "BuildingUnit", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractBuildingUnit")
+    @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 createBuildingUnit(BuildingUnitType value) {
         return new JAXBElement(_BuildingUnit_QNAME, BuildingUnitType.class, null, value);
     }
@@ -2410,7 +2410,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link OccupantsType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Occupants", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Occupants", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createOccupants(OccupantsType value) {
         return new JAXBElement(_Occupants_QNAME, OccupantsType.class, null, value);
     }
@@ -2423,7 +2423,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link UsageZoneType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "UsageZone", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractUsageZone")
+    @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 createUsageZone(UsageZoneType value) {
         return new JAXBElement(_UsageZone_QNAME, UsageZoneType.class, null, value);
     }
@@ -2436,7 +2436,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link AbstractSolarCollectorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "AbstractSolarCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "AbstractSolarCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createAbstractSolarCollector(AbstractSolarCollectorType value) {
         return new JAXBElement(_AbstractSolarCollector_QNAME, AbstractSolarCollectorType.class, null, value);
     }
@@ -2449,7 +2449,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link BoilerType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "Boiler", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "Boiler", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createBoiler(BoilerType value) {
         return new JAXBElement(_Boiler_QNAME, BoilerType.class, null, value);
     }
@@ -2462,7 +2462,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link DeviceOperationType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "DeviceOperation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "DeviceOperation", substitutionHeadNamespace = "http://www.opengis.net/gml", substitutionHeadName = "_Feature")
     public JAXBElement createDeviceOperation(DeviceOperationType value) {
         return new JAXBElement(_DeviceOperation_QNAME, DeviceOperationType.class, null, value);
     }
@@ -2475,7 +2475,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ElectricalStorageDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ElectricalStorageDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ElectricalStorageDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createElectricalStorageDevice(ElectricalStorageDeviceType value) {
         return new JAXBElement(_ElectricalStorageDevice_QNAME, ElectricalStorageDeviceType.class, null, value);
     }
@@ -2488,7 +2488,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link GenericDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "GenericDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "GenericDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createGenericDevice(GenericDeviceType value) {
         return new JAXBElement(_GenericDevice_QNAME, GenericDeviceType.class, null, value);
     }
@@ -2501,7 +2501,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link GenericElectricalDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "GenericElectricalDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "GenericElectricalDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createGenericElectricalDevice(GenericElectricalDeviceType value) {
         return new JAXBElement(_GenericElectricalDevice_QNAME, GenericElectricalDeviceType.class, null, value);
     }
@@ -2514,7 +2514,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link GenericSolarCollectorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "GenericSolarCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSolarCollector")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "GenericSolarCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSolarCollector")
     public JAXBElement createGenericSolarCollector(GenericSolarCollectorType value) {
         return new JAXBElement(_GenericSolarCollector_QNAME, GenericSolarCollectorType.class, null, value);
     }
@@ -2527,7 +2527,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link HeatPumpType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "HeatPump", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "HeatPump", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createHeatPump(HeatPumpType value) {
         return new JAXBElement(_HeatPump_QNAME, HeatPumpType.class, null, value);
     }
@@ -2540,7 +2540,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link LightingDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "LightingDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "LightingDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createLightingDevice(LightingDeviceType value) {
         return new JAXBElement(_LightingDevice_QNAME, LightingDeviceType.class, null, value);
     }
@@ -2553,7 +2553,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link MovableShadingDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "MovableShadingDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "MovableShadingDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createMovableShadingDevice(MovableShadingDeviceType value) {
         return new JAXBElement(_MovableShadingDevice_QNAME, MovableShadingDeviceType.class, null, value);
     }
@@ -2566,7 +2566,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link PhotovoltaicCollectorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "PhotovoltaicCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSolarCollector")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "PhotovoltaicCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSolarCollector")
     public JAXBElement createPhotovoltaicCollector(PhotovoltaicCollectorType value) {
         return new JAXBElement(_PhotovoltaicCollector_QNAME, PhotovoltaicCollectorType.class, null, value);
     }
@@ -2579,7 +2579,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link PhotovoltaicThermalCollectorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "PhotovoltaicThermalCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSolarCollector")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "PhotovoltaicThermalCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSolarCollector")
     public JAXBElement createPhotovoltaicThermalCollector(PhotovoltaicThermalCollectorType value) {
         return new JAXBElement(_PhotovoltaicThermalCollector_QNAME, PhotovoltaicThermalCollectorType.class, null, value);
     }
@@ -2592,7 +2592,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link SolarThermalCollectorType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "SolarThermalCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractSolarCollector")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "SolarThermalCollector", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractSolarCollector")
     public JAXBElement createSolarThermalCollector(SolarThermalCollectorType value) {
         return new JAXBElement(_SolarThermalCollector_QNAME, SolarThermalCollectorType.class, null, value);
     }
@@ -2605,7 +2605,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link ThermalStorageDeviceType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "ThermalStorageDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/2.0", substitutionHeadName = "AbstractDevice")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "ThermalStorageDevice", substitutionHeadNamespace = "http://www.citygml.org/ade/energy/3.0", substitutionHeadName = "AbstractDevice")
     public JAXBElement createThermalStorageDevice(ThermalStorageDeviceType value) {
         return new JAXBElement(_ThermalStorageDevice_QNAME, ThermalStorageDeviceType.class, null, value);
     }
@@ -2618,7 +2618,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link UrbanFunctionAreaType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "UrbanFunctionArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/cityobjectgroup/2.0", substitutionHeadName = "CityObjectGroup")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "UrbanFunctionArea", substitutionHeadNamespace = "http://www.opengis.net/citygml/cityobjectgroup/2.0", substitutionHeadName = "CityObjectGroup")
     public JAXBElement createUrbanFunctionArea(UrbanFunctionAreaType value) {
         return new JAXBElement(_UrbanFunctionArea_QNAME, UrbanFunctionAreaType.class, null, value);
     }
@@ -2631,7 +2631,7 @@ public class ObjectFactory {
      * @return
      *     the new instance of {@link JAXBElement }{@code <}{@link WeatherStationType }{@code >}
      */
-    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/2.0", name = "WeatherStation", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
+    @XmlElementDecl(namespace = "http://www.citygml.org/ade/energy/3.0", name = "WeatherStation", substitutionHeadNamespace = "http://www.opengis.net/citygml/2.0", substitutionHeadName = "_CityObject")
     public JAXBElement createWeatherStation(WeatherStationType value) {
         return new JAXBElement(_WeatherStation_QNAME, WeatherStationType.class, null, value);
     }
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsPropertyType.java
index 8c1769aa22c50f14524ba5ae7bb9a40ba71ecd69..40f89e27db73f0e5e4799296d7c380dd0b7a097c 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Occupants"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Occupants"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsType.java
index 3267b2d25813686157496ff1efbcafb539fdbf7b..6ec5d016ac3150e33157ff570de68689d3b5fc10 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/OccupantsType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/OccupantsType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -35,7 +35,7 @@ import net.opengis.gml.ScaleType;
  *         <element name="heatDissipationConvectiveFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationLatentFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="heatDissipationRadiantFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="occupancyRate" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="occupancyRate" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
  *         <element name="averageDietType" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="averageIncomeLevel" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="averageInstructionLevel" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourcePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourcePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourcePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourcePropertyType.java
index 30201e6c1f353e683778e5015cd3fa73be0756b7..d3f14d397f2a0951b6d3ee7691932bc88df4fd18 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourcePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}OtherResource"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}OtherResource"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourceType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/OtherResourceType.java
index 7553da3131fbcecf88660f8ef209e28ef30b790c..fe4f3d2d289ebbb914b90eb269550e00893f5da5 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/OtherResourceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="OtherResourceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfacePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfacePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfacePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfacePropertyType.java
index 1692063dfeaf445f2ffaf727ce50e6f1a3828ab1..8b5b01c1808567a03c3a7743fd61131791908898 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfacePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfacePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}PartyWallSurface"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}PartyWallSurface"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfaceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfaceType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfaceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfaceType.java
index c631788bbc83a7b0a1a1045465d0125f8dd08fe3..fb6f8cd8d6cdd390777738ec39cc3a7e684f561e 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PartyWallSurfaceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/PartyWallSurfaceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorPropertyType.java
index 80737f3475608f2f626549b87e0f0be55688ff47..267c852342e1764641cbecddf4e39f37fa69dc4d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}PhotovoltaicCollector"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}PhotovoltaicCollector"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicCollectorType.java
index 2f7628003a15ba530fe4b3c9dfc865b688ee6e06..c7206e6adb0125792c088c5cb198e0530a306127 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicCollectorType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="PhotovoltaicCollectorType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollectorType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollectorType">
  *       <sequence>
  *         <element name="cellType" type="{http://www.opengis.net/gml}CodeType"/>
  *       </sequence>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorPropertyType.java
index 8908c6726d8314376db4d41ced5eb315f0b643cd..b98e9aebba6816617761ccbcfa3a949e0229e8bf 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}PhotovoltaicThermalCollector"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}PhotovoltaicThermalCollector"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/PhotovoltaicThermalCollectorType.java
index cdf891219d7249b7fb83d9df65015eee8e4fc8c0..cdcb17a39a0fd16ea0fce176587f5ec8999ca55b 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/PhotovoltaicThermalCollectorType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="PhotovoltaicThermalCollectorType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollectorType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollectorType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="cellType" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaPropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaPropertyType.java
index 87c5f3c816a4e09c754d009699f1692ee5ea2755..d202f5cea1208ded171bf4c5777d5c98d89449f8 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}QualifiedArea"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}QualifiedArea"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedAreaType.java
index 028d1d8b984cb968557871259d5bc9a37c51bfe4..e91c5719f9a16d38753c0203bd74d57646a9d37f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedAreaType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="QualifiedAreaType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractQualifiedAttributeType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractQualifiedAttributeType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *       </sequence>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightPropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightPropertyType.java
index 166a2885d1714002ec58854df67ced98f6ee95ab..c2c157c979d1b0600ae021ecde6f6f4cd3ef7e87 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}QualifiedHeight"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}QualifiedHeight"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedHeightType.java
index 2ce67251416d7c9c22ca8ec9d3e51f4820698cc8..c6e612f2676550ca387ccfef00d1c98421ef90a6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedHeightType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="QualifiedHeightType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractQualifiedAttributeType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractQualifiedAttributeType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *       </sequence>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumePropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumePropertyType.java
index bbc76399aecd28f75a6b8f3678c68ebcbd7e2f67..4927e2ee41f2684a29b45b5db869c34db0800a08 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}QualifiedVolume"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}QualifiedVolume"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumeType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumeType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumeType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/QualifiedVolumeType.java
index 79b53b6cf41c5eeb4deccc7236bc1459ba2d33f9..b4d5f85fbb131a2795c244a98015f54bdeb8d65f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/QualifiedVolumeType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="QualifiedVolumeType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractQualifiedAttributeType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractQualifiedAttributeType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *       </sequence>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ReflectancePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ReflectancePropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ReflectancePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ReflectancePropertyType.java
index fab62f36529bd33c1bdac9bdf94958ef8d21254f..62a2fa5230e5704fbe1bab7669b4464183be29c6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ReflectancePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Reflectance"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Reflectance"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ReflectanceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ReflectanceType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ReflectanceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ReflectanceType.java
index 5056cfc0f9de837af395af04a6030072521efa83..2134896b4b53221e67376196632499417bc7d073 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ReflectanceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ReflectanceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,10 +23,10 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="ReflectanceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractOpticalProperty_Type">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractOpticalProperty_Type">
  *       <sequence>
- *         <element name="surface" type="{http://www.citygml.org/ade/energy/2.0}SurfaceSideType"/>
- *         <element name="wavelengthRange" type="{http://www.citygml.org/ade/energy/2.0}WavelengthRangeType"/>
+ *         <element name="surface" type="{http://www.citygml.org/ade/energy/3.0}SurfaceSideType"/>
+ *         <element name="wavelengthRange" type="{http://www.citygml.org/ade/energy/3.0}WavelengthRangeType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasurePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasurePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasurePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasurePropertyType.java
index 72552b5509e4a73917a1e0e414b650fbe64c5c8e..70896e194fc79bcc24a4b01e380313296d62e388 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasurePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasurePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}RefurbishmentMeasure"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}RefurbishmentMeasure"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasureType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasureType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasureType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasureType.java
index bd47cba3fb3cd4c51a433f97eed4f08c8b6de225..3acbb514eb3fb247908479cb9c0b029bb5703a3c 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RefurbishmentMeasureType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RefurbishmentMeasureType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFilePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFilePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFilePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFilePropertyType.java
index 4d9061d0106ab62b33ad5f6ce1027cefcce5c37f..99ee44de7a87a233b11e8a20a0d344de454e9868 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFilePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFilePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}RegularTimeSeriesFile"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}RegularTimeSeriesFile"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFileType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFileType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFileType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFileType.java
index 7601c10d6ec71680b2cac3883c5f02bc13d5f3b4..8140897c2bd92d38facd81b89521e24cdfc6baa5 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesFileType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesFileType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -27,7 +27,7 @@ import net.opengis.gml.UnitOfMeasureType;
  * 
  * <complexType name="RegularTimeSeriesFileType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType">
  *       <sequence>
  *         <element name="uom" type="{http://www.opengis.net/gml}UnitOfMeasureType"/>
  *         <element name="fileURI" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesPropertyType.java
index 906f51912248253274ae1c86a53e4a06dff4f843..1a55f306350a9b82e5ec235143eb416357c40a6d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}RegularTimeSeries"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}RegularTimeSeries"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesType.java
index 045e7bf319a92be0d5ae0091d1500fc9b513e94e..d2b50f739edadb662a599b81f27da622cbf0757d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RegularTimeSeriesType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RegularTimeSeriesType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,7 +25,7 @@ import net.opengis.gml.TimePeriodPropertyType;
  * 
  * <complexType name="RegularTimeSeriesType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType">
  *       <sequence>
  *         <element name="temporalExtent" type="{http://www.opengis.net/gml}TimePeriodPropertyType"/>
  *         <element name="timeInterval" type="{http://www.opengis.net/gml}TimeIntervalLengthType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/RelatedToPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/RelatedToPropertyType.java
similarity index 99%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/RelatedToPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/RelatedToPropertyType.java
index 5dccc72c5fda56c57d13a51db415b0f001ddfbb8..56178555cb901dbd429e90ed5ef43cfc89ddd4c0 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/RelatedToPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/RelatedToPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlAccessType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ResourceStatusValueType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ResourceStatusValueType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ResourceStatusValueType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ResourceStatusValueType.java
index bcea54bd8c3a52d9e0fde4a4c2cab3145a1d9ffb..71b8a579a0e8c8ff7f4f81956dd592ef3199f29a 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ResourceStatusValueType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ResourceStatusValueType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionPropertyType.java
index cd21a1a3e9f5e49226285e2e1b7668e901157c5b..5bd44a4f8220dbe7833d987bd1b6f92deb9d4d91 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ReverseLayeredConstruction"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ReverseLayeredConstruction"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionType.java
similarity index 90%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionType.java
index aee1a353d8ad5e1911411781b38ca9bcf01dd6c1..710a3991e956264cf946c50bc25f7637d6b16da4 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ReverseLayeredConstructionType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ReverseLayeredConstructionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="ReverseLayeredConstructionType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractLayeredConstructionType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractLayeredConstructionType">
  *       <sequence>
- *         <element name="baseLayeredConstruction" type="{http://www.citygml.org/ade/energy/2.0}LayeredConstructionPropertyType"/>
+ *         <element name="baseLayeredConstruction" type="{http://www.citygml.org/ade/energy/3.0}LayeredConstructionPropertyType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentPropertyType.java
index b53192d4149c3a3bfdee826c5abf4cad65420c1c..dee84cc9aa784fee834a1a448b77d6f0b80eeb2e 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ScheduleComponent"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ScheduleComponent"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentType.java
index 6fc1f3e25e75e8d54074572ebea807d2d03a13fa..1511e7002037d2320f0ff5b113d0da77bd19ff78 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleComponentType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleComponentType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -31,7 +31,7 @@ import net.opengis.gml.TimeIntervalLengthType;
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="repetitions" type="{http://www.w3.org/2001/XMLSchema}integer"/>
  *         <element name="additionalGap" type="{http://www.opengis.net/gml}TimeIntervalLengthType" minOccurs="0"/>
- *         <element name="scheduleComponentMember" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType"/>
+ *         <element name="scheduleComponentMember" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryPropertyType.java
index 8c124304c2fa18c3df16d0bd99bf4f8d095ebcfa..9274f51e01768b49a29c6d83fa507d1873c8e511 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ScheduleLibrary"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ScheduleLibrary"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryType.java
similarity index 91%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryType.java
index f64070e1a154a6a40b3724a981b02818ba984c7c..62938d7d5329925609f19c24f5ad574bfa38c75f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ScheduleLibraryType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ScheduleLibraryType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="ScheduleLibraryType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractLibraryType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractLibraryType">
  *       <sequence>
- *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="libraryMember" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionPropertyType.java
index bd0ea6eb11921808a928a3ae6f6b5e9c2c3df6ed..ed1d9e166084c945e2c4e91ad67ede3fec3cfe6d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}SensorConnection"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}SensorConnection"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionType.java
index d928708dd838f1d4c09d7888608768d0c58d601d..d632dd05f7e1a967584f1d87238ab80acd4c8c81 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SensorConnectionType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SensorConnectionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -26,7 +26,7 @@ import net.opengis.gml.UnitOfMeasureType;
  * 
  * <complexType name="SensorConnectionType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType">
  *       <sequence>
  *         <element name="temporalExtent" type="{http://www.opengis.net/gml}TimeIntervalLengthType"/>
  *         <element name="connectionType" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorPropertyType.java
index 888288d6fdf8c25861b253dab7913f240da501db..bab1c30da40959616dc2eb1245edaa62681a4306 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}SolarThermalCollector"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}SolarThermalCollector"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorType.java
index a10c8c31ff7618c6a9ca493a95ba41280cf5f49b..a3c9d996c9869021b11942740fc0d7dffa9e41ae 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SolarThermalCollectorType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SolarThermalCollectorType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="SolarThermalCollectorType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractSolarCollectorType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractSolarCollectorType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="opticalEfficiency" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialPropertyType.java
index 034c70a85a1afe0b4adaf7cb6221e00a75445e87..ded2a84782805f1b74ea742ff46b7a5fdcdeeb23 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}SolidMaterial"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}SolidMaterial"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialType.java
index 35d2645dda336a05de5eac64fe8d583b448ef966..a18fde080cf283bd5471def87a055731c180b583 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SolidMaterialType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SolidMaterialType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="SolidMaterialType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractMaterialType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractMaterialType">
  *       <sequence>
  *         <element name="thermalConductivity" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
  *         <element name="density" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityPropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityPropertyType.java
index 5eb229fc0d42696cc53c10c85e4fa1a54aae0fda..a0f97e31cb8c1845210bddc4456db573619013aa 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Suitability"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Suitability"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityType.java
index e09c25dd0c6af0a6fce032bf674a991fd953ad7f..0ee97c2baa679b843cbd67861a0cdcd4185bf1c9 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SuitabilityType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SuitabilityType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import net.opengis.gml.ScaleType;
  *         <element name="reason" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="value" type="{http://www.opengis.net/gml}ScaleType"/>
- *         <element name="schedule" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="schedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/SurfaceSideType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/SurfaceSideType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/SurfaceSideType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/SurfaceSideType.java
index 61b381535d2c23c549b3344e0488d23a9b57472e..f531485ce8366cc969506bd7a96ce3e5e02f1d6d 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/SurfaceSideType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/SurfaceSideType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStatusValueType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStatusValueType.java
similarity index 95%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStatusValueType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStatusValueType.java
index dfaa04b755d0ebee504647a02226a73ac5111cb0..bdfacc6a2861463477536123a3e02ee4812a1ded 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStatusValueType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStatusValueType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDevicePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDevicePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDevicePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDevicePropertyType.java
index 1d69622e7cb68c001094cc6d56bd93101624ee97..de511f81a29d9f1621da95858cee617f32b89573 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDevicePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDevicePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ThermalStorageDevice"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ThermalStorageDevice"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDeviceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDeviceType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDeviceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDeviceType.java
index e3291d90ed029eb95b64ac57c3f3503a76cb15b9..a8124d3928ef8941dece601dfed91f61f9e8cfc7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalStorageDeviceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalStorageDeviceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import net.opengis.gml.VolumeType;
  * 
  * <complexType name="ThermalStorageDeviceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractDeviceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractDeviceType">
  *       <sequence>
  *         <element name="preparationTemperature" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
  *         <element name="medium" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZonePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZonePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZonePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZonePropertyType.java
index 1ee36e6dfb5263fbe9cc940e4afb047df11ce602..c97f3a880a75c14690a0d588276498f11cc3836f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZonePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZonePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}ThermalZone"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}ThermalZone"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZoneType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZoneType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZoneType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZoneType.java
index 9e793269841b7d0dbf7eb989e97801cd39419cb0..ada8b82cd788382b07da91f5dd50362c268de83f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/ThermalZoneType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/ThermalZoneType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +26,7 @@ import net.opengis.gml.MeasureType;
  * 
  * <complexType name="ThermalZoneType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractThermalZoneType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractThermalZoneType">
  *       <sequence>
  *         <element name="heatCapacity" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
  *         <element name="infiltrationRate" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TransmittancePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TransmittancePropertyType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TransmittancePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TransmittancePropertyType.java
index bfb0909ced5823bc969d963363f17f9f9dc6d2e8..f43383d1b4d554aef454cdb68000e452d1a6f641 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TransmittancePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TransmittancePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Transmittance"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Transmittance"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TransmittanceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TransmittanceType.java
similarity index 90%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TransmittanceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TransmittanceType.java
index a0d37bdd086daef2f066348da1855c0a56d37920..8b80b72e3f72d3c57dfe5cc16dbda9297a704dc2 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TransmittanceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TransmittanceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,9 +23,9 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="TransmittanceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractOpticalProperty_Type">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractOpticalProperty_Type">
  *       <sequence>
- *         <element name="wavelengthRange" type="{http://www.citygml.org/ade/energy/2.0}WavelengthRangeType"/>
+ *         <element name="wavelengthRange" type="{http://www.citygml.org/ade/energy/3.0}WavelengthRangeType"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFilePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFilePropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFilePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFilePropertyType.java
index 8d6bb5cd0d32b84dcb4d5150d768f3f0d3a5f7c4..01f3307b6a6e8b238eb50c9fcfa668c60be2b192 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFilePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFilePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}TypicalValuesTimeSeriesFile"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}TypicalValuesTimeSeriesFile"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFileType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFileType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFileType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFileType.java
index c8799ead56567ec195fddaa540f3dcc04a24a5d4..6de2ab0250e1594147c4387d4599f9dd266c78d6 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesFileType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesFileType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -27,7 +27,7 @@ import net.opengis.gml.UnitOfMeasureType;
  * 
  * <complexType name="TypicalValuesTimeSeriesFileType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType">
  *       <sequence>
  *         <element name="startTime" type="{http://www.w3.org/2001/XMLSchema}time" minOccurs="0"/>
  *         <element name="startDay" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesPropertyType.java
index 968d44d21d196b4ef5e19d52d3f47e8a628cc88b..fe124c6136d5609d350a5a8052046b714e190f1f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}TypicalValuesTimeSeries"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}TypicalValuesTimeSeries"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesType.java
index 041b15ef59b1356f9c931158aca9008e1443ca1e..e5a903f5965ec8ee37c16edd8994d67e5b7f0a0f 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/TypicalValuesTimeSeriesType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/TypicalValuesTimeSeriesType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -27,7 +27,7 @@ import net.opengis.gml.TimeIntervalLengthType;
  * 
  * <complexType name="TypicalValuesTimeSeriesType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesType">
  *       <sequence>
  *         <element name="startTime" type="{http://www.w3.org/2001/XMLSchema}time" minOccurs="0"/>
  *         <element name="startDay" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaPropertyType.java
index a5c6696fb2a9f70979bf22ecdaf07d8e157d3745..1e7c14e0c5c55129e7ffb1e534a0f91ebb10b934 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}UrbanFunctionArea"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}UrbanFunctionArea"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaType.java
index 794d54c0b13f7d8d5d761f4328ea72b6c286fb5b..749e48d9956210a8ab60878cfd77f09e83030eb5 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanFunctionAreaType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanFunctionAreaType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpacePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpacePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpacePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpacePropertyType.java
index 60be8958750e92493b5147f77e76a072fa993923..095d04c343cf843028f8320ab946e064e66eb065 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpacePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpacePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}UrbanSpace"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}UrbanSpace"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpaceType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpaceType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpaceType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpaceType.java
index d5a5cbfaed9f09c171831523b0ac7ae91254a451..22358ba2af7382ff845df95a68a7ece21ab3e2bc 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UrbanSpaceType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UrbanSpaceType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="UrbanSpaceType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UsageZonePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UsageZonePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UsageZonePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UsageZonePropertyType.java
index a9fc7679df77768508e0ae2479a725b15cf40ee4..ab16f321e97ed67b4ebd342a9bb8090d2c91ffc7 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UsageZonePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UsageZonePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}UsageZone"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}UsageZone"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UsageZoneType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UsageZoneType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UsageZoneType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UsageZoneType.java
index b185d79abf85f36bbd3582cf1a7c04cd84c365a7..b1aa16c82bc5bab9f829c22a3b59bf39e7378750 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UsageZoneType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UsageZoneType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ import net.opengis.gml.ScaleType;
  * 
  * <complexType name="UsageZoneType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractUsageZoneType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractUsageZoneType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="isPrimary" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
@@ -37,10 +37,10 @@ import net.opengis.gml.ScaleType;
  *         <element name="internalHeatGainsConvectiveFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="internalHeatGainsLatentFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
  *         <element name="internalHeatGainsRadiantFraction" type="{http://www.opengis.net/gml}ScaleType" minOccurs="0"/>
- *         <element name="coolingSchedule" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
- *         <element name="heatingSchedule" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
- *         <element name="ventilationSchedule" type="{http://www.citygml.org/ade/energy/2.0}AbstractSchedulePropertyType" minOccurs="0"/>
- *         <element name="occupiedBy" type="{http://www.citygml.org/ade/energy/2.0}OccupantsPropertyType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="coolingSchedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="heatingSchedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="ventilationSchedule" type="{http://www.citygml.org/ade/energy/3.0}AbstractSchedulePropertyType" minOccurs="0"/>
+ *         <element name="occupiedBy" type="{http://www.citygml.org/ade/energy/3.0}OccupantsPropertyType" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
  *   </complexContent>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionPropertyType.java
index 5232752d5d766f69fe714416ad401523d4e7551f..7719ae34314f3a6720202e4d3fb8ad03bb4417bd 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}UtilityNetworkConnection"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}UtilityNetworkConnection"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionType.java
index f22c4c162b2aa178100f2e116f9b7553891e4606..977a698f3234c7640e5a0dfd1a70dc9c30844936 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/UtilityNetworkConnectionType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/UtilityNetworkConnectionType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -28,7 +28,7 @@ import net.opengis.gml.CodeType;
  *     <extension base="{http://www.opengis.net/gml}AbstractFeatureType">
  *       <sequence>
  *         <element name="networkType" type="{http://www.opengis.net/gml}CodeType"/>
- *         <element name="connectionStatus" type="{http://www.citygml.org/ade/energy/2.0}NetworkConnectionStatusValueType"/>
+ *         <element name="connectionStatus" type="{http://www.citygml.org/ade/energy/3.0}NetworkConnectionStatusValueType"/>
  *         <element name="functionInNetwork" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="usageInNetwork" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="networkID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WastePropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WastePropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WastePropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WastePropertyType.java
index 2023450a2b575fdb0972c2722faaec9967638e67..e9fdd9b16a9c67cdacb28f26af29306cb1de8f58 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WastePropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WastePropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Waste"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Waste"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WasteType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WasteType.java
similarity index 96%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WasteType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WasteType.java
index e32c70a6ffdae0909354fe64b1b453c5c298bfbe..4dde5abd19b25c3614d027cfd81cb8f940835216 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WasteType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WasteType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="WasteType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WaterPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WaterPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WaterPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WaterPropertyType.java
index 443af023f52f7c9328cd1753664dece35ce71b7e..da39c2e26c215a2d9f3f3b9d0084001a9922bb18 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WaterPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WaterPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}Water"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}Water"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WaterType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WaterType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WaterType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WaterType.java
index ecfba0d2a2e21aaad1e9c7b68c6e3796df9b7a69..6ec5af86cb1a00448195e4825d12433986f5873b 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WaterType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WaterType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -23,7 +23,7 @@ import net.opengis.gml.CodeType;
  * 
  * <complexType name="WaterType">
  *   <complexContent>
- *     <extension base="{http://www.citygml.org/ade/energy/2.0}AbstractResourceType">
+ *     <extension base="{http://www.citygml.org/ade/energy/3.0}AbstractResourceType">
  *       <sequence>
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="endUse" type="{http://www.opengis.net/gml}CodeType"/>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WavelengthRangeType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WavelengthRangeType.java
similarity index 94%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WavelengthRangeType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WavelengthRangeType.java
index 4b0dedecf27e79641b82f76bb32ed5d7ca3277ef..bf8694bac049aa788289386a89a492d0a5468ba2 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WavelengthRangeType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WavelengthRangeType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataPropertyType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataPropertyType.java
index 8f13a7fdd5482c65dad7f794b57a42fbff6b1cad..30629afeb2a61ccdaa5f17953c11a4c3e3f09991 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}WeatherData"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}WeatherData"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataType.java
similarity index 97%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataType.java
index 32faba37d74fb39df4bfa29b1e4813d01d22dc69..377cf9c6cc0bbf7d95b8e6e214d111218469d658 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherDataType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherDataType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -32,7 +32,7 @@ import net.opengis.gml.PointPropertyType;
  *         <element name="type" type="{http://www.opengis.net/gml}CodeType"/>
  *         <element name="valueType" type="{http://www.opengis.net/gml}CodeType" minOccurs="0"/>
  *         <element name="yearlyValue" type="{http://www.opengis.net/gml}MeasureType" minOccurs="0"/>
- *         <element name="timeDependentValues" type="{http://www.citygml.org/ade/energy/2.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
+ *         <element name="timeDependentValues" type="{http://www.citygml.org/ade/energy/3.0}AbstractTimeSeriesPropertyType" minOccurs="0"/>
  *         <element name="position" type="{http://www.opengis.net/gml}PointPropertyType" minOccurs="0"/>
  *       </sequence>
  *     </extension>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationPropertyType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationPropertyType.java
similarity index 98%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationPropertyType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationPropertyType.java
index 17a8d87476e0a74e1ef9d3531933a9c1f6101cd1..7e297d5b64a1ccc8cc7f384ccc4ed8324c712c14 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationPropertyType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationPropertyType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -29,7 +29,7 @@ import org.w3._1999.xlink.TypeType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence minOccurs="0">
- *         <element ref="{http://www.citygml.org/ade/energy/2.0}WeatherStation"/>
+ *         <element ref="{http://www.citygml.org/ade/energy/3.0}WeatherStation"/>
  *       </sequence>
  *       <attGroup ref="{http://www.opengis.net/gml}AssociationAttributeGroup"/>
  *     </restriction>
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationType.java b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationType.java
similarity index 92%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationType.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationType.java
index a790ebddd2d19a68d1e28203e750a923a148bddc..e737290f9f6d34498ac64ae68946aac36d081929 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/WeatherStationType.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/WeatherStationType.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: Wed Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
 
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src-gen/org/sig3d/citygml/energyADE2beta7/package-info.java b/src-gen/org/sig3d/citygml/energyADE3beta7/package-info.java
similarity index 68%
rename from src-gen/org/sig3d/citygml/energyADE2beta7/package-info.java
rename to src-gen/org/sig3d/citygml/energyADE3beta7/package-info.java
index c3255fbd65c51dd63f53fa9638ae280287f37612..41559f223f957a11777a6540a16dea166ae35166 100644
--- a/src-gen/org/sig3d/citygml/energyADE2beta7/package-info.java
+++ b/src-gen/org/sig3d/citygml/energyADE3beta7/package-info.java
@@ -2,10 +2,10 @@
 // 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 Jul 02 10:53:09 CEST 2025
+// Generated: Mon Oct 27 13:17:28 CET 2025
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.citygml.org/ade/energy/2.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
-    @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.citygml.org/ade/energy/2.0", prefix = "nrg2")
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.citygml.org/ade/energy/3.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
+    @javax.xml.bind.annotation.XmlNs(namespaceURI = "http://www.citygml.org/ade/energy/3.0", prefix = "nrg3")
 })
-package org.sig3d.citygml.energyADE2beta7;
+package org.sig3d.citygml.energyADE3beta7;
diff --git a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
index 1be28adf9adc179857d595df19ef9788b944e394..00b2b8ad4a02c6354a065d5e6f8abb76c4c912d5 100644
--- a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
+++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
@@ -8,8 +8,8 @@ import org.citygml4j.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEMarshaller;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.util.mapper.TypeMapper;
-import org.sig3d.citygml.energyADE2beta7.*;
-import org.sig3d.citygml.energyADE2beta7.ObjectFactory;
+import org.sig3d.citygml.energyADE3beta7.*;
+import org.sig3d.citygml.energyADE3beta7.ObjectFactory;
 import org.w3._1999.xlink.ActuateType;
 import org.w3._1999.xlink.ShowType;
 import org.w3._1999.xlink.TypeType;
diff --git a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java
index 0c0f6ba85835a7569b3c92f6aec00562bc78588d..c35ce84033f89aa074c7208175eb8c38c583c898 100644
--- a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java
+++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java
@@ -13,7 +13,8 @@ import org.citygml4j.model.gml.xlink.XLinkShow;
 import org.citygml4j.model.gml.xlink.XLinkType;
 import org.citygml4j.util.mapper.CheckedTypeMapper;
 import org.citygml4j.xml.io.reader.MissingADESchemaException;
-import org.sig3d.citygml.energyADE2beta7.*;
+import org.sig3d.citygml.energyADE3beta7.*;
+import org.sig3d.citygml.energyADE3beta7.*;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.DatatypeConstants;
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java
index f6460112854c8740e3b3e11837f2c077540fefe6..3b533ff2a10c42b5ae7c052f26b72aa4a6456306 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/AbstractResource.java
@@ -10,7 +10,7 @@ import org.citygml4j.model.common.visitor.GMLVisitor;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.basicTypes.Measure;
 import org.citygml4j.model.gml.feature.AbstractFeature;
-import org.sig3d.citygml.energyADE2beta7.ResourceStatusValueType;
+import org.sig3d.citygml.energyADE3beta7.ResourceStatusValueType;
 
 public abstract class AbstractResource extends AbstractFeature implements ADEModelObject {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java
index efe8a2e0b4caa0bf85c0f2fb193498dd571e581a..e7ad623e75238c6c8946e8a8a9d3d0089bab814c 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingAtticThermalStatusProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType;
+import org.sig3d.citygml.energyADE3beta7.ThermalStatusValueType;
 
 public class BuildingAtticThermalStatusProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java
index 298183f9cbb782bfc98f087420434bb0230768c7..23c63fe297c1fd680ac36016447f4214fc89a867 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingBasementThermalStatusProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.ThermalStatusValueType;
+import org.sig3d.citygml.energyADE3beta7.ThermalStatusValueType;
 
 public class BuildingBasementThermalStatusProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java
index a2ffcd3e75717c8c772ec3c7180450c6654348c9..6183e52249a9c1596c91b9e3ede47e518fa941fd 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingFloorAreaProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedAreaPropertyType;
 
 public class BuildingFloorAreaProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java
index ae11677df197efa78be3000ed75bf5e8b0c53b7d..140fd7dc271113be5e8791b650230ce6858d982b 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightAboveGroundProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
 
 public class BuildingHeightAboveGroundProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java
index 9bc923670a03d71b5ce0b86292b4bd4ec553fe84..fb94451ff5a0900c7f4e5d34e1637f7474c04c22 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingHeightProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
 
 public class BuildingHeightProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java
index 4cb6b78ad2c48df6ccae9ebe08ac7cdf3efb45ed..2ad7f635e7b519cc6f09faef355d2df32a62390d 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/BuildingVolumeProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedVolumePropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedVolumePropertyType;
 
 public class BuildingVolumeProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java
index bef65636fc9dbfbb3c2b88d1c8fd5d3ce0f7a46e..1030d72d5ba478cf06178c8e695d9b28f751ec30 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedAreaProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedAreaPropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedAreaPropertyType;
 
 public class QualifiedAreaProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java
index b310040e75d8ed38136b0652d78ae5b16fdd5ee5..0dedf79e7398d1a470bc0ef97fc3fbf334752f92 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedHeightProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedHeightPropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedHeightPropertyType;
 
 public class QualifiedHeightProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java
index 578d1ce353c75ae16d46a672b5cf1697181565b1..4c4a59536956ea3cdea1f8cabc5673b70b06ad50 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/QualifiedVolumeProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.QualifiedVolumePropertyType;
+import org.sig3d.citygml.energyADE3beta7.QualifiedVolumePropertyType;
 
 public class QualifiedVolumeProperty extends ADEGenericApplicationProperty {
     public QualifiedVolumeProperty() {}
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java
index cc3ad18cecfa0fcc29ebcda99506aa942f467b5e..254f3f9cc90996850123f725c1d22b9a395d99ab 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/core/SuitabilityProperty.java
@@ -2,7 +2,7 @@ package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;
-import org.sig3d.citygml.energyADE2beta7.SuitabilityPropertyType;
+import org.sig3d.citygml.energyADE3beta7.SuitabilityPropertyType;
 
 public class SuitabilityProperty extends ADEGenericApplicationProperty {
 
diff --git a/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java
index 5a9c447060fba015f28b6a6d1aba88090aaf277b..c3ff1f218f13a231726325179e3ece0b7e8f26e9 100644
--- a/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java
+++ b/src/main/java/org/citygml4j/ade/energy3/model/module/EnergyADEModule.java
@@ -18,8 +18,8 @@ public class EnergyADEModule extends ADEModule {
     private HashSet featureProperties;
 
     public EnergyADEModule() {
-        super("http://www.citygml.org/ade/energy/2.0",
-                "nrg2",
+        super("http://www.citygml.org/ade/energy/3.0",
+                "nrg3",
                 CityGMLVersion.v2_0_0);
 
         features = new HashMap<>();
@@ -49,12 +49,12 @@ public class EnergyADEModule extends ADEModule {
 
     @Override
     public URL getSchemaResource() {
-        return EnergyADEContext.class.getResource("/Energy_ADE_2.0_beta7.xsd");
+        return EnergyADEContext.class.getResource("/Energy_ADE_3.0_beta7.xsd");
     }
 
     @Override
     public List getJAXBPackageNames() {
-        return Collections.singletonList("org.sig3d.citygml.energyADE2beta7");
+        return Collections.singletonList("org.sig3d.citygml.energyADE3beta7");
     }
 
     @Override
diff --git a/src/main/resources/Energy_ADE_2.0_beta7.xsd b/src/main/resources/Energy_ADE_3.0_beta7.xsd
similarity index 81%
rename from src/main/resources/Energy_ADE_2.0_beta7.xsd
rename to src/main/resources/Energy_ADE_3.0_beta7.xsd
index 1aea0dbc2327f537ea7ef7a9c0c52b27babdf855..d71acacaf342bb7b0e53cfc6216adb5766d4952b 100644
--- a/src/main/resources/Energy_ADE_2.0_beta7.xsd
+++ b/src/main/resources/Energy_ADE_3.0_beta7.xsd
@@ -5,9 +5,9 @@
 
 XML Schema Definition (XSD) file for the
 
-CityGML Energy ADE 2.0 (beta 7)
+CityGML Energy ADE 3.0 (beta 7)
 
-Last update: 2025-06-25
+Last update: 2025-09-23
 
 This schema file was first automatically generated using Shapechange 3.10 and
 successively manually edited, annotated by means of additional tags, and restructured.
@@ -84,13 +84,13 @@ xmlns:tran="http://www.opengis.net/citygml/transportation/2.0"
 xmlns:tun="http://www.opengis.net/citygml/tunnel/2.0"
 xmlns:veg="http://www.opengis.net/citygml/vegetation/2.0"
 xmlns:wtr="http://www.opengis.net/citygml/waterbody/2.0"
-xmlns:nrg2="http://www.citygml.org/ade/energy/2.0" 
+xmlns:nrg3="http://www.citygml.org/ade/energy/3.0" 
 elementFormDefault="qualified" 
-targetNamespace="http://www.citygml.org/ade/energy/2.0" 
-version="2.0"
+targetNamespace="http://www.citygml.org/ade/energy/3.0" 
+version="3.0"
 >
   
-    Energy ADE 2.0 beta 7 (2025-06-25) for CityGML 2.0
+    Energy ADE 3.0 beta 7 (2025-09-23) for CityGML 2.0
   
 
   
@@ -187,7 +187,7 @@ version="2.0"
   
 
 
-  
+  
   
     
       
@@ -195,35 +195,35 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
         
       
     
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
-          
+          
+          
           
         
       
@@ -231,29 +231,29 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
         
       
     
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
       
@@ -263,15 +263,15 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
           
         
@@ -280,15 +280,15 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
           
         
@@ -297,15 +297,15 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
-      
+      
         
           
         
@@ -314,18 +314,18 @@ version="2.0"
   
   
     
-      
+      
     
   
 
 
-  
+  
   
     
       
       
       
-      
+      
 		 
 		   
 			aggregation
@@ -336,7 +336,7 @@ version="2.0"
   
   
     
-      
+      
     
   
 
@@ -346,13 +346,13 @@ version="2.0"
   
 
 
-  
+  
   
     
       
         
           
-          
+          
           
         
       
@@ -360,16 +360,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -380,16 +380,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -406,16 +406,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -429,16 +429,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -458,16 +458,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -489,7 +489,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -500,7 +500,7 @@ version="2.0"
   
 
   
-  
+  
   
     
       
@@ -518,16 +518,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -539,19 +539,19 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
-          
+          
              
                
              	composition
@@ -564,18 +564,18 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
              
                
              	composition
@@ -588,13 +588,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -602,7 +602,7 @@ version="2.0"
           
           
           
-          
+          
              
                
              	association
@@ -615,13 +615,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
     
       
         true
@@ -630,9 +630,9 @@ version="2.0"
   
   
     
-      
+      
         
-          
+          
             
               
                 composition
@@ -645,7 +645,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -656,13 +656,13 @@ version="2.0"
   
 
 
-  
+  
   
     
       
         
-          
-          
+          
+          
           
             
               
@@ -690,29 +690,29 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -727,7 +727,7 @@ version="2.0"
           
           
           
-          
+          
 		    
               
                 aggregation
@@ -740,13 +740,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -760,13 +760,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -776,23 +776,23 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
         
-          
+          
           
           
           
           
-          
+          
             
               
                 composition
@@ -811,18 +811,18 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
             
               
                 association
@@ -835,18 +835,18 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
             
               
                 association
@@ -859,13 +859,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -884,13 +884,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -905,19 +905,19 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
         
           
-          
+          
           
           
           
@@ -928,13 +928,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -943,7 +943,7 @@ version="2.0"
           
           
           
-          
+          
             
               
                 composition
@@ -957,21 +957,21 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
   
-  
+  
     
       
         1
       
     
   
-  
+  
     
       
         1
@@ -985,9 +985,9 @@ version="2.0"
       
     
   
-  
-   
-  
+  
+   
+  
   
     
       
@@ -1002,35 +1002,35 @@ version="2.0"
       
     
   
-  
+  
     
       
         composition
       
       
   
-  
+  
     
       
         composition
       
       
   
-  
+  
     
       
         composition
       
     
   
-  
+  
     
       
         composition
       
     
   
-  
+  
     
       
         composition
@@ -1040,11 +1040,11 @@ version="2.0"
 
 
   
-  
+  
   
     
       
-      
+      
         
           
             association
@@ -1055,7 +1055,7 @@ version="2.0"
   
   
     
-      
+      
     
   
 
@@ -1069,7 +1069,7 @@ version="2.0"
 
   
   
-  
+  
     
       
         composition
@@ -1077,14 +1077,14 @@ version="2.0"
     
   
   
-  
+  
     
       
         aggregation
       
         
   
-  
+  
     
       
         association
@@ -1094,28 +1094,28 @@ version="2.0"
       
     
   
-  
+  
     
       
         composition
       
       
   
-  
+  
       
       
         composition
       
       
   
-  
+  
     
       
         composition
       
       
   
-  
+  
     
       
         composition
@@ -1136,10 +1136,10 @@ version="2.0"
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1149,16 +1149,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1171,16 +1171,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1190,16 +1190,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1209,16 +1209,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1228,16 +1228,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1249,16 +1249,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1268,7 +1268,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -1279,7 +1279,7 @@ version="2.0"
   
 
 
-  
+  
   
     
       
@@ -1291,16 +1291,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1310,13 +1310,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
     
       
         true
@@ -1325,9 +1325,9 @@ version="2.0"
   
   
     
-      
+      
         
-          
+          
             
               
                 composition
@@ -1340,19 +1340,19 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
         
           
-          
+          
             
               
                 aggregation
@@ -1365,25 +1365,25 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
           
           
-          
-          
-          
-          
+          
+          
+          
+          
             
               
                 composition
@@ -1396,13 +1396,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
     
       
         true
@@ -1411,9 +1411,9 @@ version="2.0"
   
   
     
-      
+      
         
-          
+          
             
               
                 composition
@@ -1426,18 +1426,18 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
-          
+          
             
               
                 association
@@ -1450,16 +1450,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1474,7 +1474,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -1485,7 +1485,7 @@ version="2.0"
   
 
 
-  
+  
   
     
       
@@ -1495,13 +1495,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -1511,13 +1511,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -1527,13 +1527,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -1543,16 +1543,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
 		  
@@ -1573,7 +1573,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -1695,10 +1695,10 @@ version="2.0"
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1711,21 +1711,21 @@ version="2.0"
               
             
 		  
-          
+          
             
               
                 composition
               
             
 		  
-          
+          
             
               
                 composition
               
             
 		  		  
-          
+          
             
               
                 aggregation
@@ -1738,13 +1738,13 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
@@ -1755,7 +1755,7 @@ version="2.0"
           
           
           
-          
+          
             
               
                 aggregation
@@ -1771,16 +1771,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1789,28 +1789,28 @@ version="2.0"
           
           
           
-          
+          
             
               
                 aggregation
               
             	
 		  
-          
+          
             
               
                 aggregation
               
             	
 		  
-          
+          
             
               
                 aggregation
               
             	
 		  
-          
+          
             
               
                 aggregation
@@ -1823,7 +1823,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -1834,10 +1834,10 @@ version="2.0"
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1863,16 +1863,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
         
@@ -1881,36 +1881,36 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
       
         
           
           
-          
+          
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1920,64 +1920,64 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -1988,53 +1988,53 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
-          
+          
           
-          
+          
         
       
     
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
         
@@ -2043,16 +2043,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -2065,16 +2065,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -2086,16 +2086,16 @@ version="2.0"
   
   
     
-      
+      
     
     
   
 
 
-  
+  
   
     
-      
+      
         
           
           
@@ -2107,7 +2107,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -2118,7 +2118,7 @@ version="2.0"
   
 
 
-  
+  
     
       
         true
@@ -2137,7 +2137,7 @@ version="2.0"
   
   
     
-      
+      
     
     
   
@@ -2148,7 +2148,7 @@ version="2.0"
   
 
 
-  
+  
     
       
         true
@@ -2164,7 +2164,7 @@ version="2.0"
   
   
     
-      
+