diff --git a/.idea/artifacts/energy_ade2_citydb_jar.xml b/.idea/artifacts/energy_ade2_citydb_jar.xml
deleted file mode 100644
index 0d20439dc692bac9477de29f9590785c97c3533b..0000000000000000000000000000000000000000
--- a/.idea/artifacts/energy_ade2_citydb_jar.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="energy-ade2-citydb:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/energy_ade2_citydb_jar</output-path>
-    <root id="archive" name="energy-ade2-citydb.jar">
-      <element id="module-output" name="energy-ade2-citydb.main" />
-      <element id="module-output" name="DigiTwins4PEDs.main" />
-      <element id="module-output" name="DigiTwins4PEDs.energy-ade-samples.main" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.tomcat/tomcat-juli/10.1.29/e98eedfa681bbf3b53d409567613cef32b6092c3/tomcat-juli-10.1.29.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.glassfish.jaxb/xsom/2.3.2/157dc2bf479c524d63a214e8fe9888f45a667db/xsom-2.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-params/5.7.1/6f81b3c053433a8a40a378d2b4f056c5c31e50ff/junit-jupiter-params-5.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.oracle.sdoapi/sdoapi/23.5.0.24.07/b9edd683fb98e3d00a2732e9e96b2dde14e29f6f/sdoapi-23.5.0.24.07.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.16.0/3eb54effe40946dfb06dc5cd6c7ce4116cd51ea4/commons-lang3-3.16.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools.ogc/net.opengis.ows/31.3/949e4c83a8ccae7142e4e5962dcd069c0c2b5258/net.opengis.ows-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.glassfish.jaxb/txw2/2.3.2/ce5be7da2e442c25ec14c766cb60cb802741727b/txw2-2.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.16.1/377d592e740dc77124e0901291dbfaa6810a200e/commons-io-2.16.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.emf/org.eclipse.emf.common/2.15.0/e0f1608a9855651e899d609b106ae78f903a2f04/org.eclipse.emf.common-2.15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.tika/tika-core/2.9.2/796a21391780339e3d4862626339b49df170024e/tika-core-2.9.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.locationtech.jts/jts-core/1.20.0/25b72c9548a328cb1aea8a6b89d710a31ade5403/jts-core-1.20.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-launcher/1.7.1/fba1a549c3b51882a912eb454cad924a573d0df4/junit-platform-launcher-1.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.media/jai_core/1.1.3/b179d2efb1174658483e8b41bf4ac9d2eb5de438/jai_core-1.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools/gt-epsg-wkt/31.3/71222b6e4900a9a3599f9f670ccfcb29dc065b83/gt-epsg-wkt-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-core/5.5.0/499325bfd1e59f2914c774a4cf0dfbdad771821b/impexp-core-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.activation/jakarta.activation-api/1.2.1/562a587face36ec7eff2db7f2fc95425c6602bc1/jakarta.activation-api-1.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents.core5/httpcore5/5.1.3/d1638d1e5f2793f187d4144c702a93524ba6fd3b/httpcore5-5.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/java3d/j3d-core-utils/1.5.2/b4771c3c5a4f7088e27171ead7f20f9fbe07bc18/j3d-core-utils-1.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.xmlresolver/xmlresolver/5.2.2/5624ede8b8e374979194acaae9f34cff23b62b3e/xmlresolver-5.2.2-data.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/swingx-all/1.6.10/21ce028e26ff0259d50c4c66aa80a96ac5fccc00/swingx-all-1.6.10.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-commons/1.10.0/d533ff2c286eaf963566f92baf5f8a06628d2609/junit-platform-commons-1.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.sun.istack/istack-commons-runtime/3.0.8/d6a97364045aa6b99bf2d3c566a3f98599c2d296/istack-commons-runtime-3.0.8.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-commons/1.7.1/7c49f0074842d07f4335de2389d624a7437d1407/junit-platform-commons-1.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-engine/1.7.1/d276a968c57f5d60a421dedd1f8b6ca2fae09e86/junit-platform-engine-1.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.univocity/univocity-parsers/2.9.1/81827d186e42129f23c3f1e002b757ad4b4e769/univocity-parsers-2.9.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.formdev/flatlaf-swingx/3.5.1/302fc178747b5dc0ef6e3916756b7f03ad87448d/flatlaf-swingx-3.5.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.vertical-blank/sql-formatter/2.0.5/96c4c0e7c0a5be639ae8f56ca812410b1a00f5d2/sql-formatter-2.0.5.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-engine/5.7.1/7fcfa59c5533abb41f86b1408960737eeaf1f49f/junit-jupiter-engine-5.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/info.picocli/picocli/4.7.6/77c2cb87814b6a03d431fc856024a9f8ff605ad4/picocli-4.7.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.17.1/973638b7149d333563584137ebf13a691bb60579/commons-codec-1.17.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-client-gui/5.5.0/9ae31b0777ce3009d3625ebc86672e4bec726a70/impexp-client-gui-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools/gt-metadata/31.3/1a9a85d27dbc53d479450203aae6ff678859ffed/gt-metadata-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools/gt-api/31.3/d12331559725dcc0758a0429c133873df3e99c42/gt-api-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.27.0/91b2c29d8a6148b5e2e4930f070d4840e2e48e34/error_prone_annotations-2.27.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/tech.uom.lib/uom-lib-common/2.1/17d8a4458116466b004976f3c7834be185cffb86/uom-lib-common-2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ejml/ejml-core/0.41/92ac2bee332a5697c42e576b94d563ba8c25877c/ejml-core-0.41.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter/5.7.1/a4a80ea9b0cca47781edcf9f2d4f1f4f7ce9436e/junit-jupiter-5.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/3dcitydb-ade-citygml4j/1.2.0/fe169ce5b14e28eba49b12899940722d4c4ce94a/3dcitydb-ade-citygml4j-1.2.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jvnet.staxex/stax-ex/1.8.1/78011e483a21102fb4858f3e8f269a677e50aa23/stax-ex-1.8.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.formdev/flatlaf/3.5.1/8e4295f9ba5756736fa60a3a567fd9cd8840594f/flatlaf-3.5.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.oracle.database.jdbc/ojdbc11/23.5.0.24.07/6e07003d57be5e280ef0492209e20fa27edec5b6/ojdbc11-23.5.0.24.07.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/it.geosolutions.jgridshift/jgridshift-core/1.3/314702a7b6e634e1c74589983a6762974b9c51c8/jgridshift-core-1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/swingx-ws/1.1.6/3b49e4b6ab3bd66ee753765539c89abe7ecedec7/swingx-ws-1.1.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.27.1/a19151084758e2fbb6b41eddaa88e7b8ff4e6599/commons-compress-1.27.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.sun.xml.fastinfoset/FastInfoset/1.2.16/4eb6a0adad553bf759ffe86927df6f3b848c8bea/FastInfoset-1.2.16.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-qual/3.42.0/638ec33f363a94d41a4f03c3e7d3dcfba64e402d/checker-qual-3.42.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-api/5.10.0/2fe4ba3d31d5067878e468c96aa039005a9134d3/junit-jupiter-api-5.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.opentest4j/opentest4j/1.3.0/152ea56b3a72f655d4fd677fc0ef2596c3dd5e6e/opentest4j-1.3.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.sun.xml.bind.external/relaxng-datatype/2.3.2/d202e2c8bdd0a5286490260e311f0df1955f4dbf/relaxng-datatype-2.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.xmlresolver/xmlresolver/5.2.2/152378e04ba01898847bf38fad5023c7d52f0c9d/xmlresolver-5.2.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.tomcat/tomcat-jdbc/10.1.29/76f4a58c65976a6340981ca5438f8f0ed7e3913e/tomcat-jdbc-10.1.29.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.postgis/postgis-geometry/2024.1.0/5796f9c7af460346155e7882d70941ac88779a7c/postgis-geometry-2024.1.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-api/5.7.1/a7261dff44e64aea7f621842eac5977fd6d2412d/junit-jupiter-api-5.7.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools/gt-referencing/31.3/c61240c5396e0e1828ea6b35427570e6741ccbf6/gt-referencing-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.11.0/527175ca6d81050b53bdd4c457a6d6e017626b0e/gson-2.11.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-config/5.5.0/76dde140997188d79a178bf200ab015e3ff34234/impexp-config-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/2.0.13/80229737f704b121a318bba5d5deacbcf395bc77/slf4j-api-2.0.13.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/texture-atlas-creator/1.5.0/d452d9b768b88dfa4cbb8faca93fb7fbff4d166a/texture-atlas-creator-1.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.weisj/jsvg/1.4.0/3f057f61a79b63015dcdb3ae15f935951e4bedd9/jsvg-1.4.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.formdev/flatlaf-extras/3.5.1/42cf9ed86d4ae9d95a6013db792c8f2df642ca56/flatlaf-extras-3.5.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.emf/org.eclipse.emf.ecore/2.15.0/ccfc09c8b6a0d4fadde09216d8a07678d38998de/org.eclipse.emf.ecore-2.15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.measure/unit-api/2.1.3/76e3c98cc101cdb8ebf437e4327e8de4ab92613/unit-api-2.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apiguardian/apiguardian-api/1.1.1/7ea550039f115fcc40990925490b8ebd4b93024a/apiguardian-api-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citygml4j/citygml4j/2.13.0/e08fae3557b5e0d51bd4882c9e87656248de277a/citygml4j-2.13.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.5.2/79846ba34cbd89e2422d74d53752f993dcc2ccaf/vecmath-1.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/si.uom/si-quantity/2.1/5617d2cf30898ffcc760807009fe947483bd867b/si-quantity-2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.geographiclib/GeographicLib-Java/1.49/7ff2164e69fa04e1ef2ca5079e1cee298a936ea1/GeographicLib-Java-1.49.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents.core5/httpcore5-h2/5.1.3/4664b59b09f5ee008e37a963bbb92f4068e91696/httpcore5-h2-5.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-vis-plugin/5.5.0/b1e50511d3a5bf50e5dd174b89454719640343ee/impexp-vis-plugin-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.platform/junit-platform-engine/1.10.0/276c4edcf64fabb5a139fa7b4f99330d7a93b804/junit-platform-engine-1.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.postgresql/postgresql/42.7.4/264310fd7b2cd76738787dc0b9f7ea2e3b11adc1/postgresql-42.7.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-pool/commons-pool/1.5.4/75b6e20c596ed2945a259cea26d7fadd298398e6/commons-pool-1.5.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.saxon/Saxon-HE/12.5/57c007520e2879387b8d13d0a512e9566eeffa73/Saxon-HE-12.5.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.postgis/postgis-jdbc/2024.1.0/4d369c43c20784bf61a3a2e52ec939dab3e1a2cc/postgis-jdbc-2024.1.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.15.0/9aa1a584be1df1eb0ef8fae7123784af6e51f47a/org.eclipse.emf.ecore.xmi-2.15.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-util/5.5.0/df531278608e84dee60df5d5836f818e7798708e/impexp-util-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-params/5.10.0/9041c7365495a897a64782ea5a6fdb99dab1814e/junit-jupiter-params-5.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citygml4j/citygson/1.2.0/e06d33cb006b87d0951d1dab3e671686af7295ba/citygson-1.2.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools/gt-epsg-extension/31.3/eee976608c4fa889f07830cc0c59f1d7c2a9145c/gt-epsg-extension-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/impexp-client-cli/5.5.0/a5d3334b4524edf16c93f7277e730483551e7a9f/impexp-client-cli-5.5.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/si.uom/si-units/2.1/7e812192ff1abbef6c79123249840c42b4e145d4/si-units-2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/java3d/j3d-core/1.5.2/fc4d1da847ea5c4526bac4af90faafcbe60ba3a8/j3d-core-1.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.citydb/sqlbuilder/2.3.0/8106eb1cc6f51e720eef07ad2928069684915718/sqlbuilder-2.3.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter/5.10.0/8fea1d9c58b2156f1b998f2f18da04bc9e087f74/junit-jupiter-5.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2/8d49996a4338670764d7ca4b85a1c4ccf7fe665d/jakarta.xml.bind-api-2.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.junit.jupiter/junit-jupiter-engine/5.10.0/90587932d718fc51a48112d33045a18476c542ad/junit-jupiter-engine-5.10.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.geotools.ogc/org.w3.xlink/31.3/ce8814c9858f554d7819d4a835a6a371a693604/org.w3.xlink-31.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.fifesoft/rsyntaxtextarea/3.5.1/b862174232441c6ed6361765ffc8b7e4584ca208/rsyntaxtextarea-3.5.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/jakarta.annotation/jakarta.annotation-api/1.3.4/a858ec3f0ebd2b8d855c1ddded2cde9b381b0517/jakarta.annotation-api-1.3.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apiguardian/apiguardian-api/1.1.0/fc9dff4bb36d627bdc553de77e1f17efd790876c/apiguardian-api-1.1.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/systems.uom/systems-common/2.1/a173cc6f1fedc8b32498d6cc9599251baa72de27/systems-common-2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.glassfish.jaxb/jaxb-runtime/2.3.2/5528bc882ea499a09d720b42af11785c4fc6be2a/jaxb-runtime-2.3.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents.client5/httpclient5/5.1.3/13c984b7b881afcff3a7f0bb95878724a48a4b66/httpclient5-5.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.opentest4j/opentest4j/1.2.0/28c11eb91f9b6d8e200631d46e20a7f407f2a046/opentest4j-1.2.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-nop/2.0.13/f46230afff57b938ff9e7ac315270a83fdf21e87/slf4j-nop-2.0.13.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ejml/ejml-ddense/0.41/782c80d4c3c8a3432c4641f24c177f336a360f9c/ejml-ddense-0.41.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/tech.units/indriya/2.1.3/d3cc55737619a2f50382592d369726e49d4f69bf/indriya-2.1.3.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.h2database/h2/2.3.232/4fcc05d966ccdb2812ae8b9a718f69226c0cf4e2/h2-2.3.232.jar" path-in-jar="/" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bf33e9f6fde112934eedf4ad9e4b3c34f8fc07f9..fbe967503830d4494441de08afed467f8e19adda 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -17,7 +16,7 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:/Gradle" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 63758e754572d536422997ed68348087a83ce70d..0000000000000000000000000000000000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="2">
-            <item index="0" class="java.lang.String" itemvalue="transformers" />
-            <item index="1" class="java.lang.String" itemvalue="pygls" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 669158d9d3c97cb1b22a6a0d1f265405e0522c6a..315e3a464028383216dead6bf75531624d179cc4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,13 +1,5 @@
 <?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$/../digitwins4peds" />
