diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
index f9516f5215c678d1442229e9c5a9cc94d117ba3c..702c3675ef75c97dea654f41868d86b79f0c62e9 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
@@ -41,7 +41,6 @@ public class ManagementJob extends BaseRootEntity {
   @JsonProperty("adminState")
   private AdministrativeState adminState;
 
-  @JsonProperty("creationTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime creationTime;
 
@@ -73,7 +72,6 @@ public class ManagementJob extends BaseRootEntity {
   @JsonProperty("jobPriority")
   private Integer jobPriority = 5;
 
-  @JsonProperty("lastModifiedTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastModifiedTime;
 
@@ -130,6 +128,17 @@ public class ManagementJob extends BaseRootEntity {
   @Valid 
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
+  public String getCreationTimeStr() {
+    return creationTime.toString();
+  }
+  
+  public void setCreationTime(String t) {
+    if ( t!= null ) {
+        this.creationTime = OffsetDateTime.parse( t );
+    }
+  }
+  
+  
   public OffsetDateTime getCreationTime() {
     return creationTime;
   }
@@ -268,6 +277,16 @@ public class ManagementJob extends BaseRootEntity {
   @Valid 
   @Schema(name = "lastModifiedTime", description = "The last time that a measurement job was modified.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastModifiedTime")
+  public String getLastModifiedTimeStr() {
+    return lastModifiedTime.toString();
+  }
+  
+  public void setLastModifiedTime(String t) {
+    if ( t!= null ) {
+        this.lastModifiedTime = OffsetDateTime.parse( t );
+    }
+  }
+  
   public OffsetDateTime getLastModifiedTime() {
     return lastModifiedTime;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
index 8ac27c87621c6707cb2b53e1f46059dcc30be1ca..cafc616fc32d4596b4da2f24b43ce5a96c916e77 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
@@ -55,7 +55,6 @@ public class ManagementJobFVO {
   @JsonProperty("adminState")
   private AdministrativeState adminState;
 
-  @JsonProperty("creationTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime creationTime;
 
@@ -76,7 +75,6 @@ public class ManagementJobFVO {
   @JsonProperty("jobPriority")
   private Integer jobPriority = 5;
 
-  @JsonProperty("lastModifiedTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastModifiedTime;
 
@@ -227,6 +225,16 @@ public class ManagementJobFVO {
   @Valid 
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
+  public String getCreationTimeStr() {
+    return creationTime.toString();
+  }
+  
+  public void setCreationTime(String t) {
+    if ( t!= null ) {
+        this.creationTime = OffsetDateTime.parse( t );
+    }
+  }
+  
   public OffsetDateTime getCreationTime() {
     return creationTime;
   }
@@ -365,6 +373,16 @@ public class ManagementJobFVO {
   @Valid 
   @Schema(name = "lastModifiedTime", description = "The last time that a measurement job was modified.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastModifiedTime")
+  public String getLastModifiedTimeStr() {
+    return lastModifiedTime.toString();
+  }
+  
+  public void setLastModifiedTime(String t) {
+    if ( t!= null ) {
+        this.lastModifiedTime = OffsetDateTime.parse( t );
+    }
+  }
+
   public OffsetDateTime getLastModifiedTime() {
     return lastModifiedTime;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
index 482a5adc70e5483b070ec9b447025f892a88e1b9..e52b81fdf1047c7c3e9c6be59b8fe5bde473cffb 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
@@ -15,7 +15,6 @@ import java.util.Objects;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-05-15T07:30:16.936523289Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
 public class MeasurementCollectionJobCreateEvent extends Event{
 
-  @JsonProperty("event")
   private MeasurementCollectionJobCreateEventPayload event;
 
   public MeasurementCollectionJobCreateEvent() {