diff --git a/src/main/java/org/citydb/ade/bind/CityDBADEUnmarshaller.java b/src/main/java/org/citydb/ade/bind/CityDBADEUnmarshaller.java
index c11aacd..b767f65 100644
--- a/src/main/java/org/citydb/ade/bind/CityDBADEUnmarshaller.java
+++ b/src/main/java/org/citydb/ade/bind/CityDBADEUnmarshaller.java
@@ -28,17 +28,7 @@
 
 package org.citydb.ade.bind;
 
-import org.citydb.ade.model.CityProperty;
-import org.citydb.ade.model.CountryProperty;
-import org.citydb.ade.model.HouseNumberProperty;
-import org.citydb.ade.model.LastModificationDateProperty;
-import org.citydb.ade.model.LineageProperty;
-import org.citydb.ade.model.PoBoxProperty;
-import org.citydb.ade.model.ReasonForUpdateProperty;
-import org.citydb.ade.model.StateProperty;
-import org.citydb.ade.model.StreetProperty;
-import org.citydb.ade.model.UpdatingPersonProperty;
-import org.citydb.ade.model.ZipBoxProperty;
+import org.citydb.ade.model.*;
 import org.citygml4j.builder.jaxb.unmarshal.citygml.ade.ADEUnmarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller;
diff --git a/src/main/java/org/citydb/ade/bind/marshal/CityDBADE100Marshaller.java b/src/main/java/org/citydb/ade/bind/marshal/CityDBADE100Marshaller.java
index 5ef5f51..df86d36 100644
--- a/src/main/java/org/citydb/ade/bind/marshal/CityDBADE100Marshaller.java
+++ b/src/main/java/org/citydb/ade/bind/marshal/CityDBADE100Marshaller.java
@@ -29,17 +29,7 @@
 package org.citydb.ade.bind.marshal;
 
 import org.citydb.ade._3._1.ObjectFactory;
-import org.citydb.ade.model.CityProperty;
-import org.citydb.ade.model.CountryProperty;
-import org.citydb.ade.model.HouseNumberProperty;
-import org.citydb.ade.model.LastModificationDateProperty;
-import org.citydb.ade.model.LineageProperty;
-import org.citydb.ade.model.PoBoxProperty;
-import org.citydb.ade.model.ReasonForUpdateProperty;
-import org.citydb.ade.model.StateProperty;
-import org.citydb.ade.model.StreetProperty;
-import org.citydb.ade.model.UpdatingPersonProperty;
-import org.citydb.ade.model.ZipBoxProperty;
+import org.citydb.ade.model.*;
 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;
diff --git a/src/main/java/org/citydb/ade/bind/marshal/CityDBADE200Marshaller.java b/src/main/java/org/citydb/ade/bind/marshal/CityDBADE200Marshaller.java
index 75f0ec9..646f506 100644
--- a/src/main/java/org/citydb/ade/bind/marshal/CityDBADE200Marshaller.java
+++ b/src/main/java/org/citydb/ade/bind/marshal/CityDBADE200Marshaller.java
@@ -29,17 +29,7 @@
 package org.citydb.ade.bind.marshal;
 
 import org.citydb.ade._3._2.ObjectFactory;
-import org.citydb.ade.model.CityProperty;
-import org.citydb.ade.model.CountryProperty;
-import org.citydb.ade.model.HouseNumberProperty;
-import org.citydb.ade.model.LastModificationDateProperty;
-import org.citydb.ade.model.LineageProperty;
-import org.citydb.ade.model.PoBoxProperty;
-import org.citydb.ade.model.ReasonForUpdateProperty;
-import org.citydb.ade.model.StateProperty;
-import org.citydb.ade.model.StreetProperty;
-import org.citydb.ade.model.UpdatingPersonProperty;
-import org.citydb.ade.model.ZipBoxProperty;
+import org.citydb.ade.model.*;
 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;