From afa32aa3f95f042d8168ac021afe7a018a312305 Mon Sep 17 00:00:00 2001 From: Rushi Date: Mon, 27 Oct 2025 15:19:34 +0100 Subject: [PATCH] Updated to Energy ADE 3 beta 7 - version 0.2 --- .../8.5/executionHistory/executionHistory.bin | Bin 530614 -> 530614 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes README.md | 5 +- build.gradle | 4 +- ...AbstractBuildingPartitionPropertyType.java | 8 +- .../AbstractBuildingPartitionType.java | 8 +- .../AbstractBuildingUnitPropertyType.java | 8 +- .../AbstractBuildingUnitType.java | 6 +- .../AbstractDevicePropertyType.java | 8 +- .../AbstractDeviceType.java | 6 +- ...stractLayeredConstructionPropertyType.java | 8 +- .../AbstractLayeredConstructionType.java | 4 +- .../AbstractLibraryPropertyType.java | 8 +- .../AbstractLibraryType.java | 4 +- .../AbstractMaterialPropertyType.java | 8 +- .../AbstractMaterialType.java | 4 +- .../AbstractOpticalProperty_PropertyType.java | 8 +- .../AbstractOpticalProperty_Type.java | 4 +- ...bstractQualifiedAttributePropertyType.java | 8 +- .../AbstractQualifiedAttributeType.java | 4 +- .../AbstractResourcePropertyType.java | 8 +- .../AbstractResourceType.java | 8 +- .../AbstractSchedulePropertyType.java | 8 +- .../AbstractScheduleType.java | 4 +- .../AbstractSolarCollectorPropertyType.java | 8 +- .../AbstractSolarCollectorType.java | 6 +- .../AbstractThermalZonePropertyType.java | 8 +- .../AbstractThermalZoneType.java | 8 +- .../AbstractTimeSeriesPropertyType.java | 8 +- .../AbstractTimeSeriesType.java | 6 +- .../AbstractUsageZonePropertyType.java | 8 +- .../AbstractUsageZoneType.java | 8 +- .../AtomicSchedulePropertyType.java | 6 +- .../AtomicScheduleType.java | 8 +- .../AtticFloorSurfacePropertyType.java | 6 +- .../AtticFloorSurfaceType.java | 4 +- .../BasementCeilingSurfacePropertyType.java | 6 +- .../BasementCeilingSurfaceType.java | 4 +- .../BoilerPropertyType.java | 6 +- .../BoilerType.java | 6 +- .../BuildingUnitPropertyType.java | 6 +- .../BuildingUnitType.java | 12 +- .../CityObjectRelationPropertyType.java | 6 +- .../CityObjectRelationType.java | 6 +- .../CompositeSchedulePropertyType.java | 6 +- .../CompositeScheduleType.java | 8 +- .../ConstructionMaterialPropertyType.java | 6 +- .../ConstructionMaterialType.java | 6 +- .../DeviceOperationPropertyType.java | 6 +- .../DeviceOperationType.java | 6 +- .../DualValueSchedulePropertyType.java | 6 +- .../DualValueScheduleType.java | 6 +- .../ElectricalStorageDevicePropertyType.java | 6 +- .../ElectricalStorageDeviceType.java | 6 +- .../EmissivityPropertyType.java | 6 +- .../EmissivityType.java | 8 +- ...rgyPerformanceCertificatePropertyType.java | 6 +- .../EnergyPerformanceCertificateType.java | 4 +- .../EnergyPropertyType.java | 6 +- .../EnergyType.java | 6 +- .../FoodPropertyType.java | 6 +- .../FoodType.java | 6 +- .../GasPropertyType.java | 6 +- .../GasType.java | 6 +- .../GenericDevicePropertyType.java | 6 +- .../GenericDeviceType.java | 6 +- .../GenericElectricalDevicePropertyType.java | 6 +- .../GenericElectricalDeviceType.java | 6 +- .../GenericSolarCollectorPropertyType.java | 6 +- .../GenericSolarCollectorType.java | 6 +- .../HeatPumpPropertyType.java | 6 +- .../HeatPumpType.java | 6 +- .../IntermediateFloorSurfacePropertyType.java | 6 +- .../IntermediateFloorSurfaceType.java | 4 +- .../InterpolationTypeValueType.java | 4 +- .../LayerPropertyType.java | 6 +- .../LayerType.java | 6 +- ...ayeredConstructionLibraryPropertyType.java | 6 +- .../LayeredConstructionLibraryType.java | 8 +- .../LayeredConstructionPropertyType.java | 6 +- .../LayeredConstructionType.java | 14 +- .../LightingDevicePropertyType.java | 6 +- .../LightingDeviceType.java | 6 +- .../MaterialLibraryPropertyType.java | 6 +- .../MaterialLibraryType.java | 8 +- .../MovableShadingDevicePropertyType.java | 6 +- .../MovableShadingDeviceType.java | 10 +- .../NetworkConnectionStatusValueType.java | 4 +- .../ObjectFactory.java | 448 +++++++-------- .../OccupantsPropertyType.java | 6 +- .../OccupantsType.java | 6 +- .../OtherResourcePropertyType.java | 6 +- .../OtherResourceType.java | 6 +- .../PartyWallSurfacePropertyType.java | 6 +- .../PartyWallSurfaceType.java | 4 +- .../PhotovoltaicCollectorPropertyType.java | 6 +- .../PhotovoltaicCollectorType.java | 6 +- ...tovoltaicThermalCollectorPropertyType.java | 6 +- .../PhotovoltaicThermalCollectorType.java | 6 +- .../QualifiedAreaPropertyType.java | 6 +- .../QualifiedAreaType.java | 6 +- .../QualifiedHeightPropertyType.java | 6 +- .../QualifiedHeightType.java | 6 +- .../QualifiedVolumePropertyType.java | 6 +- .../QualifiedVolumeType.java | 6 +- .../ReflectancePropertyType.java | 6 +- .../ReflectanceType.java | 10 +- .../RefurbishmentMeasurePropertyType.java | 6 +- .../RefurbishmentMeasureType.java | 4 +- .../RegularTimeSeriesFilePropertyType.java | 6 +- .../RegularTimeSeriesFileType.java | 6 +- .../RegularTimeSeriesPropertyType.java | 6 +- .../RegularTimeSeriesType.java | 6 +- .../RelatedToPropertyType.java | 4 +- .../ResourceStatusValueType.java | 4 +- ...everseLayeredConstructionPropertyType.java | 6 +- .../ReverseLayeredConstructionType.java | 8 +- .../ScheduleComponentPropertyType.java | 6 +- .../ScheduleComponentType.java | 6 +- .../ScheduleLibraryPropertyType.java | 6 +- .../ScheduleLibraryType.java | 8 +- .../SensorConnectionPropertyType.java | 6 +- .../SensorConnectionType.java | 6 +- .../SolarThermalCollectorPropertyType.java | 6 +- .../SolarThermalCollectorType.java | 6 +- .../SolidMaterialPropertyType.java | 6 +- .../SolidMaterialType.java | 6 +- .../SuitabilityPropertyType.java | 6 +- .../SuitabilityType.java | 6 +- .../SurfaceSideType.java | 4 +- .../ThermalStatusValueType.java | 4 +- .../ThermalStorageDevicePropertyType.java | 6 +- .../ThermalStorageDeviceType.java | 6 +- .../ThermalZonePropertyType.java | 6 +- .../ThermalZoneType.java | 6 +- .../TransmittancePropertyType.java | 6 +- .../TransmittanceType.java | 8 +- ...picalValuesTimeSeriesFilePropertyType.java | 6 +- .../TypicalValuesTimeSeriesFileType.java | 6 +- .../TypicalValuesTimeSeriesPropertyType.java | 6 +- .../TypicalValuesTimeSeriesType.java | 6 +- .../UrbanFunctionAreaPropertyType.java | 6 +- .../UrbanFunctionAreaType.java | 4 +- .../UrbanSpacePropertyType.java | 6 +- .../UrbanSpaceType.java | 6 +- .../UsageZonePropertyType.java | 6 +- .../UsageZoneType.java | 14 +- .../UtilityNetworkConnectionPropertyType.java | 6 +- .../UtilityNetworkConnectionType.java | 6 +- .../WastePropertyType.java | 6 +- .../WasteType.java | 6 +- .../WaterPropertyType.java | 6 +- .../WaterType.java | 6 +- .../WavelengthRangeType.java | 4 +- .../WeatherDataPropertyType.java | 6 +- .../WeatherDataType.java | 6 +- .../WeatherStationPropertyType.java | 6 +- .../WeatherStationType.java | 4 +- .../package-info.java | 8 +- .../ade/energy3/bind/EnergyADEMarshaller.java | 4 +- .../energy3/bind/EnergyADEUnmarshaller.java | 3 +- .../energy3/model/core/AbstractResource.java | 2 +- .../BuildingAtticThermalStatusProperty.java | 2 +- ...BuildingBasementThermalStatusProperty.java | 2 +- .../model/core/BuildingFloorAreaProperty.java | 2 +- .../BuildingHeightAboveGroundProperty.java | 2 +- .../model/core/BuildingHeightProperty.java | 2 +- .../model/core/BuildingVolumeProperty.java | 2 +- .../model/core/QualifiedAreaProperty.java | 2 +- .../model/core/QualifiedHeightProperty.java | 2 +- .../model/core/QualifiedVolumeProperty.java | 2 +- .../model/core/SuitabilityProperty.java | 2 +- .../energy3/model/module/EnergyADEModule.java | 8 +- ...2.0_beta7.xsd => Energy_ADE_3.0_beta7.xsd} | 510 +++++++++--------- 176 files changed, 986 insertions(+), 984 deletions(-) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractBuildingPartitionPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractBuildingPartitionType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractBuildingUnitPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractBuildingUnitType.java (88%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractDevicePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractDeviceType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractLayeredConstructionPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractLayeredConstructionType.java (93%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractLibraryPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractLibraryType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractMaterialPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractMaterialType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractOpticalProperty_PropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractOpticalProperty_Type.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractQualifiedAttributePropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractQualifiedAttributeType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractResourcePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractResourceType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractSchedulePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractScheduleType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractSolarCollectorPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractSolarCollectorType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractThermalZonePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractThermalZoneType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractTimeSeriesPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractTimeSeriesType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractUsageZonePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AbstractUsageZoneType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AtomicSchedulePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AtomicScheduleType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AtticFloorSurfacePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/AtticFloorSurfaceType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BasementCeilingSurfacePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BasementCeilingSurfaceType.java (93%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BoilerPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BoilerType.java (90%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BuildingUnitPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/BuildingUnitType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/CityObjectRelationPropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/CityObjectRelationType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/CompositeSchedulePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/CompositeScheduleType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ConstructionMaterialPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ConstructionMaterialType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/DeviceOperationPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/DeviceOperationType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/DualValueSchedulePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/DualValueScheduleType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ElectricalStorageDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ElectricalStorageDeviceType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EmissivityPropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EmissivityType.java (90%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EnergyPerformanceCertificatePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EnergyPerformanceCertificateType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EnergyPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/EnergyType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/FoodPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/FoodType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GasPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GasType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericDeviceType.java (86%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericElectricalDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericElectricalDeviceType.java (86%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericSolarCollectorPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/GenericSolarCollectorType.java (87%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/HeatPumpPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/HeatPumpType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/IntermediateFloorSurfacePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/IntermediateFloorSurfaceType.java (93%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/InterpolationTypeValueType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayerPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayerType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayeredConstructionLibraryPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayeredConstructionLibraryType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayeredConstructionPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LayeredConstructionType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LightingDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/LightingDeviceType.java (86%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/MaterialLibraryPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/MaterialLibraryType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/MovableShadingDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/MovableShadingDeviceType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/NetworkConnectionStatusValueType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ObjectFactory.java (87%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/OccupantsPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/OccupantsType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/OtherResourcePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/OtherResourceType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PartyWallSurfacePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PartyWallSurfaceType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PhotovoltaicCollectorPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PhotovoltaicCollectorType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PhotovoltaicThermalCollectorPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/PhotovoltaicThermalCollectorType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedAreaPropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedAreaType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedHeightPropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedHeightType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedVolumePropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/QualifiedVolumeType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ReflectancePropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ReflectanceType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RefurbishmentMeasurePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RefurbishmentMeasureType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RegularTimeSeriesFilePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RegularTimeSeriesFileType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RegularTimeSeriesPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RegularTimeSeriesType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/RelatedToPropertyType.java (99%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ResourceStatusValueType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ReverseLayeredConstructionPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ReverseLayeredConstructionType.java (90%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ScheduleComponentPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ScheduleComponentType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ScheduleLibraryPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ScheduleLibraryType.java (91%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SensorConnectionPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SensorConnectionType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SolarThermalCollectorPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SolarThermalCollectorType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SolidMaterialPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SolidMaterialType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SuitabilityPropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SuitabilityType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/SurfaceSideType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ThermalStatusValueType.java (95%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ThermalStorageDevicePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ThermalStorageDeviceType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ThermalZonePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/ThermalZoneType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TransmittancePropertyType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TransmittanceType.java (90%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TypicalValuesTimeSeriesFilePropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TypicalValuesTimeSeriesFileType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TypicalValuesTimeSeriesPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/TypicalValuesTimeSeriesType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UrbanFunctionAreaPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UrbanFunctionAreaType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UrbanSpacePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UrbanSpaceType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UsageZonePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UsageZoneType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UtilityNetworkConnectionPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/UtilityNetworkConnectionType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WastePropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WasteType.java (96%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WaterPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WaterType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WavelengthRangeType.java (94%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WeatherDataPropertyType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WeatherDataType.java (97%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WeatherStationPropertyType.java (98%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/WeatherStationType.java (92%) rename src-gen/org/sig3d/citygml/{energyADE2beta7 => energyADE3beta7}/package-info.java (68%) rename src/main/resources/{Energy_ADE_2.0_beta7.xsd => Energy_ADE_3.0_beta7.xsd} (81%) diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index 11adc51d680b277910716c97a92444a858af26e6..0f403a148b54daf73922d22f2dc1f64adc8376eb 100644 GIT binary patch delta 24269 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 delta 10151 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 literal 17 UcmZR6EmlzQU~WVS0|dkZ05vWIivR!s diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f9e84cedadfdbfe51035b6d011510a000d670f32..6fb6f7676e792f75550bca0db0e97018179f6e03 100644 GIT binary patch literal 17 VcmZSPc@mf=`TB7$0~j#6001#s1Y`gJ literal 17 UcmZSPc@mf=`TB7$0|Xoa05RAE;{X5v diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 985b68b270d049400be53d9528c8323bf14a5145..401ce4a16ae129635ea9be95c5d4eb26374de5de 100644 GIT binary patch literal 8 PcmZQzV4S78s{S|t2WJAY literal 8 PcmZQzV4V3_C{+>w2e1MT diff --git a/README.md b/README.md index 46afffb..33db983 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 88f4bb5..1c221db 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 752f7f3..127ecc0 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 03af197..34ba8cc 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 f34baae..4d4de1e 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 ddc6cc3..a2d106d 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 1f07fce..3e358c4 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 d773bfb..099c867 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 4488aa9..97691dd 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 99cddfe..ed8b880 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 8e58948..302df5d 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 b1dd3e3..f5d0b6d 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 d5586a6..b861662 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 6a38de8..36ccbce 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 abe4adc..9346d5d 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 11c3506..b1d110c 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 048845c..e1f292e 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 6dbeb9d..e33e3d2 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 2050e07..742fd66 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 6585d16..9be20a4 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 9bb4442..a58229a 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 0afe1af..cd9b198 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 78e9c66..946d057 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 df5de07..9e69525 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 002e025..899826b 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 73fcc7d..b22dd8a 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 3380fa1..f75d475 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 564fc03..4e9494f 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 82fc1d1..9ee2114 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 ed2b9e9..75207c6 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 ac54ec0..8c441db 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 7a63ef2..8949ea9 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 0ac0d13..e7e4b53 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 c9b1658..1881a90 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 a52d0cd..b7bf0cb 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 4ed3122..acd0218 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 4380d74..bc47f58 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 ddcc82f..a1867ae 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 480e6ec..070403e 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 3e7b72a..3aff5d0 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 5dae28c..9eb235b 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 0a32afd..9665a6e 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 fb3c802..99c6f96 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 6ab815b..d095289 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 0950f8c..8f08af7 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 27fa5ca..ee2f253 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 43fcbc4..c2d37fc 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 57f25eb..8a54212 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 5ebad27..4d6c80e 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 f6bf801..d66f016 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 6fcb194..13a2581 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 e72926c..2331c20 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 f042c0e..6a204d7 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 ef1768f..2c7a626 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 bd4a9a6..5f7c42e 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 91f01ce..afe80c1 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 e372489..0d6b4ff 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 2fef01d..350867d 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 2831002..70153e7 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 6c375b3..26ee904 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 f22d7cc..406f4f7 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 ec4c3ed..7a6d6e8 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 292ac15..6123993 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 5fb7627..cbc19dc 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 7d44c58..39ff3bd 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 1397a04..1230dac 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 1019e16..a04b8c7 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 848cc40..6ceb543 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 23b061e..eb8f375 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 f428e7a..7cb8209 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 3940d67..94f3427 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 307f48d..8dec322 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 9293ab5..b96d51d 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 c6c88b1..67a65ac 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 4289cf4..a8f3856 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 3636d92..9b99ee6 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 ece6ba1..a8737a2 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 5943c29..79d5d34 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 910c5e7..5b22f7b 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 c3365aa..3057c2e 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 655e3a5..98a787f 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 052f22d..a48b263 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 ee86fbb..d5a3cc9 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 1268480..44e139d 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 9d94a1d..85649f2 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 112988b..1bb3220 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 4452a9e..691ff41 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 8c1769a..40f89e2 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 3267b2d..6ec5d01 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 30201e6..d3f14d3 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 7553da3..fe4f3d2 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 1692063..8b5b01c 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 c631788..fb6f8cd 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 80737f3..267c852 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 2f76280..c7206e6 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 8908c67..b98e9ae 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 cdf8912..cdcb17a 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 87c5f3c..d202f5c 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 028d1d8..e91c571 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 166a288..c2c157c 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 2ce6725..c6e612f 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 bbc7639..4927e2e 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 79b53b6..b4d5f85 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 fab62f3..62a2fa5 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 5056cfc..2134896 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 72552b5..70896e1 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 bd47cba..3acbb51 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 4d9061d..99ee44d 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 7601c10..8140897 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 906f519..1a55f30 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 045e7bf..d2b50f7 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 5dccc72..5617855 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 bcea54b..71b8a57 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 cd21a1a..5bd44a4 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 aee1a35..710a399 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 b53192d..dee84cc 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 6fc1f3e..1511e70 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 8c12430..9274f51 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 f64070e..62938d7 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 bd0ea6e..ed1d9e1 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 d928708..d632dd0 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 888288d..bab1c30 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 a10c8c3..a3c9d99 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 034c70a..ded2a84 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 35d2645..a18fde0 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 5eb229f..a0f97e3 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 e09c25d..0ee97c2 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 61b3815..f531485 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 dfaa04b..bdfacc6 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 1d69622..de511f8 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 e3291d9..a8124d3 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 1ee36e6..c97f3a8 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 9e79326..ada8b82 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 bfb0909..f43383d 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 a0d37bd..8b80b72 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 8d6bb5c..01f3307 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 c8799ea..6de2ab0 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 968d44d..fe124c6 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 041b15e..e5a903f 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 a5c6696..1e7c14e 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 794d54c..749e48d 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 60be895..095d04c 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 d5a5cbf..22358ba 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 a9fc767..ab16f32 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 b185d79..b1aa16c 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 5232752..7719ae3 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 f22c4c1..977a698 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 2023450..e9fdd9b 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 e32c70a..4dde5ab 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 443af02..da39c2e 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 ecfba0d..6ec5af8 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 4b0dede..bf8694b 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 8f13a7f..30629af 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 32faba3..377cf9c 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 17a8d87..7e297d5 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 a790ebd..e737290 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 c3255fb..41559f223 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 1be28ad..00b2b8a 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 0c0f6ba..c35ce84 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 f646011..3b533ff 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 efe8a2e..e7ad623 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 298183f..23c63fe 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 a2ffcd3..6183e52 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 ae11677..140fd7d 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 9bc9236..fb94451 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 4cb6b78..2ad7f63 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 bef6563..1030d72 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 b310040..0dedf79 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 578d1ce..4c4a595 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 cc3ad18..254f3f9 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 5a9c447..c3ff1f2 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 1aea0db..d71acac 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"
   
   
     
-      
+      
     
     
   
-- 
GitLab