-    <file type="web" url="file://$PROJECT_DIR$/../energy-ade-2-citygml4j" />
-    <file type="web" url="file://$PROJECT_DIR$" />
-    <file type="web" url="file://$PROJECT_DIR$/../energy-ade-3-citygml4j" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="liberica-17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="liberica-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 2b63946d5b31084bbb7dda418ceb3d75eb686373..0000000000000000000000000000000000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8fa9d67a29ab18c22f4f4987650ea8abe6b41e25..35eb1ddfbbc029bcab630581847471d7f238ec53 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../energy-ade-3-citygml4j" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 42bf7a9671cfaeb5455386f50e38e45e30d2c522..e97f50a574d098872c16ca28c8099f10fb728fe5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ plugins {
 }
 
 group = 'de.stuttgart.hft'
-version = 'beta7-0.2'
-description 'Energy ADE 3 (beta 7) extension for the 3DCityDB - release 0.2'
+version = 'beta7-0.3'
+description 'Energy ADE 3 (beta 7) extension for the 3DCityDB - release 0.3'
 
 repositories {
     maven {
diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java
index 968d9b2dbee63cc098ab7d3e462c9fe56173a3a0..60106713368215744e27f00dacef74604ed31e00 100644
--- a/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java
+++ b/src/main/java/de/stuttgart/hft/ade/energy3/exporter/TimeSeriesExporter.java
@@ -1,6 +1,7 @@
 package de.stuttgart.hft.ade.energy3.exporter;
 
 import de.stuttgart.hft.ade.energy3.schema.ADETable;
+import net.opengis.gml.UnitOfMeasureType;
 import org.citydb.core.ade.exporter.ADEExporter;
 import org.citydb.core.ade.exporter.CityGMLExportHelper;
 import org.citydb.core.operation.exporter.CityGMLExportException;
@@ -8,6 +9,7 @@ import org.citygml4j.ade.energy3.model.supportingClasses.*;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.basicTypes.MeasureList;
 
+
 import java.net.URI;
 import java.sql.*;
 import java.time.*;
@@ -17,6 +19,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+
+
 public class TimeSeriesExporter implements ADEExporter {
 
     private final CityGMLExportHelper helper;
@@ -71,13 +75,30 @@ public class TimeSeriesExporter implements ADEExporter {
 
                 if (abstractTimeSeries instanceof RegularTimeSeries) {
                     RegularTimeSeries regularTimeSeries = (RegularTimeSeries) abstractTimeSeries;
-                    Timestamp period_begin = rs.getTimestamp(7);
-                    Timestamp period_end = rs.getTimestamp(8);
 
-                    if (period_begin != null && period_end != null) {
-                        ZoneId zoneId = ZoneId.systemDefault();
-                        ZonedDateTime beginZdt = period_begin.toInstant().atZone(zoneId);
-                        ZonedDateTime endZdt = period_end.toInstant().atZone(zoneId);
+                    //Timestamp period_begin = rs.getTimestamp(7);
+                    //Timestamp period_end = rs.getTimestamp(8);
+
+                    //if (period_begin != null && period_end != null) {
+                       // ZoneId zoneId = ZoneId.systemDefault();
+                       // ZonedDateTime beginZdt = period_begin.toInstant().atZone(zoneId);
+                       // ZonedDateTime endZdt = period_end.toInstant().atZone(zoneId);
+
+                       //TimePeriod timePeriod = new TimePeriod();
+                       // timePeriod.setBeginPosition(beginZdt);
+                       // timePeriod.setEndPosition(endZdt);
+
+                       // TimePeriodProperty timePeriodProperty = new TimePeriodProperty();
+                       // timePeriodProperty.setTimePeriod(timePeriod);
+                        //regularTimeSeries.setTemporalExtent(timePeriodProperty);
+                   // }
+
+                    OffsetDateTime beginOffset = rs.getObject(7, OffsetDateTime.class);
+                    OffsetDateTime endOffset = rs.getObject(8, OffsetDateTime.class);
+
+                    if (beginOffset != null && endOffset != null) {
+                        ZonedDateTime beginZdt = beginOffset.atZoneSameInstant(ZoneOffset.UTC);
+                        ZonedDateTime endZdt   = endOffset.atZoneSameInstant(ZoneOffset.UTC);
 
                         TimePeriod timePeriod = new TimePeriod();
                         timePeriod.setBeginPosition(beginZdt);
@@ -113,10 +134,27 @@ public class TimeSeriesExporter implements ADEExporter {
                 } else if (abstractTimeSeries instanceof RegularTimeSeriesFile) {
                     RegularTimeSeriesFile regularTimeSeriesFile = (RegularTimeSeriesFile) abstractTimeSeries;
 
-                    ZonedDateTime beginZdt = rs.getObject(7, ZonedDateTime.class);
-                    ZonedDateTime endZdt = rs.getObject(8, ZonedDateTime.class);
+                    //ZonedDateTime beginZdt = rs.getObject(7, ZonedDateTime.class);
+                    //ZonedDateTime endZdt = rs.getObject(8, ZonedDateTime.class);
+
+                    //if (beginZdt != null && endZdt != null) {
+                    //    TimePeriod timePeriod = new TimePeriod();
+                    //    timePeriod.setBeginPosition(beginZdt);
+                    //    timePeriod.setEndPosition(endZdt);
+
+                    //    TimePeriodProperty timePeriodProperty = new TimePeriodProperty();
+                    //    timePeriodProperty.setTimePeriod(timePeriod);
+                    //    regularTimeSeriesFile.setTemporalExtent(timePeriodProperty);
+                   // }
+
+                    OffsetDateTime beginOffset = rs.getObject(7, OffsetDateTime.class);
+                    OffsetDateTime endOffset = rs.getObject(8, OffsetDateTime.class);
+
+                    if (beginOffset != null && endOffset != null) {
+                        // Convert to ZonedDateTime if your model requires it
+                        ZonedDateTime beginZdt = beginOffset.atZoneSameInstant(ZoneOffset.UTC);
+                        ZonedDateTime endZdt   = endOffset.atZoneSameInstant(ZoneOffset.UTC);
 
-                    if (beginZdt != null && endZdt != null) {
                         TimePeriod timePeriod = new TimePeriod();
                         timePeriod.setBeginPosition(beginZdt);
                         timePeriod.setEndPosition(endZdt);
@@ -225,12 +263,17 @@ public class TimeSeriesExporter implements ADEExporter {
                 } else if (abstractTimeSeries instanceof TypicalValuesTimeSeriesFile) {
                     TypicalValuesTimeSeriesFile timeSeriesFile = (TypicalValuesTimeSeriesFile) abstractTimeSeries;
 
-                    Time start_time = rs.getTime(9);
-                    if (start_time != null) {
-                        LocalTime localTime = start_time.toLocalTime();
-                        ZonedDateTime zonedDateTime = localTime.atDate(LocalDate.now())
-                                .atZone(ZoneId.systemDefault());
-                        timeSeriesFile.setStartTime(zonedDateTime);
+                    // Read the TIME column (no date)
+                    Time sqlTime = rs.getTime(9);
+                    if (sqlTime != null) {
+                        LocalTime localTime = sqlTime.toLocalTime();
+
+                        // Combine with dummy date and force UTC → exports as 12:30:00Z
+                        ZonedDateTime utcTime = localTime
+                                .atDate(LocalDate.of(2000, 1, 1))
+                                .atZone(ZoneOffset.UTC);
+
+                        timeSeriesFile.setStartTime(utcTime);  // Will export as ...T12:30:00Z
                     }
 
                     Integer start_day = rs.getObject(10) != null ? rs.getInt(10) : null;
@@ -326,7 +369,9 @@ public class TimeSeriesExporter implements ADEExporter {
                     }
 
                     String uom = rs.getString(18);
-                    if (uom != null) {
+                    if (uom != null && !uom.trim().isEmpty()) {
+                        UnitOfMeasureType uomType = new UnitOfMeasureType();
+                        uomType.setUom(uom.trim());
                         sensorConnection.setUom(uom);
                     }
 
@@ -353,7 +398,7 @@ public class TimeSeriesExporter implements ADEExporter {
                     String base_url = rs.getString(27);
                     if (base_url != null) {
                         try {
-                            sensorConnection.setBaseURL(URI.create(base_url));
+                            sensorConnection.setBaseURL(URI.create(base_url.replace("%20", " ")));
                         } catch (IllegalArgumentException e) {
                             System.out.println("Invalid base_url for TimeSeries id=" + timeSeriesId + ": " + base_url);
                         }
diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java
index ae1b87b2ca043535462d09c1046dca7c26c44352..8822ab481664cc4fb2e0a0d2cd65aec761427374 100644
--- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java
+++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/ImportManager.java
@@ -132,3 +132,4 @@ public class ImportManager implements ADEImportManager {
         return type.cast(importer);
     }
 }
+
diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java
index c38e69b919aefc21d024ff956afd7ba835bf04bf..c38ad35ac2106a4a9b423bf8b8eae20c7c323ed8 100644
--- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java
+++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/TimeSeriesImporter.java
@@ -9,9 +9,13 @@ import org.citydb.core.operation.importer.CityGMLImportException;
 import org.citydb.core.operation.importer.util.AttributeValueJoiner;
 import org.citygml4j.ade.energy3.model.supportingClasses.*;
 
+
 import java.sql.*;
+import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.ZonedDateTime;
 import java.util.Collections;
+import java.time.ZoneOffset;
 
 public class TimeSeriesImporter implements ADEImporter {
 
@@ -49,10 +53,15 @@ public class TimeSeriesImporter implements ADEImporter {
                 psTimeSeries.setString(17, regularTimeSeries.getValues().getUom());
             }
             if (regularTimeSeries.isSetTemporalExtent()){
-                Timestamp beginPosition = Timestamp.from(regularTimeSeries.getTemporalExtent().getTimePeriod().getBeginPosition().toInstant());
-                Timestamp endPosition = Timestamp.from(regularTimeSeries.getTemporalExtent().getTimePeriod().getEndPosition().toInstant());
-                psTimeSeries.setTimestamp(7, beginPosition);
-                psTimeSeries.setTimestamp(8, endPosition);
+                ZonedDateTime begin = regularTimeSeries.getTemporalExtent().getTimePeriod().getBeginPosition();
+                ZonedDateTime end   = regularTimeSeries.getTemporalExtent().getTimePeriod().getEndPosition();
+
+                // FIX 1: Force UTC so no timezone offset is applied
+                ZonedDateTime beginUTC = begin.withZoneSameInstant(ZoneOffset.UTC);
+                ZonedDateTime endUTC   = end.withZoneSameInstant(ZoneOffset.UTC);
+
+                psTimeSeries.setTimestamp(7, Timestamp.from(beginUTC.toInstant()));
+                psTimeSeries.setTimestamp(8, Timestamp.from(endUTC.toInstant()));
             }
             if (regularTimeSeries.isSetTimeInterval()) {
                 psTimeSeries.setDouble(14, regularTimeSeries.getTimeInterval().getValue());
@@ -76,10 +85,15 @@ public class TimeSeriesImporter implements ADEImporter {
             if (timeSeriesFile.isSetValueColumnNumber())
                 psTimeSeries.setLong(23, timeSeriesFile.getValueColumnNumber());
             if (timeSeriesFile.isSetTemporalExtent()){
-                Timestamp beginPosition = Timestamp.from(timeSeriesFile.getTemporalExtent().getTimePeriod().getBeginPosition().toInstant());
-                Timestamp endPosition = Timestamp.from(timeSeriesFile.getTemporalExtent().getTimePeriod().getEndPosition().toInstant());
-                psTimeSeries.setTimestamp(7, beginPosition);
-                psTimeSeries.setTimestamp(8, endPosition);
+                ZonedDateTime begin = timeSeriesFile.getTemporalExtent().getTimePeriod().getBeginPosition();
+                ZonedDateTime end   = timeSeriesFile.getTemporalExtent().getTimePeriod().getEndPosition();
+
+                // FIX 1: Force UTC
+                ZonedDateTime beginUTC = begin.withZoneSameInstant(ZoneOffset.UTC);
+                ZonedDateTime endUTC   = end.withZoneSameInstant(ZoneOffset.UTC);
+
+                psTimeSeries.setTimestamp(7, Timestamp.from(beginUTC.toInstant()));
+                psTimeSeries.setTimestamp(8, Timestamp.from(endUTC.toInstant()));
             }
             if (timeSeriesFile.isSetTimeInterval()) {
                 psTimeSeries.setDouble(14, timeSeriesFile.getTimeInterval().getValue());
@@ -115,8 +129,10 @@ public class TimeSeriesImporter implements ADEImporter {
             TypicalValuesTimeSeriesFile file = (TypicalValuesTimeSeriesFile) abstractTimeSeries;
             if (file.isSetStartTime()) {
                 LocalTime localTime = file.getStartTime().toLocalTime();
-                Time sqlTime = Time.valueOf(localTime);
-                psTimeSeries.setTime(9, sqlTime);
+                // Store as UTC timestamp (dummy date doesn't matter)
+                ZonedDateTime utc = localTime.atDate(LocalDate.of(2000, 1, 1))
+                        .atZone(ZoneOffset.UTC);
+                psTimeSeries.setTimestamp(9, Timestamp.from(utc.toInstant()));
             }
             if (file.isSetStartDay()) {
                 psTimeSeries.setInt(10, file.getStartDay());
@@ -160,8 +176,9 @@ public class TimeSeriesImporter implements ADEImporter {
             }
             if (sensorConnection.isSetObservationProperty())
                 psTimeSeries.setString(36, sensorConnection.getObservationProperty());
-            if (sensorConnection.isSetUom())
+            if (sensorConnection.isSetUom() && sensorConnection.getUom() != null) {
                 psTimeSeries.setString(18, sensorConnection.getUom());
+            }
             if (sensorConnection.isSetSensorID())
                 psTimeSeries.setString(37, sensorConnection.getSensorID());
             if (sensorConnection.isSetSensorName())
@@ -172,8 +189,11 @@ public class TimeSeriesImporter implements ADEImporter {
                 psTimeSeries.setString(36, sensorConnection.getObservationProperty());
             if (sensorConnection.isSetDataStreamID())
                 psTimeSeries.setString(30, sensorConnection.getDataStreamID());
-            if (sensorConnection.isSetBaseURL())
-                psTimeSeries.setString(27, sensorConnection.getBaseURL().toString());
+            if (sensorConnection.isSetBaseURL()) {
+                String url = sensorConnection.getBaseURL().toString();
+                // Convert space → %20 so PostgreSQL doesn't turn it into +
+                psTimeSeries.setString(27, url.replace(" ", "%20"));
+            }
             if (sensorConnection.isSetAuthType())
                 psTimeSeries.setString(25, sensorConnection.getAuthType().getValue());
                 psTimeSeries.setString(26, sensorConnection.getAuthType().getCodeSpace());
diff --git a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java
index 6da2289b58699bec30d621ce992955106d4375d3..3e729b82f29510a091f2b395e7daeb4375b803c1 100644
--- a/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java
+++ b/src/main/java/de/stuttgart/hft/ade/energy3/importer/WeatherDataImporter.java
@@ -118,4 +118,4 @@ public class WeatherDataImporter implements ADEImporter {
     public void close() throws CityGMLImportException, SQLException {
         ps.close();
     }
-}
+}
\ No newline at end of file