diff --git a/org.fortiss.tooling.ext.reuse/model/reuse.genmodel b/org.fortiss.tooling.ext.reuse/model/reuse.genmodel
index 498876089f665537bc435bcc3792c942654af3f8..d300aedd00851e58ff1e1471b88ac97496537289 100644
--- a/org.fortiss.tooling.ext.reuse/model/reuse.genmodel
+++ b/org.fortiss.tooling.ext.reuse/model/reuse.genmodel
@@ -9,7 +9,8 @@
   <foreignModel>reuse.ecore</foreignModel>
   <genPackages prefix="AF3Reuse" basePackage="org.fortiss.tooling.ext.reuse" disposableProviderFactory="true"
       ecorePackage="reuse.ecore#/">
-    <genDataTypes ecoreDataType="reuse.ecore#//EZonedDateTime" create="return ZonedDateTime.parse(it);"/>
+    <genDataTypes ecoreDataType="reuse.ecore#//EZonedDateTime" create="return java.time.ZonedDateTime.parse(it);"
+        convert="return java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.format(it);"/>
     <genClasses ecoreClass="reuse.ecore#//ReuseLibrary">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference reuse.ecore#//ReuseLibrary/reuseElementList"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute reuse.ecore#//ReuseLibrary/libraryUUID"/>
diff --git a/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/.ratings b/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/.ratings
index 24c393b125ef7427ba03d8240a3776b59cc08233..c95dc0dce6bf495aa4f5346fa49cbe6924b98cf8 100644
--- a/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/.ratings
+++ b/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/.ratings
@@ -1,2 +1,2 @@
 ReuseLibraryModelElementFactory.java edac61169c3522577057a37b0e001153cea23e3b YELLOW
-ReuseLibraryUtils.java 342fc58e50d6a86393050d5523715fa5b5971ad3 YELLOW
+ReuseLibraryUtils.java e5c6cf60b4f6c4ad76cc19999668d99a6355e04c YELLOW
diff --git a/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/ReuseLibraryUtils.java b/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/ReuseLibraryUtils.java
index 342fc58e50d6a86393050d5523715fa5b5971ad3..e5c6cf60b4f6c4ad76cc19999668d99a6355e04c 100644
--- a/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/ReuseLibraryUtils.java
+++ b/org.fortiss.tooling.ext.reuse/src/org/fortiss/tooling/ext/reuse/utils/ReuseLibraryUtils.java
@@ -939,8 +939,7 @@ public class ReuseLibraryUtils {
 			// e.g. if the original reuse element in the library was updated by someone else
 			// in the meantime).
 			int hash = element.hashCode();
-			String dateAsString = getDateAsString(modifyDate);
-			String hashString = String.valueOf(hash) + dateAsString;
+			String hashString = String.valueOf(hash) + "__" + getDateAsString(modifyDate);
 			return hashString;
 		}
 		return null;