diff --git a/.gradle/8.10/executionHistory/executionHistory.bin b/.gradle/8.10/executionHistory/executionHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d66047d07c36d14ef57fdd6160bfaa5292e64c83
Binary files /dev/null and b/.gradle/8.10/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.10/executionHistory/executionHistory.lock b/.gradle/8.10/executionHistory/executionHistory.lock
index a7c921809f72dc0a2b6cbe3672ece16a4de3a26c..fe4b42a063bb392f3ce26e049bbbafb5eb6bc52b 100644
Binary files a/.gradle/8.10/executionHistory/executionHistory.lock and b/.gradle/8.10/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.10/fileHashes/fileHashes.bin b/.gradle/8.10/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..5d588781a5d96b423f58241d80946a5c618fc2a1
Binary files /dev/null and b/.gradle/8.10/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.10/fileHashes/fileHashes.lock b/.gradle/8.10/fileHashes/fileHashes.lock
index cb353c7604219649e48208694eae9f1adc2b311f..f3cb05fc5708fe224c7ecc4ae6a8bcc420e2ef8e 100644
Binary files a/.gradle/8.10/fileHashes/fileHashes.lock and b/.gradle/8.10/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.10/fileHashes/resourceHashesCache.bin b/.gradle/8.10/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4b4f8e69b6877d99d0dbbe7d8a10f98678126807
Binary files /dev/null and b/.gradle/8.10/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin
index 42e647c2eb4ebdb8d225bcc3d3364e059cc91195..e3921601d88af7f852ad342f6a9c5b6c8d8b7971 100644
Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock
index d67eb034038443a5e9e2c5efde81558dad89c734..d052672756583bf35d002ef5d32f5322916abcab 100644
Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 0337b24d1c38120625b7ae55c9e9969d3a1ba45b..6341a162e67d2145ad7a30172797bfc6d9d2ae90 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index e7656ed76c127bd9f7844ad96a58ee8d9635cc9c..022e6b6e54efc12580731144b8f4c6a22e61b348 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Fri Aug 08 19:48:11 CEST 2025
+#Wed May 13 09:11:16 CEST 2026
 gradle.version=8.5
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 8d70b208235741d00d3ab6c71a70ce14a66b04ea..c5929d97254d8a3ab3b8de0ed46680d0202d88ae 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 4629c7e90fc3cd6a4b1aa668e9b911b80e550ad4..f51d152fc3593740a303b78cd380e24d20034022 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..13566b81b018ad684f3a35fee301741b2734c8f4
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ae72afcc365aba229c9f1fb95370edba4cca570
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Gradle Imported" enabled="true">
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.24/13a394eed5c4f9efb2a6d956e2086f1d81e857d9/lombok-1.18.24.jar" />
+        </processorPath>
+        <module name="energy-ade-3-citygml4j.main" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b4669a717ee426299285bbd8ae78c1492f9b185
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/energy-ade-samples" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdc392fe877c32ab51d532fa67f65ff2e75e9061
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2cb9b0f74a81ae28d9dfecb668639ca6bebd1b61
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="liberica-17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5d1c69d78a73810135d0bfc2cb09d1f054638669
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/energy-ade-3-citygml4j.main.iml" filepath="$PROJECT_DIR$/.idea/modules/energy-ade-3-citygml4j.main.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/energy-ade-3-citygml4j.main.iml b/.idea/modules/energy-ade-3-citygml4j.main.iml
new file mode 100644
index 0000000000000000000000000000000000000000..afc1871cc7757cdda422087e24495a0836f6a1e8
--- /dev/null
+++ b/.idea/modules/energy-ade-3-citygml4j.main.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4ee1ede3dcef952395798c990db27120cb25caff..9f4b0a891ea059389d860c17aad90ac51fb02643 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,8 @@ java {
 
 allprojects {
     group 'org.citygml4j.ade'
-    version 'beta7-0.3'
-    description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.3'
+    version 'beta7-0.4'
+    description 'Energy ADE 3 (beta 7) extension for citygml4j - release 0.4'
 
     ext {
         citygml4jVersion = '2.13.1'
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 97f25c17b50a4442f8a6c3d2d88abbfb3832ebae..828635f3c3b36827f6aea4d082f6e4a1d8b5de73 100644
--- a/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
+++ b/src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java
@@ -73,7 +73,8 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(SensorConnection.class, this::createSensorConnection)
                             .with(WeatherData.class, this::createWeatherData)
                             .with(WeatherDataProperty.class, this::createWeatherDataProperty)
-                            .with(WeatherStation.class, this::createWeatherStation);
+                            .with(WeatherStation.class, this::createWeatherStation)
+                            .with(CityObjectRelationProperty.class, this::createCityObjectRelationProperty);
                 }
             } finally {
                 lock.unlock();
@@ -137,7 +138,9 @@ public class EnergyADEMarshaller implements ADEMarshaller {
                             .with(TypicalValuesTimeSeries.class, this::marshalTypicalValuesTimeSeries)
                             .with(TypicalValuesTimeSeriesFile.class, this::marshalTypicalValuesTimeSeriesFile)
                             .with(SensorConnection.class, this::marshalSensorConnection)
-                            .with(WeatherStationProperty.class, this::marshalWeatherStationProperty);
+                            .with(WeatherStationProperty.class, this::marshalWeatherStationProperty)
+                            .with(CityObjectRelationProperty.class, this::marshalCityObjectRelationProperty);
+
                 }
             } finally {
                 lock.unlock();
@@ -2245,6 +2248,10 @@ public class EnergyADEMarshaller implements ADEMarshaller {
         return factory.createRefurbishmentMeasureProperty(marshalRefurbishmentMeasureProperty(src));
     }
 
+    private JAXBElement<?> createCityObjectRelationProperty(CityObjectRelationProperty src) {
+        return factory.createRelatedTo(marshalCityObjectRelationProperty(src));
+    }
+
 
     private JAXBElement<?> createAbstractQualifiedAttributeProperty(AbstractQualifiedAttributeProperty src) {
         AbstractQualifiedAttribute attribute = src.getValue();