diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
index 1cee0eb3b27985eb6acbd39e174ac981dd63ac0d..b9d2fa9cf6e04c3b3cadc1480463f1b0e7010348 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
@@ -27,7 +27,6 @@ public class DayOfMonthRecurrenceFVO {
   @JsonProperty("@schemaLocation")
   private String schemaLocation;
 
-  @JsonProperty("dates")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dates;
 
@@ -114,6 +113,16 @@ public class DayOfMonthRecurrenceFVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return dates.toString();
+  }
+
+  public void setDates(String dates) {
+    if ( dates!= null ) {
+      this.dates = OffsetDateTime.parse( dates );
+    }
+  }
+
   public OffsetDateTime getDates() {
     return dates;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
index 0a8506a0cc3df55953a7e7e614158f5a9e72ec42..c90596c5cc9e08129453b4c99c9036931c113a5f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
@@ -27,7 +27,6 @@ public class DayOfMonthRecurrenceMVO {
   @JsonProperty("@schemaLocation")
   private String schemaLocation;
 
-  @JsonProperty("dates")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dates;
 
@@ -114,6 +113,16 @@ public class DayOfMonthRecurrenceMVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return dates.toString();
+  }
+
+  public void setDates(String dates) {
+    if ( dates!= null ) {
+      this.dates = OffsetDateTime.parse( dates );
+    }
+  }
+
   public OffsetDateTime getDates() {
     return dates;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
index 33c57949f9ca5281b9793b1ae443bf63e006111e..5219ff6bbe1931cd59f8c77c9a3e9e8431deec3a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
@@ -27,7 +27,6 @@ public class DayOfWeekRecurrenceFVO {
   @JsonProperty("@schemaLocation")
   private String schemaLocation;
 
-  @JsonProperty("dates")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dates;
 
@@ -114,6 +113,16 @@ public class DayOfWeekRecurrenceFVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return dates.toString();
+  }
+
+  public void setDates(String dates) {
+    if ( dates!= null ) {
+      this.dates = OffsetDateTime.parse( dates );
+    }
+  }
+
   public OffsetDateTime getDates() {
     return dates;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
index 2ef8783a7073ef822bbe17386bcf1cb44d2db53d..430a1da0e3a739d2fdfb3a081ca2440dc7fee104 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
@@ -27,7 +27,6 @@ public class DayOfWeekRecurrenceMVO {
   @JsonProperty("@schemaLocation")
   private String schemaLocation;
 
-  @JsonProperty("dates")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dates;
 
@@ -114,6 +113,16 @@ public class DayOfWeekRecurrenceMVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return dates.toString();
+  }
+
+  public void setDates(String dates) {
+    if ( dates!= null ) {
+      this.dates = OffsetDateTime.parse( dates );
+    }
+  }
+
   public OffsetDateTime getDates() {
     return dates;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
index 15be3c35973d08528623c61e655332d22b0c7fbc..bfaa3b65dfd662488f77787be9a7546edc423a15 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
@@ -52,7 +52,6 @@ public class Event {
   @JsonProperty("priority")
   protected String priority;
 
-  @JsonProperty("timeOccurred")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   protected OffsetDateTime timeOccurred;
 
@@ -306,6 +305,16 @@ public class Event {
   @Valid 
   @Schema(name = "timeOccurred", description = "The time the event occurred.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("timeOccurred")
+  public String getTimeOccurredString() {
+    return timeOccurred.toString();
+  }
+
+  public void setTimeOccurred(String timeOccurred) {
+    if ( timeOccurred!= null ) {
+      this.timeOccurred = OffsetDateTime.parse( timeOccurred );
+    }
+  }
+
   public OffsetDateTime getTimeOccurred() {
     return timeOccurred;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
index 6d4d7ddc42339890045acc95a77e9d39a583552c..a958a29606dae0eb0ddff444feda73022dc9d06a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
@@ -30,7 +30,6 @@ public class NoteFVO {
   @JsonProperty("author")
   private String author;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime date;
 
@@ -140,6 +139,16 @@ public class NoteFVO {
   @Valid 
   @Schema(name = "date", example = "2020-11-20T08:00Z", description = "Date of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("date")
+  public String getDateString() {
+    return date.toString();
+  }
+
+  public void setDate(String date) {
+    if ( date!= null ) {
+      this.date = OffsetDateTime.parse( date );
+    }
+  }
+
   public OffsetDateTime getDate() {
     return date;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
index 7785c14f79d6db11534372f47371f57f392b9f89..4add4b4212d4092f7e9b7e90d93f7a07a82a89a3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
@@ -33,7 +33,6 @@ public class NoteMVO {
   @JsonProperty("author")
   private String author;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime date;
 
@@ -163,6 +162,16 @@ public class NoteMVO {
   @Valid 
   @Schema(name = "date", example = "2020-11-20T08:00Z", description = "Date of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("date")
+  public String getDateString() {
+    return date.toString();
+  }
+
+  public void setDate(String date) {
+    if ( date!= null ) {
+      this.date = OffsetDateTime.parse( date );
+    }
+  }
+
   public OffsetDateTime getDate() {
     return date;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
index 01cd210b30ef75a5d857409685e4b35589cfaa8e..6fa86c576de9977abba21722dc644dc30ed8e5db 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
@@ -49,7 +49,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   @JsonProperty("description")
   private String description;
 
-  @JsonProperty("endOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime endOperatingDate;
 
@@ -137,7 +136,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   @JoinColumn(name = "res_spec_id")
   private ResourceSpecificationRef resourceSpecification;
 
-  @JsonProperty("startOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime startOperatingDate;
 
@@ -229,6 +227,16 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   @Valid 
   @Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("endOperatingDate")
+  public String getEndOperatingDateString() {
+    return endOperatingDate.toString();
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -565,6 +573,16 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   @Valid 
   @Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("startOperatingDate")
+  public String getStartOperatingDateString() {
+    return startOperatingDate.toString();
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
index 9956563aecf040d3c6e26a95c26de02c5b9a1b1d..e0339b3f1ddefaacebc738fa4554099eda547c3d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
@@ -61,7 +61,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   @JsonProperty("name")
   private String name;
 
-  @JsonProperty("endOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime endOperatingDate;
 
@@ -111,7 +110,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   @JsonProperty("resourceSpecification")
   private ResourceSpecificationRefFVO resourceSpecification;
 
-  @JsonProperty("startOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime startOperatingDate;
 
@@ -312,6 +310,16 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   @Valid 
   @Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("endOperatingDate")
+  public String getEndOperatingDateString() {
+    return endOperatingDate.toString();
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -648,6 +656,16 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   @Valid 
   @Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("startOperatingDate")
+  public String getStartOperatingDateString() {
+    return startOperatingDate.toString();
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
index 59d1aee9c19000d796519ecaf7eedb4cccd930ff..b932345236079c815fba9eebdbbcc4074e3ff8c5 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
@@ -61,7 +61,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   @JsonProperty("name")
   private String name;
 
-  @JsonProperty("endOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime endOperatingDate;
 
@@ -111,7 +110,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   @JsonProperty("resourceSpecification")
   private ResourceSpecificationRefMVO resourceSpecification;
 
-  @JsonProperty("startOperatingDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime startOperatingDate;
 
@@ -312,6 +310,16 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   @Valid 
   @Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("endOperatingDate")
+  public String getEndOperatingDateString() {
+    return endOperatingDate.toString();
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -648,6 +656,16 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   @Valid 
   @Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("startOperatingDate")
+  public String getStartOperatingDateString() {
+    return startOperatingDate.toString();
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
index 2eaa08a03a8296e1d24b45146a6fc2e945587154..8ba4adaca82bf85052d9f4e2a72088bee2411b1f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
@@ -38,7 +38,6 @@ public class TrackingRecord extends BaseRootEntity {
   @JsonProperty("systemId")
   private String systemId;
 
-  @JsonProperty("time")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime time;
 
@@ -136,6 +135,16 @@ public class TrackingRecord extends BaseRootEntity {
   @Valid 
   @Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("time")
+  public String getTimeString() {
+    return time.toString();
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
index 36b881d602cbf830fb9707f41efb1f7ab36fb75f..068496fba5bfb78cb1cd2163af2217974537c182 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
@@ -42,7 +42,6 @@ public class TrackingRecordFVO {
   @JsonProperty("systemId")
   private String systemId;
 
-  @JsonProperty("time")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime time;
 
@@ -200,6 +199,16 @@ public class TrackingRecordFVO {
   @Valid 
   @Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("time")
+  public String getTimeString() {
+    return time.toString();
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
index 64be0fb6aec5702921a250c2fef84ce272a6b2ef..50782742a1d7a42eaf0beb8740770c53b4a941bb 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
@@ -42,7 +42,6 @@ public class TrackingRecordMVO {
   @JsonProperty("systemId")
   private String systemId;
 
-  @JsonProperty("time")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime time;
 
@@ -203,6 +202,16 @@ public class TrackingRecordMVO {
   @Valid 
   @Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("time")
+  public String getTimeString() {
+    return time.toString();
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }