diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java
index 1990d07ee4860dcd944310c83686a17801a39537..8251d950f465ce6810c54b3ae71eb14f866b9bd6 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java
@@ -64,7 +64,6 @@ public class AttachmentRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getAtType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -144,7 +140,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -164,7 +159,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -184,7 +178,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -204,7 +197,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "description", description = "A narrative text describing the content of the attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -224,7 +216,6 @@ public class AttachmentRefFVO {
   */
   
   @Schema(name = "url", description = "Link to the attachment media/content", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("url")
   public String getUrl() {
     return url;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java
index 3c2edba24f354dd1bad006568b490ae0ce5ff33a..c934c5e9442e67333929b455493ced57a939bc20 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java
@@ -64,7 +64,6 @@ public class AttachmentRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getAtBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -144,7 +140,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -164,7 +159,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -184,7 +178,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -204,7 +197,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "description", description = "A narrative text describing the content of the attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -224,7 +216,6 @@ public class AttachmentRefMVO {
   */
   
   @Schema(name = "url", description = "Link to the attachment media/content", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("url")
   public String getUrl() {
     return url;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java
index 5c4f887b8a8ac3be6a036d3504ddb1eff3d23ffa..df528a4b04d7b9dbc8c9b101eb1bd3c2b8365405 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java
@@ -55,7 +55,6 @@ public class Characteristic extends BaseRootNamedEntity {
      */
 
     @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("valueType")
     public String getValueType() {
         return valueType;
     }
@@ -83,7 +82,6 @@ public class Characteristic extends BaseRootNamedEntity {
      */
     @Valid
     @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("characteristicRelationship")
     public List<CharacteristicRelationship> getCharacteristicRelationship() {
         return characteristicRelationship;
     }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java
index 912ae241e0e93e133e62a7c02a27aadaa6acd02e..3acffe8762795b0a714c80a73b4eda776df491b1 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java
@@ -59,7 +59,6 @@ public class CharacteristicFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class CharacteristicFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class CharacteristicFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class CharacteristicFVO {
   */
   
   @Schema(name = "name", description = "Name of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -139,7 +135,6 @@ public class CharacteristicFVO {
   */
   
   @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("valueType")
   public String getValueType() {
     return valueType;
   }
@@ -167,7 +162,6 @@ public class CharacteristicFVO {
   */
   @Valid 
   @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("characteristicRelationship")
   public List<CharacteristicRelationshipFVO> getCharacteristicRelationship() {
     return characteristicRelationship;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java
index bccda463e27d2bea6fd6767b507597576a19d5ad..ca8aee88d282c25aa8073ced5fa0e1ffa8687e3b 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java
@@ -62,7 +62,6 @@ public class CharacteristicMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -82,7 +81,6 @@ public class CharacteristicMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -102,7 +100,6 @@ public class CharacteristicMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -122,7 +119,6 @@ public class CharacteristicMVO {
   */
   
   @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -142,7 +138,6 @@ public class CharacteristicMVO {
   */
   
   @Schema(name = "name", description = "Name of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -162,7 +157,6 @@ public class CharacteristicMVO {
   */
   
   @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("valueType")
   public String getValueType() {
     return valueType;
   }
@@ -190,7 +184,6 @@ public class CharacteristicMVO {
   */
   @Valid 
   @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("characteristicRelationship")
   public List<CharacteristicRelationshipMVO> getCharacteristicRelationship() {
     return characteristicRelationship;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java
index de47f79c2483b53b8903dabe15b7bdf79af69a06..9e5f717196cd2541c5597983e7e963c8e1da6f3d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java
@@ -47,7 +47,6 @@ public class CharacteristicRelationship extends BaseRootEntity {
      */
 
     @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("relationshipType")
     public String getRelationshipType() {
         return relationshipType;
     }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java
index c34c4542c7780f5e3df8b1e32cd59213539cfa68..62e378aaab8811833e395674307b922d044d1d2d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java
@@ -54,7 +54,6 @@ public class CharacteristicRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -74,7 +73,6 @@ public class CharacteristicRelationshipFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -94,7 +92,6 @@ public class CharacteristicRelationshipFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,7 +111,6 @@ public class CharacteristicRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -134,7 +130,6 @@ public class CharacteristicRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java
index 7e9848ca0f28110d53a4aaa4d9c6d597531b1e3e..347b3c80ab3e805ce4c6b36e5a1523c91ffc14ea 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java
@@ -52,7 +52,6 @@ public class CharacteristicRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -72,7 +71,6 @@ public class CharacteristicRelationshipMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -92,7 +90,6 @@ public class CharacteristicRelationshipMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -112,7 +109,6 @@ public class CharacteristicRelationshipMVO {
   */
   
   @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -132,7 +128,6 @@ public class CharacteristicRelationshipMVO {
   */
   
   @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java
index c3818df3b6ed4f4270218e866af9f124331a5a8b..5e973b0cca8fab45fe6068e34fa1c6f1709f3ca3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java
@@ -31,7 +31,6 @@ public class CompressionType {
   */
   @Valid 
   @Schema(name = "compressionEnumType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("compressionEnumType")
   public CompressionEnumType getCompressionEnumType() {
     return compressionEnumType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java
index df95ffda51e7ce2132c5fd6a6ec0b81fc6870562..3d58b69150d54c6c17618ef2a11fcbba3c7c1097 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java
@@ -60,7 +60,6 @@ public class DataAccessEndpoint extends LogicalResource {
   */
   @Valid 
   @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uri")
   public URI getUri() {
     return uri;
   }
@@ -80,7 +79,6 @@ public class DataAccessEndpoint extends LogicalResource {
   */
   @Valid 
   @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uriQueryFilter")
   public DataFilterMap getUriQueryFilter() {
     return uriQueryFilter;
   }
@@ -100,7 +98,6 @@ public class DataAccessEndpoint extends LogicalResource {
   */
   
   @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("apiType")
   public String getApiType() {
     return apiType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java
index 3637fc798523038489315b0a2e1343cd8b692da0..c7765fda211edc202a1ff4bf7314df2ae13e6a92 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java
@@ -53,7 +53,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO {
   */
   @Valid 
   @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uri")
   public URI getUri() {
     return uri;
   }
@@ -73,7 +72,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO {
   */
   @Valid 
   @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uriQueryFilter")
   public DataFilterMapFVO getUriQueryFilter() {
     return uriQueryFilter;
   }
@@ -93,7 +91,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO {
   */
   
   @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("apiType")
   public String getApiType() {
     return apiType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java
index 0cd9a0424d227f3fd52400f54d4c577eeb520a62..11bd8b1cf4c1495b8356656e1de85bdaf8d59117 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java
@@ -53,7 +53,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO {
   */
   @Valid 
   @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uri")
   public URI getUri() {
     return uri;
   }
@@ -73,7 +72,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO {
   */
   @Valid 
   @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uriQueryFilter")
   public DataFilterMapMVO getUriQueryFilter() {
     return uriQueryFilter;
   }
@@ -93,7 +91,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO {
   */
   
   @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("apiType")
   public String getApiType() {
     return apiType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java
index 5eab513025f9bf18b4d06835853d7a2ec9d8b560..b2072415d4e5e0e6a74d0e8c3b134862e4712014 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java
@@ -40,7 +40,6 @@ public class DataFilterAttribute {
   */
   
   @Schema(name = "valueType", description = "Data type of the value of the attribute", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("valueType")
   public String getValueType() {
     return valueType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java
index 12cc0dd0b435d91b105adc7ce15902f6518b769c..5b3215ee89c52631d45348c49cff8e21814f4f3c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java
@@ -43,7 +43,6 @@ public class DataFilterAttributeStringArray extends DataFilterAttribute {
   */
   
   @Schema(name = "value", example = "[\"Dallas\",\"Houston\",\"Paris\"]", description = "an array of field names", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("value")
   public List<String> getValue() {
     return value;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java
index 5084ad58fb82072506afc6bd1691bff16b394e73..444ac3bd2202462d9f9e7faad1a5e380febc426f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java
@@ -57,7 +57,6 @@ public class DataFilterMap {
    */
   @NotNull
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -77,7 +76,6 @@ public class DataFilterMap {
    */
 
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -97,7 +95,6 @@ public class DataFilterMap {
    */
 
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -126,7 +123,6 @@ public class DataFilterMap {
   */
   @Valid 
   @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("mappings")
   public List<@Valid DataFilterMapItem> getMappings() {
     return mappings;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java
index 66a26463c316db30b1fc3a415526ec5ec5b8b575..7b97e9469e2322d86559a30c18530082af9c0d7c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java
@@ -53,7 +53,6 @@ public class DataFilterMapFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +72,6 @@ public class DataFilterMapFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +91,6 @@ public class DataFilterMapFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class DataFilterMapFVO {
   */
   @Valid 
   @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("mappings")
   public List<@Valid DataFilterMapItemFVO> getMappings() {
     return mappings;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java
index cb84be04f03a552a8f9468ef297509474aeb5621..ee8f2eda828d53deab2982842112c914935d129a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java
@@ -36,7 +36,6 @@ public class DataFilterMapItem {
   */
   @Valid 
   @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("filterTemplate")
   public DataFilterTemplate getFilterTemplate() {
     return filterTemplate;
   }
@@ -56,7 +55,6 @@ public class DataFilterMapItem {
   */
   @Valid 
   @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("stringArray")
   public DataFilterAttributeStringArray getStringArray() {
     return stringArray;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java
index 90fb5e91b24caf46c642e3434756ca481e210643..0ea073a6ae49e9facc460a28514da3d5484ea1bc 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java
@@ -34,7 +34,6 @@ public class DataFilterMapItemFVO {
   */
   @Valid 
   @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("filterTemplate")
   public DataFilterTemplateFVO getFilterTemplate() {
     return filterTemplate;
   }
@@ -54,7 +53,6 @@ public class DataFilterMapItemFVO {
   */
   @Valid 
   @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("stringArray")
   public DataFilterAttributeStringArray getStringArray() {
     return stringArray;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java
index f7d1739955cd66d867172da834e0462d672b1be6..c765f59ecb99697f580bb2d0faa9c4d92fdd2619 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java
@@ -17,8 +17,10 @@ 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 DataFilterMapItemMVO {
 
+  @JsonProperty("filterTemplate")
   private DataFilterTemplateMVO filterTemplate;
 
+  @JsonProperty("stringArray")
   private DataFilterAttributeStringArray stringArray;
 
   public DataFilterMapItemMVO filterTemplate(DataFilterTemplateMVO filterTemplate) {
@@ -32,7 +34,6 @@ public class DataFilterMapItemMVO {
   */
   @Valid 
   @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("filterTemplate")
   public DataFilterTemplateMVO getFilterTemplate() {
     return filterTemplate;
   }
@@ -52,7 +53,6 @@ public class DataFilterMapItemMVO {
   */
   @Valid 
   @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("stringArray")
   public DataFilterAttributeStringArray getStringArray() {
     return stringArray;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java
index f7eed3d1035aaf84d29c1f4fd1836a65f12ff056..433e4f01fd06710db608c7dd024d92d709902d01 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java
@@ -53,7 +53,6 @@ public class DataFilterMapMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +72,6 @@ public class DataFilterMapMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +91,6 @@ public class DataFilterMapMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class DataFilterMapMVO {
   */
   @Valid 
   @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("mappings")
   public List<@Valid DataFilterMapItemMVO> getMappings() {
     return mappings;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java
index 5c020282e5cc360a78d67b128c5e7e29740c844f..f2e613864b9e9381a7c5d9d88d435b5f7e01fb70 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java
@@ -61,7 +61,6 @@ public class DataFilterTemplate {
    */
   @NotNull
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class DataFilterTemplate {
    */
 
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class DataFilterTemplate {
    */
 
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class DataFilterTemplate {
    */
 
   @Schema(name = "id", example = "6c088cf7f1bc", description = "Unique identifier of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -141,7 +137,6 @@ public class DataFilterTemplate {
    */
   @Valid
   @Schema(name = "href", example = "https://host/dataFilerTemplate/6c088cf7f1bc", description = "Hyperlink reference to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -161,7 +156,6 @@ public class DataFilterTemplate {
    */
 
   @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java
index ecd0fc69e2d76cc790f8d045121f3edc951541af..b70a760a36febfb9630a8fc66fba248283234fbb 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java
@@ -55,7 +55,6 @@ public class DataFilterTemplateFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -75,7 +74,6 @@ public class DataFilterTemplateFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -95,7 +93,6 @@ public class DataFilterTemplateFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -129,7 +126,6 @@ public class DataFilterTemplateFVO {
   */
   
   @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -149,7 +145,6 @@ public class DataFilterTemplateFVO {
   */
   
   @Schema(name = "description", description = "Description of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java
index 98162e0ca0f2f3fb6b97dea050aa202530a10aed..1b6b24ffc479cbe3e3d68c975c7d2211d108e416 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java
@@ -58,7 +58,6 @@ public class DataFilterTemplateMVO {
   */
   @NotNull
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -78,7 +77,6 @@ public class DataFilterTemplateMVO {
   */
 
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -98,7 +96,6 @@ public class DataFilterTemplateMVO {
   */
 
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -132,7 +129,6 @@ public class DataFilterTemplateMVO {
   */
 
   @Schema(name = "id", example = "6c088cf7f1bc", description = "Unique identifier of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -152,7 +148,6 @@ public class DataFilterTemplateMVO {
   */
 
   @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -172,7 +167,6 @@ public class DataFilterTemplateMVO {
   */
 
   @Schema(name = "description", description = "Description of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
index ef8d3d59be86689c130feea2c216642e36688059..d9a89d52762510a094c630ee3377d631b6e0eb36 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
@@ -58,7 +58,6 @@ public class DayOfMonthRecurrence {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -78,7 +77,6 @@ public class DayOfMonthRecurrence {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -98,7 +96,6 @@ public class DayOfMonthRecurrence {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -120,7 +117,7 @@ public class DayOfMonthRecurrence {
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
   public String getDatesString() {
-    return dates.toString();
+    return (dates != null) ? dates.toString() : null;
   }
 
   public void setDates(String dates) {
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..40e7c28f6d210fef75fcaae7d49bb7ce5f440aff 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;
 
@@ -53,7 +52,6 @@ public class DayOfMonthRecurrenceFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +71,6 @@ public class DayOfMonthRecurrenceFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +90,6 @@ public class DayOfMonthRecurrenceFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,6 +110,16 @@ public class DayOfMonthRecurrenceFVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return (dates != null) ? dates.toString() : null;
+  }
+
+  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..45256a6293065aae2172ba9184f733a329da0822 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;
 
@@ -53,7 +52,6 @@ public class DayOfMonthRecurrenceMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +71,6 @@ public class DayOfMonthRecurrenceMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +90,6 @@ public class DayOfMonthRecurrenceMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,6 +110,16 @@ public class DayOfMonthRecurrenceMVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return (dates != null) ? dates.toString() : null;
+  }
+
+  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/DayOfWeekRecurrence.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
index b8bfefe230ba65796f495f3a3709efa974261ed3..5d72ed70238cb8065ee09a3716b66329223e4c21 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
@@ -58,7 +58,6 @@ public class DayOfWeekRecurrence {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -78,7 +77,6 @@ public class DayOfWeekRecurrence {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -98,7 +96,6 @@ public class DayOfWeekRecurrence {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,7 @@ public class DayOfWeekRecurrence {
   
   @JsonProperty("dates")
   public String getDatesString() {
-    return dates.toString();
+    return (dates != null) ? dates.toString() : null;
   }
 
   public void setDates(String 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..260e3e734a080880e00c0c66bd04766277aa75a1 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;
 
@@ -53,7 +52,6 @@ public class DayOfWeekRecurrenceFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +71,6 @@ public class DayOfWeekRecurrenceFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +90,6 @@ public class DayOfWeekRecurrenceFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,6 +110,16 @@ public class DayOfWeekRecurrenceFVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return (dates != null) ? dates.toString() : null;
+  }
+
+  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..0921d24a831eac1178a63cb1dfe6da4582b71aeb 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;
 
@@ -53,7 +52,6 @@ public class DayOfWeekRecurrenceMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -73,7 +71,6 @@ public class DayOfWeekRecurrenceMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -93,7 +90,6 @@ public class DayOfWeekRecurrenceMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,6 +110,16 @@ public class DayOfWeekRecurrenceMVO {
   @Valid 
   @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dates")
+  public String getDatesString() {
+    return (dates != null) ? dates.toString() : null;
+  }
+
+  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/Duration.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java
index 65323de60503f96817ab4a382d67f9933f3716cf..6c2814f08d2ca40cb730976779020696ea3297dd 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java
@@ -33,7 +33,6 @@ public class Duration {
      */
 
     @Schema(name = "amount", description = "Time interval (number of seconds, minutes, hours, etc.)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("amount")
     public Integer getAmount() {
         return amount;
     }
@@ -53,7 +52,6 @@ public class Duration {
      */
 
     @Schema(name = "units", description = "Unit of time (seconds, minutes, hours, etc.)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("units")
     public String getUnits() {
         return units;
     }
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..2791e1c9e98c4e69875d1140d195b69b2a942b2b 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;
 
@@ -105,7 +104,6 @@ public class Event {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -125,7 +123,6 @@ public class Event {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -145,7 +142,6 @@ public class Event {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -165,7 +161,6 @@ public class Event {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -185,7 +180,6 @@ public class Event {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -205,7 +199,6 @@ public class Event {
   */
   
   @Schema(name = "correlationId", description = "The correlation id for this event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("correlationId")
   public String getCorrelationId() {
     return correlationId;
   }
@@ -225,7 +218,6 @@ public class Event {
   */
   
   @Schema(name = "domain", description = "The domain of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("domain")
   public String getDomain() {
     return domain;
   }
@@ -245,7 +237,6 @@ public class Event {
   */
   
   @Schema(name = "title", description = "The title of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("title")
   public String getTitle() {
     return title;
   }
@@ -265,7 +256,6 @@ public class Event {
   */
   
   @Schema(name = "description", description = "An explanation of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -285,7 +275,6 @@ public class Event {
   */
   
   @Schema(name = "priority", description = "A priority.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("priority")
   public String getPriority() {
     return priority;
   }
@@ -306,6 +295,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 != null) ? timeOccurred.toString() : null;
+  }
+
+  public void setTimeOccurred(String timeOccurred) {
+    if ( timeOccurred!= null ) {
+      this.timeOccurred = OffsetDateTime.parse( timeOccurred );
+    }
+  }
+
   public OffsetDateTime getTimeOccurred() {
     return timeOccurred;
   }
@@ -325,7 +324,6 @@ public class Event {
   */
   @Valid 
   @Schema(name = "source", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("source")
   public EntityRef getSource() {
     return source;
   }
@@ -345,7 +343,6 @@ public class Event {
   */
   @Valid 
   @Schema(name = "reportingSystem", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("reportingSystem")
   public EntityRef getReportingSystem() {
     return reportingSystem;
   }
@@ -373,7 +370,6 @@ public class Event {
   */
   @Valid 
   @Schema(name = "relatedParty", description = "Collection of related parties", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relatedParty")
   public List<RelatedPartyRefOrPartyRoleRef> getRelatedParty() {
     return relatedParty;
   }
@@ -401,7 +397,6 @@ public class Event {
   */
   @Valid 
   @Schema(name = "analyticCharacteristic", description = "Collection of analytic characteristics", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("analyticCharacteristic")
   public List<Characteristic> getAnalyticCharacteristic() {
     return analyticCharacteristic;
   }
@@ -421,7 +416,6 @@ public class Event {
   */
   
   @Schema(name = "eventId", description = "The identifier of the notification.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("eventId")
   public String getEventId() {
     return eventId;
   }
@@ -447,7 +441,7 @@ public class Event {
   
   @JsonProperty("eventTime")
   public String getEventTimeString() {
-      return eventTime.toString();
+    return (eventTime != null) ? eventTime.toString() : null;
   }
   
 
@@ -472,7 +466,6 @@ public class Event {
   */
   
   @Schema(name = "eventType", description = "The type of the notification.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("eventType")
   public String getEventType() {
     return eventType;
   }
@@ -492,7 +485,6 @@ public class Event {
   */
   
   @Schema(name = "event", description = "The event linked to the involved resource object", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("event")
   public Object getEvent() {
     return event;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java
index fad2bfc266fc440b34cfb14b2063779f93a9c225..00e31a26ad235b445c0b3dfa238a63d7d7d5a3f2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java
@@ -64,7 +64,6 @@ public class ExternalIdentifier {
      */
     @NotNull
     @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-    @JsonProperty("@type")
     public String getType() {
         return type;
     }
@@ -84,7 +83,6 @@ public class ExternalIdentifier {
      */
 
     @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("@baseType")
     public String getBaseType() {
         return baseType;
     }
@@ -104,7 +102,6 @@ public class ExternalIdentifier {
      */
 
     @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("@schemaLocation")
     public String getSchemaLocation() {
         return schemaLocation;
     }
@@ -124,7 +121,6 @@ public class ExternalIdentifier {
      */
 
     @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("owner")
     public String getOwner() {
         return owner;
     }
@@ -144,7 +140,6 @@ public class ExternalIdentifier {
      */
 
     @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("externalIdentifierType")
     public String getExternalIdentifierType() {
         return externalIdentifierType;
     }
@@ -164,7 +159,6 @@ public class ExternalIdentifier {
      */
 
     @Schema(name = "id", description = "identification of the entity within the external system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @JsonProperty("id")
     public String getId() {
         return id;
     }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java
index 41f01644de26036f1e4ae25f738e53b2bc0e1728..924cc9f12a8445c030f53df223da2e9b57c2cb6e 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java
@@ -52,7 +52,6 @@ public class ExternalIdentifierFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -72,7 +71,6 @@ public class ExternalIdentifierFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -92,7 +90,6 @@ public class ExternalIdentifierFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -112,7 +109,6 @@ public class ExternalIdentifierFVO {
   */
   
   @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("owner")
   public String getOwner() {
     return owner;
   }
@@ -132,7 +128,6 @@ public class ExternalIdentifierFVO {
   */
   
   @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("externalIdentifierType")
   public String getExternalIdentifierType() {
     return externalIdentifierType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java
index 642f5d3c0630a448b478ceeae7fa4493c096a7c4..cda745b3a7ecf35d43107703f57d11aed962c37e 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java
@@ -55,7 +55,6 @@ public class ExternalIdentifierMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -75,7 +74,6 @@ public class ExternalIdentifierMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -95,7 +93,6 @@ public class ExternalIdentifierMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -115,7 +112,6 @@ public class ExternalIdentifierMVO {
   */
   
   @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("owner")
   public String getOwner() {
     return owner;
   }
@@ -135,7 +131,6 @@ public class ExternalIdentifierMVO {
   */
   
   @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("externalIdentifierType")
   public String getExternalIdentifierType() {
     return externalIdentifierType;
   }
@@ -155,7 +150,6 @@ public class ExternalIdentifierMVO {
   */
   
   @Schema(name = "id", description = "identification of the entity within the external system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java
index d03fd8e2983dbd515f575d4904201439260fed24..01c7b11a3e6b9e903060c10baa84af0a1c5b197a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java
@@ -79,7 +79,6 @@ public class Feature extends BaseRootNamedEntity {
   */
   
   @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isBundle")
   public Boolean getIsBundle() {
     return isBundle;
   }
@@ -107,7 +106,6 @@ public class Feature extends BaseRootNamedEntity {
   */
   @Valid 
   @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureRelationship")
   public List<FeatureRelationship> getFeatureRelationship() {
     return featureRelationship;
   }
@@ -135,7 +133,6 @@ public class Feature extends BaseRootNamedEntity {
   */
   @Valid 
   @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureCharacteristic")
   public List<Characteristic> getFeatureCharacteristic() {
     return featureCharacteristic;
   }
@@ -163,7 +160,6 @@ public class Feature extends BaseRootNamedEntity {
   */
   @Valid 
   @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("policyConstraint")
   public List<PolicyRef> getPolicyConstraint() {
     return policyConstraint;
   }
@@ -183,7 +179,6 @@ public class Feature extends BaseRootNamedEntity {
   */
   
   @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isEnabled")
   public Boolean getIsEnabled() {
     return isEnabled;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java
index 401bd5c8c9bc464f41ee3257bc9d8e5f103fa358..aa4f8c59bfed1ac8520cb2ae50746292ef674e42 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java
@@ -70,7 +70,6 @@ public class FeatureFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -90,7 +89,6 @@ public class FeatureFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -110,7 +108,6 @@ public class FeatureFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -130,7 +127,6 @@ public class FeatureFVO {
   */
   
   @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isBundle")
   public Boolean getIsBundle() {
     return isBundle;
   }
@@ -158,7 +154,6 @@ public class FeatureFVO {
   */
   @Valid 
   @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureRelationship")
   public List<FeatureRelationshipFVO> getFeatureRelationship() {
     return featureRelationship;
   }
@@ -186,7 +181,6 @@ public class FeatureFVO {
   */
   @Valid 
   @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureCharacteristic")
   public List<CharacteristicFVO> getFeatureCharacteristic() {
     return featureCharacteristic;
   }
@@ -214,7 +208,6 @@ public class FeatureFVO {
   */
   @Valid 
   @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("policyConstraint")
   public List<PolicyRefFVO> getPolicyConstraint() {
     return policyConstraint;
   }
@@ -234,7 +227,6 @@ public class FeatureFVO {
   */
   
   @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isEnabled")
   public Boolean getIsEnabled() {
     return isEnabled;
   }
@@ -254,7 +246,6 @@ public class FeatureFVO {
   */
   
   @Schema(name = "name", description = "This is the name for the feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java
index 91dd2e5df985ecacf979932e02b03b7d75fb45cf..e2ac273801be9af3f6d425e0fcacf624a2f480b1 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java
@@ -74,7 +74,6 @@ public class FeatureMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -94,7 +93,6 @@ public class FeatureMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -114,7 +112,6 @@ public class FeatureMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -134,7 +131,6 @@ public class FeatureMVO {
   */
   
   @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isBundle")
   public Boolean getIsBundle() {
     return isBundle;
   }
@@ -162,7 +158,6 @@ public class FeatureMVO {
   */
   @Valid 
   @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureRelationship")
   public List<FeatureRelationshipMVO> getFeatureRelationship() {
     return featureRelationship;
   }
@@ -190,7 +185,6 @@ public class FeatureMVO {
   */
   @Valid 
   @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("featureCharacteristic")
   public List<CharacteristicMVO> getFeatureCharacteristic() {
     return featureCharacteristic;
   }
@@ -218,7 +212,6 @@ public class FeatureMVO {
   */
   @Valid 
   @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("policyConstraint")
   public List<PolicyRefMVO> getPolicyConstraint() {
     return policyConstraint;
   }
@@ -238,7 +231,6 @@ public class FeatureMVO {
   */
   
   @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("isEnabled")
   public Boolean getIsEnabled() {
     return isEnabled;
   }
@@ -258,7 +250,6 @@ public class FeatureMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -278,7 +269,6 @@ public class FeatureMVO {
   */
   @NotNull 
   @Schema(name = "name", description = "This is the name for the feature.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java
index d218d13da835bce3fd8236e5988f45c28e8fda53..ef10275f5e6379c8b71b61c4fd18b9a6d4aa4057 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java
@@ -109,7 +109,6 @@ public class FeatureRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -129,7 +128,6 @@ public class FeatureRelationshipFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -149,7 +147,6 @@ public class FeatureRelationshipFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getAtSchemaLocation() {
     return schemaLocation;
   }
@@ -169,7 +166,6 @@ public class FeatureRelationshipFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -189,7 +185,6 @@ public class FeatureRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -209,7 +204,6 @@ public class FeatureRelationshipFVO {
   */
   
   @Schema(name = "name", description = "This is the name of the target feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -229,7 +223,6 @@ public class FeatureRelationshipFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -249,7 +242,6 @@ public class FeatureRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "This is the type of the feature relationship.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public RelationshipTypeEnum getRelationshipType() {
     return relationshipType;
   }
@@ -269,7 +261,6 @@ public class FeatureRelationshipFVO {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java
index ba40a7242b69254f446141eb12eea2e2dec40c22..68a8f5c47fa93e424fdbbf72922c22b838e6e76f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java
@@ -109,7 +109,6 @@ public class FeatureRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -129,7 +128,6 @@ public class FeatureRelationshipMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -149,7 +147,6 @@ public class FeatureRelationshipMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -169,7 +166,6 @@ public class FeatureRelationshipMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -189,7 +185,6 @@ public class FeatureRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -209,7 +204,6 @@ public class FeatureRelationshipMVO {
   */
   
   @Schema(name = "name", description = "This is the name of the target feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -229,7 +223,6 @@ public class FeatureRelationshipMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -249,7 +242,6 @@ public class FeatureRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "This is the type of the feature relationship.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public RelationshipTypeEnum getRelationshipType() {
     return relationshipType;
   }
@@ -269,7 +261,6 @@ public class FeatureRelationshipMVO {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java
index b5cc6a907b6bc52c829118e5a1fe5b66a546c3aa..b02b46c2aeefae0d7e48a50384a350572c702a0b 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java
@@ -74,7 +74,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -94,7 +93,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -114,7 +112,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -134,7 +131,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileLocation")
   public URI getFileLocation() {
     return fileLocation;
   }
@@ -154,7 +150,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   
   @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileFormat")
   public String getFileFormat() {
     return fileFormat;
   }
@@ -174,7 +169,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("compressionType")
   public CompressionType getCompressionType() {
     return compressionType;
   }
@@ -194,7 +188,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("retentionPeriod")
   public Duration getRetentionPeriod() {
     return retentionPeriod;
   }
@@ -214,7 +207,6 @@ public class FileTransferData extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("packingType")
   public PackingType getPackingType() {
     return packingType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java
index 584093ece2a5ea0478f05f93db39e7a3664ed92f..3b76848790b243ad23865493b900bec8ad98c196 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java
@@ -64,7 +64,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   @Valid 
   @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileLocation")
   public URI getFileLocation() {
     return fileLocation;
   }
@@ -144,7 +140,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   
   @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileFormat")
   public String getFileFormat() {
     return fileFormat;
   }
@@ -164,7 +159,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   @Valid 
   @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("compressionType")
   public CompressionType getCompressionType() {
     return compressionType;
   }
@@ -184,7 +178,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   @Valid 
   @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("retentionPeriod")
   public Duration getRetentionPeriod() {
     return retentionPeriod;
   }
@@ -204,7 +197,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO {
   */
   @Valid 
   @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("packingType")
   public PackingType getPackingType() {
     return packingType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java
index 045e75bfe40e943efcff4c545b6a561781c12c2d..822852581aa1ca874030fc7a894a34840d80c6ff 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java
@@ -64,7 +64,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileLocation")
   public URI getFileLocation() {
     return fileLocation;
   }
@@ -144,7 +140,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   
   @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileFormat")
   public String getFileFormat() {
     return fileFormat;
   }
@@ -164,7 +159,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("compressionType")
   public CompressionType getCompressionType() {
     return compressionType;
   }
@@ -184,7 +178,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("retentionPeriod")
   public Duration getRetentionPeriod() {
     return retentionPeriod;
   }
@@ -204,7 +197,6 @@ public class FileTransferDataMVO extends ProtocolTransferData {
   */
   @Valid 
   @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("packingType")
   public PackingType getPackingType() {
     return packingType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java
index 96950052e94fb0d0abdcbe92c89bacbf92557700..6568b48fec12b313b3881c91a4bab37faf151af4 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java
@@ -70,7 +70,6 @@ public class IntentRef {
    */
   @NotNull
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -90,7 +89,6 @@ public class IntentRef {
    */
 
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -110,7 +108,6 @@ public class IntentRef {
    */
 
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -130,7 +127,6 @@ public class IntentRef {
    */
 
   @Schema(name = "href", description = "The URI of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -150,7 +146,6 @@ public class IntentRef {
    */
   @NotNull
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -170,7 +165,6 @@ public class IntentRef {
    */
 
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -190,7 +184,6 @@ public class IntentRef {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java
index da9f4a57d44b04be2f6191f508058985b5b7b86e..d79cef3e2391e3884550a1626161071211b375ab 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java
@@ -59,7 +59,6 @@ public class IntentRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -159,7 +154,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class IntentRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java
index 37c224da2bcbf0ae86f16054dd3abb93fa2df664..075cc95c4b03112678a0338fd5076172993d4908 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java
@@ -59,7 +59,6 @@ public class IntentRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -159,7 +154,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class IntentRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java
index a3340ce8ebde2c508afb86fb970135ece194fb83..2bd0998be374dcdffce58a62a262f58b7f53d6cd 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java
@@ -52,7 +52,6 @@ public class LogicalResource extends Resource {
   */
   
   @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for  MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("value")
   public String getValue() {
     return value;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java
index 95eecfdb7d6ee0b9f63d719b4d6aa385478229d8..469b427921af3fd9b09390042e61d4616b3635db 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java
@@ -56,7 +56,6 @@ public class LogicalResourceFVO extends ResourceFVO {
   */
   
   @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for  MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("value")
   public String getValue() {
     return value;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java
index 0838d548c006d7ad4720f6021a0c77b497549ff7..4b412ac344febe3cb7e32c73054ca37799f61452 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java
@@ -56,7 +56,6 @@ public class LogicalResourceMVO extends ResourceMVO {
   */
   
   @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for  MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("value")
   public String getValue() {
     return value;
   }
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 d0aceaf9e0e3167e510861a47833844f3fabe255..5362bb229214e6df61fe8fbede06bd060fd1663c 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
@@ -110,7 +110,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "adminState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("adminState")
   public AdministrativeState getAdminState() {
     return adminState;
   }
@@ -132,7 +131,7 @@ public class ManagementJob extends BaseRootEntity {
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
   public String getCreationTimeStr() {
-    return creationTime.toString();
+    return (creationTime != null) ? creationTime.toString() : null;
   }
   
   public void setCreationTime(String t) {
@@ -161,7 +160,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "executionState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("executionState")
   public ExecutionStateType getExecutionState() {
     return executionState;
   }
@@ -189,7 +187,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileTransferData")
   public List<FileTransferData> getFileTransferData() {
     return fileTransferData;
   }
@@ -217,7 +214,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dataAccessEndpoint")
   public List<DataAccessEndpoint> getDataAccessEndpoint() {
     return dataAccessEndpoint;
   }
@@ -237,7 +233,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   
   @Schema(name = "jobId", description = "The ID of the management job.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobId")
   public String getJobId() {
     return jobId;
   }
@@ -259,7 +254,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Min(1) @Max(10) 
   @Schema(name = "jobPriority", description = "The priority of the management job. The way the management application will use the JobPriority to schedule job execution is application specific and outside the scope. Integer, limited to a range of 1 to 10.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobPriority")
   public Integer getJobPriority() {
     return jobPriority;
   }
@@ -281,7 +275,7 @@ public class ManagementJob extends BaseRootEntity {
   @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();
+    return (lastModifiedTime != null) ? lastModifiedTime.toString() : null;
   }
   
   public void setLastModifiedTime(String t) {
@@ -317,7 +311,6 @@ public class ManagementJob extends BaseRootEntity {
   */
   @Valid @Size(max = 1) 
   @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("scheduleDefinition")
   public List<ScheduleDefinition> getScheduleDefinition() {
     return scheduleDefinition;
   }
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 cafc616fc32d4596b4da2f24b43ce5a96c916e77..1d5c8616a9b559b3347aedb524274dd19aa5b030 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
@@ -102,9 +102,8 @@ public class ManagementJobFVO {
    * When sub-classing, this defines the sub-class Extensible name
    * @return atType
   */
-  @NotNull 
+  @NotNull
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -124,7 +123,6 @@ public class ManagementJobFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -144,7 +142,6 @@ public class ManagementJobFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -164,7 +161,6 @@ public class ManagementJobFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -184,7 +180,6 @@ public class ManagementJobFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -204,7 +199,6 @@ public class ManagementJobFVO {
   */
   @Valid 
   @Schema(name = "adminState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("adminState")
   public AdministrativeState getAdminState() {
     return adminState;
   }
@@ -226,7 +220,7 @@ public class ManagementJobFVO {
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
   public String getCreationTimeStr() {
-    return creationTime.toString();
+    return (creationTime != null) ? creationTime.toString() : null;
   }
   
   public void setCreationTime(String t) {
@@ -254,7 +248,6 @@ public class ManagementJobFVO {
   */
   @Valid 
   @Schema(name = "executionState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("executionState")
   public ExecutionStateType getExecutionState() {
     return executionState;
   }
@@ -282,7 +275,6 @@ public class ManagementJobFVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileTransferData")
   public List<FileTransferDataFVO> getFileTransferData() {
     return fileTransferData;
   }
@@ -310,7 +302,6 @@ public class ManagementJobFVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dataAccessEndpoint")
   public List<DataAccessEndpointFVO> getDataAccessEndpoint() {
     return dataAccessEndpoint;
   }
@@ -330,7 +321,6 @@ public class ManagementJobFVO {
   */
   
   @Schema(name = "jobId", description = "The ID of the management job.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobId")
   public String getJobId() {
     return jobId;
   }
@@ -352,7 +342,6 @@ public class ManagementJobFVO {
   */
   @Min(1) @Max(10) 
   @Schema(name = "jobPriority", description = "The priority of the management job. The way the management application will use the JobPriority to schedule job execution is application specific and outside the scope. Integer, limited to a range of 1 to 10.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobPriority")
   public Integer getJobPriority() {
     return jobPriority;
   }
@@ -374,7 +363,7 @@ public class ManagementJobFVO {
   @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();
+    return (lastModifiedTime != null) ? lastModifiedTime.toString() : null;
   }
   
   public void setLastModifiedTime(String t) {
@@ -410,7 +399,6 @@ public class ManagementJobFVO {
   */
   @Valid @Size(max = 1) 
   @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("scheduleDefinition")
   public List<ScheduleDefinitionFVO> getScheduleDefinition() {
     return scheduleDefinition;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java
index fce75a1ae821d4577cef8534573c0b437fce5a8a..bc99e22fd4bcc1eeb7590308290302c40c2a9c0e 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java
@@ -88,7 +88,6 @@ public class ManagementJobMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -108,7 +107,6 @@ public class ManagementJobMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -128,7 +126,6 @@ public class ManagementJobMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -148,7 +145,6 @@ public class ManagementJobMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -168,7 +164,6 @@ public class ManagementJobMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -196,7 +191,6 @@ public class ManagementJobMVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("fileTransferData")
   public List<FileTransferDataMVO> getFileTransferData() {
     return fileTransferData;
   }
@@ -224,7 +218,6 @@ public class ManagementJobMVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dataAccessEndpoint")
   public List<DataAccessEndpointMVO> getDataAccessEndpoint() {
     return dataAccessEndpoint;
   }
@@ -252,7 +245,6 @@ public class ManagementJobMVO {
   */
   @Valid @Size(max = 1) 
   @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("scheduleDefinition")
   public List<ScheduleDefinitionMVO> getScheduleDefinition() {
     return scheduleDefinition;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java
index 308dc32fd589c3f400850b368a87016637232a3f..3b93280384bd8e0f6b464ff2a635d729be5bf3ae 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java
@@ -75,7 +75,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea
   */
   
   @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("outputFormat")
   public String getOutputFormat() {
     return outputFormat;
   }
@@ -95,7 +94,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea
   */
   @Valid 
   @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("reportingPeriod")
   public ReportingPeriod getReportingPeriod() {
     return reportingPeriod;
   }
@@ -115,7 +113,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea
   */
   @Valid 
   @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobCollectionFilter")
   public DataFilterMap getJobCollectionFilter() {
     return jobCollectionFilter;
   }
@@ -135,7 +132,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea
   */
   @Valid 
   @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("searchTaskFilter")
   public DataFilterMap getSearchTaskFilter() {
     return searchTaskFilter;
   }
@@ -155,7 +151,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea
   */
   
   @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobOnDemand")
   public Boolean getJobOnDemand() {
     return jobOnDemand;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java
index 9da9af128eef3935a82a0084b5b445562fe2bcf6..69d243cd6e4fa9ac13a9f5bfb17a66271f26e3fa 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java
@@ -54,7 +54,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO {
   */
   
   @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("outputFormat")
   public String getOutputFormat() {
     return outputFormat;
   }
@@ -74,7 +73,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO {
   */
   @Valid 
   @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("reportingPeriod")
   public ReportingPeriod getReportingPeriod() {
     return reportingPeriod;
   }
@@ -94,7 +92,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO {
   */
   @Valid 
   @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobCollectionFilter")
   public DataFilterMapFVO getJobCollectionFilter() {
     return jobCollectionFilter;
   }
@@ -114,7 +111,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO {
   */
   @Valid 
   @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("searchTaskFilter")
   public DataFilterMapFVO getSearchTaskFilter() {
     return searchTaskFilter;
   }
@@ -134,7 +130,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO {
   */
   
   @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobOnDemand")
   public Boolean getJobOnDemand() {
     return jobOnDemand;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java
index 9ac755d5cdb27a42de7d77f8566ecc3f96771160..3fe46ef5cdf99dfc3d635f7d7c711c169f7e6f41 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java
@@ -53,7 +53,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO {
   */
   
   @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("outputFormat")
   public String getOutputFormat() {
     return outputFormat;
   }
@@ -73,7 +72,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO {
   */
   @Valid 
   @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("reportingPeriod")
   public ReportingPeriod getReportingPeriod() {
     return reportingPeriod;
   }
@@ -93,7 +91,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO {
   */
   @Valid 
   @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobCollectionFilter")
   public DataFilterMapMVO getJobCollectionFilter() {
     return jobCollectionFilter;
   }
@@ -113,7 +110,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO {
   */
   @Valid 
   @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("searchTaskFilter")
   public DataFilterMapMVO getSearchTaskFilter() {
     return searchTaskFilter;
   }
@@ -133,7 +129,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO {
   */
   
   @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("jobOnDemand")
   public Boolean getJobOnDemand() {
     return jobOnDemand;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java
index 2a2bfff9d6821d47fb7367427516ac06b4226dfe..c71b618cdb002a7ac887be0e967879944a9cf359 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java
@@ -60,7 +60,6 @@ public class MeasurementCollectionJobRef {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -80,7 +79,6 @@ public class MeasurementCollectionJobRef {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -100,7 +98,6 @@ public class MeasurementCollectionJobRef {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -120,7 +117,6 @@ public class MeasurementCollectionJobRef {
   */
   
   @Schema(name = "href", description = "The URI of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -140,7 +136,6 @@ public class MeasurementCollectionJobRef {
   */
   @NotNull 
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -160,7 +155,6 @@ public class MeasurementCollectionJobRef {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,7 +174,6 @@ public class MeasurementCollectionJobRef {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java
index c6056ebd771fb55d5acdc5810efa731ccb64ccac..00c43bd8da4368106ed0595e5fa2e426e1a8139d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java
@@ -62,7 +62,7 @@ public class MeasurementJob extends ManagementJob {
   @AnyKeyJavaClass(String.class)
   @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class)
   @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class)
-  @Cascade(org.hibernate.annotations.CascadeType.MERGE)
+  @Cascade({org.hibernate.annotations.CascadeType.MERGE, org.hibernate.annotations.CascadeType.PERSIST})
   @JoinTable(
           name = "pm628_meas_job_perf_ind_specs",
           joinColumns = @JoinColumn(name = "meas_job_uuid"),
@@ -110,7 +110,6 @@ public class MeasurementJob extends ManagementJob {
   */
   
   @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("consumingApplicationId")
   public String getConsumingApplicationId() {
     return consumingApplicationId;
   }
@@ -130,7 +129,6 @@ public class MeasurementJob extends ManagementJob {
   */
   
   @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("producingApplicationId")
   public String getProducingApplicationId() {
     return producingApplicationId;
   }
@@ -150,7 +148,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid 
   @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("granularity")
   public Granularity getGranularity() {
     return granularity;
   }
@@ -178,7 +175,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorGroupSpecification")
   public List<PerformanceIndicatorGroupSpecification> getPerformanceIndicatorGroupSpecification() {
     return performanceIndicatorGroupSpecification;
   }
@@ -206,7 +202,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValue> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
@@ -234,7 +229,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("trackingRecord")
   public List<TrackingRecord> getTrackingRecord() {
     return trackingRecord;
   }
@@ -254,7 +248,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid 
   @Schema(name = "monitoredInstancesCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredInstancesCriteria")
   public MonitoredInstancesCriteria getMonitoredInstancesCriteria() {
     return monitoredInstancesCriteria;
   }
@@ -274,7 +267,6 @@ public class MeasurementJob extends ManagementJob {
   */
   @Valid 
   @Schema(name = "monitoredClassCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredClassCriteria")
   public MonitoredClassCriteria getMonitoredClassCriteria() {
     return monitoredClassCriteria;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java
index 4c321c728727dc14f9aa1f06e82265b32e76948a..dd095431e1f4c59c03662c3a77b42ead457a2070 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java
@@ -84,7 +84,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @NotNull 
   @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("consumingApplicationId")
   public String getConsumingApplicationId() {
     return consumingApplicationId;
   }
@@ -104,7 +103,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @NotNull 
   @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("producingApplicationId")
   public String getProducingApplicationId() {
     return producingApplicationId;
   }
@@ -124,7 +122,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @Valid 
   @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("granularity")
   public Granularity getGranularity() {
     return granularity;
   }
@@ -152,7 +149,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorGroupSpecification")
   public List<PerformanceIndicatorGroupSpecificationFVO> getPerformanceIndicatorGroupSpecification() {
     return performanceIndicatorGroupSpecification;
   }
@@ -180,7 +176,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @NotNull @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValueFVO> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
@@ -208,7 +203,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("trackingRecord")
   public List<TrackingRecordFVO> getTrackingRecord() {
     return trackingRecord;
   }
@@ -228,7 +222,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @Valid 
   @Schema(name = "monitoredInstancesCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredInstancesCriteria")
   public MonitoredInstancesCriteriaFVO getMonitoredInstancesCriteria() {
     return monitoredInstancesCriteria;
   }
@@ -248,7 +241,6 @@ public class MeasurementJobFVO extends ManagementJobFVO {
   */
   @Valid 
   @Schema(name = "monitoredClassCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredClassCriteria")
   public MonitoredClassCriteriaFVO getMonitoredClassCriteria() {
     return monitoredClassCriteria;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java
index 02d6e767aaeb5810b195369f9cccc86b108311a2..b971db1057e5d3b8dbe45188f85ecd4201393dc6 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java
@@ -73,7 +73,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   
   @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("consumingApplicationId")
   public String getConsumingApplicationId() {
     return consumingApplicationId;
   }
@@ -93,7 +92,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   
   @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("producingApplicationId")
   public String getProducingApplicationId() {
     return producingApplicationId;
   }
@@ -113,7 +111,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   @Valid 
   @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("granularity")
   public Granularity getGranularity() {
     return granularity;
   }
@@ -141,7 +138,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorGroupSpecification")
   public List<PerformanceIndicatorGroupSpecificationMVO> getPerformanceIndicatorGroupSpecification() {
     return performanceIndicatorGroupSpecification;
   }
@@ -169,7 +165,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
@@ -197,7 +192,6 @@ public class MeasurementJobMVO extends ManagementJobMVO {
   */
   @Valid @Size(min = 0) 
   @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("trackingRecord")
   public List<TrackingRecordMVO> getTrackingRecord() {
     return trackingRecord;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java
index 92e98bbcb86d32706021d1dee94828a024a0db64..a05958314dea65314acfeadb3e3720f445b9070f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java
@@ -58,7 +58,6 @@ public class MonitoredClassCriteria {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -78,7 +77,6 @@ public class MonitoredClassCriteria {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -98,7 +96,6 @@ public class MonitoredClassCriteria {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -118,7 +115,6 @@ public class MonitoredClassCriteria {
   */
   
   @Schema(name = "monitoredObjectClass", description = "A monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredObjectClass")
   public String getMonitoredObjectClass() {
     return monitoredObjectClass;
   }
@@ -138,7 +134,6 @@ public class MonitoredClassCriteria {
   */
   
   @Schema(name = "objectInstanceFilter", description = "A filter that can be used in conjunction with the monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("objectInstanceFilter")
   public String getObjectInstanceFilter() {
     return objectInstanceFilter;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java
index 436acd394207fad361b706fece191385b332363a..e489dd8a5c1121bc6bc475750d8d0f4a55516350 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java
@@ -52,7 +52,6 @@ public class MonitoredClassCriteriaFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -72,7 +71,6 @@ public class MonitoredClassCriteriaFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -92,7 +90,6 @@ public class MonitoredClassCriteriaFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -112,7 +109,6 @@ public class MonitoredClassCriteriaFVO {
   */
   
   @Schema(name = "monitoredObjectClass", description = "A monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredObjectClass")
   public String getMonitoredObjectClass() {
     return monitoredObjectClass;
   }
@@ -132,7 +128,6 @@ public class MonitoredClassCriteriaFVO {
   */
   
   @Schema(name = "objectInstanceFilter", description = "A filter that can be used in conjunction with the monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("objectInstanceFilter")
   public String getObjectInstanceFilter() {
     return objectInstanceFilter;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java
index 722b6eb5eb464ebc6890368f35fa952a8f7ff623..2adc9d8d33371ab9b14555fc847f246a50a4492a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java
@@ -60,7 +60,6 @@ public class MonitoredInstancesCriteria {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -80,7 +79,6 @@ public class MonitoredInstancesCriteria {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -100,7 +98,6 @@ public class MonitoredInstancesCriteria {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -128,7 +125,6 @@ public class MonitoredInstancesCriteria {
   */
   @Size(min = 0) 
   @Schema(name = "monitoredObjectInstances", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredObjectInstances")
   public List<String> getMonitoredObjectInstances() {
     return monitoredObjectInstances;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java
index d91d0f7a9a52b57ee35616352cec139f2fc5eb60..508f29c2309b7d47529a1485b2bab1741962dbb3 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java
@@ -54,7 +54,6 @@ public class MonitoredInstancesCriteriaFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -74,7 +73,6 @@ public class MonitoredInstancesCriteriaFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -94,7 +92,6 @@ public class MonitoredInstancesCriteriaFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -122,7 +119,6 @@ public class MonitoredInstancesCriteriaFVO {
   */
   @Size(min = 0) 
   @Schema(name = "monitoredObjectInstances", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("monitoredObjectInstances")
   public List<String> getMonitoredObjectInstances() {
     return monitoredObjectInstances;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java
index 2570eee4ea6a882291868f2929e6a816e7c22b49..fd8f9886d9fb75b6cbdd72d91206991311e8ee71 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java
@@ -66,7 +66,6 @@ public class MonthlyScheduleDayOfWeekDefinition {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -86,7 +85,6 @@ public class MonthlyScheduleDayOfWeekDefinition {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -106,7 +104,6 @@ public class MonthlyScheduleDayOfWeekDefinition {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -134,7 +131,6 @@ public class MonthlyScheduleDayOfWeekDefinition {
   */
   @Valid 
   @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dayOfMonthRecurrence")
   public List<DayOfMonthRecurrence> getDayOfMonthRecurrence() {
     return dayOfMonthRecurrence;
   }
@@ -154,7 +150,6 @@ public class MonthlyScheduleDayOfWeekDefinition {
   */
   
   @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringDaySequence")
   public String getRecurringDaySequence() {
     return recurringDaySequence;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java
index c5e8663d362f652fa566a4a1ae36c661cca2eb07..65cf88847cef7aedafd1e8f770600a9fc882c011 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java
@@ -56,7 +56,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -76,7 +75,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -96,7 +94,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO {
   */
   @Valid 
   @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dayOfMonthRecurrence")
   public List<DayOfMonthRecurrenceFVO> getDayOfMonthRecurrence() {
     return dayOfMonthRecurrence;
   }
@@ -144,7 +140,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO {
   */
   
   @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringDaySequence")
   public String getRecurringDaySequence() {
     return recurringDaySequence;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java
index 760f22c2bfdfa882eb2c41d61b4bd516c4573d6b..09a52a0aae7ae69d27f03fbd85106e542966c95d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java
@@ -56,7 +56,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -76,7 +75,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -96,7 +94,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
   */
   @Valid 
   @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("dayOfMonthRecurrence")
   public List<DayOfMonthRecurrenceMVO> getDayOfMonthRecurrence() {
     return dayOfMonthRecurrence;
   }
@@ -144,7 +140,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
   */
   
   @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringDaySequence")
   public String getRecurringDaySequence() {
     return recurringDaySequence;
   }
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..97ae6cc127e51da6b77798387d435667e50f5282 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;
 
@@ -59,7 +58,6 @@ public class NoteFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +77,6 @@ public class NoteFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +96,6 @@ public class NoteFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getAtSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +115,6 @@ public class NoteFVO {
   */
   
   @Schema(name = "author", example = "Mr. N. Bene", description = "Author of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("author")
   public String getAuthor() {
     return author;
   }
@@ -140,6 +135,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 != null) ? date.toString() : null;
+  }
+
+  public void setDate(String date) {
+    if ( date!= null ) {
+      this.date = OffsetDateTime.parse( date );
+    }
+  }
+
   public OffsetDateTime getDate() {
     return date;
   }
@@ -159,7 +164,6 @@ public class NoteFVO {
   */
   
   @Schema(name = "text", example = "This is important", description = "Text of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("text")
   public String getText() {
     return text;
   }
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..48488414b5310f2a2687d74ef9461992f95bd08f 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;
 
@@ -62,7 +61,6 @@ public class NoteMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -82,7 +80,6 @@ public class NoteMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -102,7 +99,6 @@ public class NoteMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -122,7 +118,6 @@ public class NoteMVO {
   */
   
   @Schema(name = "uuid", example = "afa9-3d90aaa8da0f", description = "Identifier of the note within its containing entity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -142,7 +137,6 @@ public class NoteMVO {
   */
   
   @Schema(name = "author", example = "Mr. N. Bene", description = "Author of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("author")
   public String getAuthor() {
     return author;
   }
@@ -163,6 +157,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 != null) ? date.toString() : null;
+  }
+
+  public void setDate(String date) {
+    if ( date!= null ) {
+      this.date = OffsetDateTime.parse( date );
+    }
+  }
+
   public OffsetDateTime getDate() {
     return date;
   }
@@ -182,7 +186,6 @@ public class NoteMVO {
   */
   
   @Schema(name = "text", example = "This is important", description = "Text of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("text")
   public String getText() {
     return text;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java
index 4e692f8b9c30c19e76860c90e6077c257dd6db47..afdb505ad8b527c6153836f898cb455230c2498f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java
@@ -31,7 +31,6 @@ public class PackingType {
   */
   @Valid 
   @Schema(name = "packingEnumType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("packingEnumType")
   public PackingEnumType getPackingEnumType() {
     return packingEnumType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java
index a620d50485b486c7dffd0de84728ea3181085298..483a6d199d2c566b8409a90a5f444d4da8e72239 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java
@@ -44,7 +44,6 @@ public class PartyRef extends BaseRootNamedEntity implements PartyRefOrPartyRole
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java
index b7aaa1403bb15a82c45375152089b061d9462ade..e1c787344a558b288fc5cad3cb5dfd47e3cba750 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java
@@ -59,7 +59,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java
index 1d5a9d440a4f654812285e6e3910de6e6310a053..2863a81fdbc819b6b5d6435c2ed651404322e6b9 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java
@@ -59,7 +59,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java
index 4d8a3ec7cfbf55f3d70a4e1f43e699d8ce2678c6..b2ccf0cf9284f68c8a874b779cd6859ad668d2fb 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java
@@ -49,7 +49,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -69,7 +68,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty
   */
   
   @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyId")
   public String getPartyId() {
     return partyId;
   }
@@ -89,7 +87,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty
   */
   
   @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyName")
   public String getPartyName() {
     return partyName;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java
index fafb8ee40b87b522ac7654e5d720d95a0f93cfa0..e124f1507ac841a8d1460b765156105027cb8421 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java
@@ -64,7 +64,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -144,7 +140,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -164,7 +159,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -184,7 +178,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -204,7 +197,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyId")
   public String getPartyId() {
     return partyId;
   }
@@ -224,7 +216,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyName")
   public String getPartyName() {
     return partyName;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java
index bc500b8fa6337c6f2e8236dca2fa4c70bafad71c..52a06ce4c4bdf359ea31446eb2ace66078af1629 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java
@@ -64,7 +64,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -144,7 +140,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -164,7 +159,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -184,7 +178,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -204,7 +197,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyId")
   public String getPartyId() {
     return partyId;
   }
@@ -224,7 +216,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyName")
   public String getPartyName() {
     return partyName;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java
index d8aa88a548164f3abd07871bfc0c7f9ec1f0beee..7a5296d4518ed4d8da9e50293f88150728c3c0d0 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java
@@ -35,7 +35,7 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity
   @AnyKeyJavaClass(String.class)
   @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class)
   @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class)
-  @Cascade(CascadeType.MERGE)
+  @Cascade({CascadeType.MERGE, CascadeType.PERSIST})
   @JoinTable(
           name = "perf_ind_group_spec_perf_ind_specs",
           joinColumns = @JoinColumn(name = "perf_ind_group_spec_id"),
@@ -65,7 +65,6 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity
   */
   
   @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("groupCategory")
   public String getGroupCategory() {
     return groupCategory;
   }
@@ -93,7 +92,6 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity
   */
   @Valid @Size(min = 1) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValue> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java
index 9eef4812e681c9d2f180daeb10a499422680d256..22da9c9c4918c34f836263345596815402f2d0ea 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java
@@ -62,7 +62,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -82,7 +81,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return atBaseType;
   }
@@ -102,7 +100,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -122,7 +119,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   @NotNull 
   @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorGroupSpecification is tagged.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -142,7 +138,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   @NotNull 
   @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("groupCategory")
   public String getGroupCategory() {
     return groupCategory;
   }
@@ -170,7 +165,6 @@ public class PerformanceIndicatorGroupSpecificationFVO {
   */
   @Valid @Size(min = 1) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValueFVO> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java
index b9f81abf78a87996557332138af7c0f5aebb4e8f..211304d30be209af7a7069a80f65bf04ed4328ee 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java
@@ -63,7 +63,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -83,7 +82,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -103,7 +101,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -123,7 +120,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -143,7 +139,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   
   @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorGroupSpecification is tagged.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -163,7 +158,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   
   @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("groupCategory")
   public String getGroupCategory() {
     return groupCategory;
   }
@@ -191,7 +185,6 @@ public class PerformanceIndicatorGroupSpecificationMVO {
   */
   @Valid @Size(min = 1) 
   @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecification")
   public List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> getPerformanceIndicatorSpecification() {
     return performanceIndicatorSpecification;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java
index d699bf46a720c65681da732df81d9d5ba9304f3e..6ea112ddb22b2841e06c3b8bcbd14926b4da46a7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java
@@ -44,7 +44,6 @@ public class PerformanceIndicatorGroupSpecificationRef extends BaseRootNamedEnti
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -64,7 +63,6 @@ public class PerformanceIndicatorGroupSpecificationRef extends BaseRootNamedEnti
   */
   
   @Schema(name = "version", description = "Version of the performance indicator group specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java
index 38b35e0713aefedc9605cf7e895268f8052652cd..671dcd864687a1d22c7bf82873519b1afd3fdd69 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java
@@ -52,7 +52,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity {
   */
   
   @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
@@ -72,7 +71,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity {
   */
   
   @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -92,7 +90,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java
index bc47f4991df35d68de0302a2691751f329f37bf0..0602b39e6cb3fc5f952f2ec002c72f390b78b753 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java
@@ -65,7 +65,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -85,7 +84,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -105,7 +103,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -125,7 +122,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -145,7 +141,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -165,7 +160,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
@@ -185,7 +179,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   
   @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -205,7 +198,6 @@ public class PerformanceIndicatorSpecRelationshipFVO {
   */
   @NotNull @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java
index 5202124897734da90623393418eeadbea1661237..43995fcd9c3b4ff0398e688a73d33228c81a1d18 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java
@@ -63,7 +63,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -83,7 +82,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -103,7 +101,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -123,7 +120,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -143,7 +139,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -163,7 +158,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
@@ -183,7 +177,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   
   @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -203,7 +196,6 @@ public class PerformanceIndicatorSpecRelationshipMVO {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java
index 013009b4fead80d551a32ad41d397504d39feef0..5ea16283887d3a13124aa96e36bd56ed04263ee2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java
@@ -81,7 +81,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -101,7 +100,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("perspective")
   public String getPerspective() {
     return perspective;
   }
@@ -121,7 +119,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorCategory")
   public String getIndicatorCategory() {
     return indicatorCategory;
   }
@@ -141,7 +138,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   @Valid 
   @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorType")
   public IndicatorType getIndicatorType() {
     return indicatorType;
   }
@@ -161,7 +157,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationAlgorithm")
   public String getDerivationAlgorithm() {
     return derivationAlgorithm;
   }
@@ -181,7 +176,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationMethod")
   public String getDerivationMethod() {
     return derivationMethod;
   }
@@ -201,7 +195,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -221,7 +214,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   @Valid 
   @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("collectionType")
   public CollectionType getCollectionType() {
     return collectionType;
   }
@@ -241,7 +233,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   
   @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorUnit")
   public String getIndicatorUnit() {
     return indicatorUnit;
   }
@@ -269,7 +260,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecRelationship")
   public List<PerformanceIndicatorSpecRelationship> getPerformanceIndicatorSpecRelationship() {
     return performanceIndicatorSpecRelationship;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java
index 41aeac4c2a37fd2164b3b4538a6fe7500bbac653..b1db00f65de9d48b17bf8501e141dbd0eb7df0c2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java
@@ -96,7 +96,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -116,7 +115,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -136,7 +134,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -156,7 +153,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -176,7 +172,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -196,7 +191,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull 
   @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorSpecification is known and distinguished from other PerformanceIndicatorSpecifications.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -216,7 +210,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -236,7 +229,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("perspective")
   public String getPerspective() {
     return perspective;
   }
@@ -256,7 +248,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull 
   @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("indicatorCategory")
   public String getIndicatorCategory() {
     return indicatorCategory;
   }
@@ -276,7 +267,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull @Valid 
   @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("indicatorType")
   public IndicatorType getIndicatorType() {
     return indicatorType;
   }
@@ -296,7 +286,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationAlgorithm")
   public String getDerivationAlgorithm() {
     return derivationAlgorithm;
   }
@@ -316,7 +305,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   
   @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationMethod")
   public String getDerivationMethod() {
     return derivationMethod;
   }
@@ -336,7 +324,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -356,7 +343,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull @Valid 
   @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("collectionType")
   public CollectionType getCollectionType() {
     return collectionType;
   }
@@ -376,7 +362,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @NotNull 
   @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("indicatorUnit")
   public String getIndicatorUnit() {
     return indicatorUnit;
   }
@@ -404,7 +389,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecRelationship")
   public List<PerformanceIndicatorSpecRelationshipFVO> getPerformanceIndicatorSpecRelationship() {
     return performanceIndicatorSpecRelationship;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java
index a84bab65ea8f0a5e1cef22003e77033a5a943f81..e4364c7e4546112d4e676061efbd413e545a89fb 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java
@@ -32,6 +32,7 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   @JsonProperty("href")
   private String href;
 
+  @JsonProperty("uuid")
   private String uuid;
 
   @JsonProperty("name")
@@ -90,7 +91,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -110,7 +110,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getbaseType() {
     return baseType;
   }
@@ -130,7 +129,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -150,7 +148,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -170,7 +167,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getUuid() {
     return uuid;
   }
@@ -190,7 +186,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorSpecification is known and distinguished from other PerformanceIndicatorSpecifications.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -210,7 +205,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -230,7 +224,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("perspective")
   public String getPerspective() {
     return perspective;
   }
@@ -250,7 +243,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorCategory")
   public String getIndicatorCategory() {
     return indicatorCategory;
   }
@@ -270,7 +262,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   @Valid 
   @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorType")
   public IndicatorType getIndicatorType() {
     return indicatorType;
   }
@@ -290,7 +281,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationAlgorithm")
   public String getDerivationAlgorithm() {
     return derivationAlgorithm;
   }
@@ -310,7 +300,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("derivationMethod")
   public String getDerivationMethod() {
     return derivationMethod;
   }
@@ -330,7 +319,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -350,7 +338,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   @Valid 
   @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("collectionType")
   public CollectionType getCollectionType() {
     return collectionType;
   }
@@ -370,7 +357,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   
   @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("indicatorUnit")
   public String getIndicatorUnit() {
     return indicatorUnit;
   }
@@ -398,7 +384,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
   */
   @Valid @Size(min = 0) 
   @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("performanceIndicatorSpecRelationship")
   public List<PerformanceIndicatorSpecRelationshipMVO> getPerformanceIndicatorSpecRelationship() {
     return performanceIndicatorSpecRelationship;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java
index a9b0d63fd6122f59a05c31f146c12937aa8b4707..ccc59126dd46c53e9b11bd7019bb33f6b36f2747 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java
@@ -46,7 +46,6 @@ public class PerformanceIndicatorSpecificationRef extends BaseRootNamedEntity im
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -66,7 +65,6 @@ public class PerformanceIndicatorSpecificationRef extends BaseRootNamedEntity im
   */
   
   @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java
index 9c47680cf7d95963fd5fd9f961264f7122e09a85..0128d911cfc9533f8b617ef74fc0821c9bf3741a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java
@@ -61,7 +61,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -141,7 +137,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -161,7 +156,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -181,7 +175,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -201,7 +194,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic
   */
   
   @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java
index d1f799e2e85ba58b689389e8e96da7c4510ea3a4..46ed370f02548ea6ad1bc2e3cedc9f46a9659162 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java
@@ -27,6 +27,7 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   @JsonProperty("href")
   private String href;
 
+  @JsonProperty("uuid")
   private String uuid;
 
   @JsonProperty("name")
@@ -60,7 +61,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -80,7 +80,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -100,7 +99,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getschemaLocation() {
     return schemaLocation;
   }
@@ -120,7 +118,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -140,7 +137,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getUuid() {
     return uuid;
   }
@@ -160,7 +156,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,7 +175,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -200,7 +194,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic
   */
   
   @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java
index d731eb1b7186200bc85f34e51951268144c2610f..0e3811136b5d71d5845417a495b826c9fe4ef75d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java
@@ -59,7 +59,6 @@ public class PlaceRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class PlaceRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java
index 8b3dadfd4dac80882d992d4039483a8c5e84f17c..3e3c0fe4d8fdce092b8fd4e17e47db12e4d8c3e2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java
@@ -59,7 +59,6 @@ public class PlaceRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class PlaceRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java
index ae4fa994677b317b0e5dd7ac377cb649fe1c287c..c34526e58a19ea7b3aceb43c62290d8e4904b06f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java
@@ -46,7 +46,6 @@ public class PolicyRef extends BaseRootNamedEntity {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -66,7 +65,6 @@ public class PolicyRef extends BaseRootNamedEntity {
   */
   
   @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java
index 161957cf6c433c728c6e7362b6f32f633441f3a0..2e0ed5a04b1a708e4477ae5f83c2fbd57bc3f607 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java
@@ -61,7 +61,6 @@ public class PolicyRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -141,7 +137,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -161,7 +156,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -181,7 +175,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -201,7 +194,6 @@ public class PolicyRefFVO {
   */
   
   @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java
index bf33af52d89dda38f12962d3ff17a0ddc9e21ade..da83103c6476ff807c01d5bd286d9d997f33e211 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java
@@ -61,7 +61,6 @@ public class PolicyRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -141,7 +137,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -161,7 +156,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -181,7 +175,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -201,7 +194,6 @@ public class PolicyRefMVO {
   */
   
   @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java
index d359615136fb2945cc825e3a2d217ee46b93782c..4e99c480046b9d9b47230fe4a45fdd28c4ec56d2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java
@@ -42,7 +42,6 @@ public class ProtocolTransferData {
   */
   
   @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("transportProtocol")
   public String getTransportProtocol() {
     return transportProtocol;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java
index 87ccdfa202a08a4e921213d61a1a02a8deff9b84..96f43e30d9f05892ce9ccacfc3a3a3c7663fed9f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java
@@ -39,7 +39,6 @@ public class ProtocolTransferDataFVO {
   */
   
   @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("transportProtocol")
   public String getTransportProtocol() {
     return transportProtocol;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java
index 9c47362206189f4fd4a838ea8864c2a1b3046851..a6f0eb3279e0ca8ebdc8347be073d5c8fe561497 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java
@@ -28,7 +28,6 @@ public class ProtocolTransferDataMVO {
   */
   
   @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("transportProtocol")
   public String getTransportProtocol() {
     return transportProtocol;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java
index 4acb35bfbcea03e48a7ec345a7ea2e09952c07ba..1c4eb38a4a30af5ae2d8f4b8719422a34cf7bad7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java
@@ -72,7 +72,6 @@ public class RelatedPartyRefOrPartyRoleRef {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -92,7 +91,6 @@ public class RelatedPartyRefOrPartyRoleRef {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -112,7 +110,6 @@ public class RelatedPartyRefOrPartyRoleRef {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -132,7 +129,6 @@ public class RelatedPartyRefOrPartyRoleRef {
   */
   
   @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer',  'salesAgent', 'user'", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -152,7 +148,6 @@ public class RelatedPartyRefOrPartyRoleRef {
   */
   @Valid 
   @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyOrPartyRole")
   public PartyRefOrPartyRoleRef getPartyOrPartyRole() {
     return partyOrPartyRole;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java
index af9af1004ffd42dc18353b7bdfdda70de2f30496..64957138c86192065ced0e963c311a5306d21a37 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java
@@ -54,7 +54,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -74,7 +73,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -94,7 +92,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,7 +111,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO {
   */
   @NotNull 
   @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer',  'salesAgent', 'user'", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -134,7 +130,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO {
   */
   @Valid 
   @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyOrPartyRole")
   public PartyRefOrPartyRoleRefFVO getPartyOrPartyRole() {
     return partyOrPartyRole;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java
index 241aaaed6bf594c31495f682f306954ca431c303..473a3c515d5ba464e13508a3f9ea6b7b274d64c0 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java
@@ -54,7 +54,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -74,7 +73,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -94,7 +92,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -114,7 +111,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO {
   */
   @NotNull 
   @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer',  'salesAgent', 'user'", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -134,7 +130,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO {
   */
   @Valid 
   @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("partyOrPartyRole")
   public PartyRefOrPartyRoleRefMVO getPartyOrPartyRole() {
     return partyOrPartyRole;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java
index efeea7ac8ab5622228eccaab2ce656630ef72534..fd67b4caa0a6d86cd60028f6dc0912af75046625 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java
@@ -50,7 +50,6 @@ public class RelatedPlaceRef extends BaseRootEntity {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -70,7 +69,6 @@ public class RelatedPlaceRef extends BaseRootEntity {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -90,7 +88,6 @@ public class RelatedPlaceRef extends BaseRootEntity {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -110,7 +107,6 @@ public class RelatedPlaceRef extends BaseRootEntity {
   */
   
   @Schema(name = "role", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -130,7 +126,6 @@ public class RelatedPlaceRef extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("place")
   public PlaceRef getPlace() {
     return place;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java
index 43ca4b450a5807ae5781b89f70a8bb419e388ad4..70a91004dea5b2ee4c219256d9709e554da7b230 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java
@@ -55,7 +55,6 @@ public class RelatedPlaceRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -75,7 +74,6 @@ public class RelatedPlaceRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -95,7 +93,6 @@ public class RelatedPlaceRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -115,7 +112,6 @@ public class RelatedPlaceRefFVO {
   */
   @NotNull 
   @Schema(name = "role", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -135,7 +131,6 @@ public class RelatedPlaceRefFVO {
   */
   @NotNull @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("place")
   public PlaceRefFVO getPlace() {
     return place;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java
index f0e5b6dd3ba92e5afbedcca5a8dd8de1d5c3b92f..4b8d54b96c80f38a11dd2ce66eb7b8a9941ab85f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java
@@ -55,7 +55,6 @@ public class RelatedPlaceRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -75,7 +74,6 @@ public class RelatedPlaceRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -95,7 +93,6 @@ public class RelatedPlaceRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -115,7 +112,6 @@ public class RelatedPlaceRefMVO {
   */
   @NotNull 
   @Schema(name = "role", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
@@ -135,7 +131,6 @@ public class RelatedPlaceRefMVO {
   */
   @NotNull @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("place")
   public PlaceRefMVO getPlace() {
     return place;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java
index db5a49d10ca7dd61c0a18089b114b47742b81016..16aafdad3407cffc4ef6440af0f38426b2b927ed 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java
@@ -73,7 +73,6 @@ public class RelatedResourceOrderItem {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -93,7 +92,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -113,7 +111,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -133,7 +130,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -153,7 +149,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderHref")
   public String getResourceOrderHref() {
     return resourceOrderHref;
   }
@@ -173,7 +168,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderId")
   public String getResourceOrderId() {
     return resourceOrderId;
   }
@@ -193,7 +187,6 @@ public class RelatedResourceOrderItem {
   */
   @Valid 
   @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemAction")
   public OrderItemActionType getItemAction() {
     return itemAction;
   }
@@ -213,7 +206,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemId")
   public String getItemId() {
     return itemId;
   }
@@ -233,7 +225,6 @@ public class RelatedResourceOrderItem {
   */
   
   @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java
index 20c72707a4f5d322af95a00ff0f35593670dad93..2e65e81fb1ba45bf4f89dfdd8577ca133aa784bc 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java
@@ -66,7 +66,6 @@ public class RelatedResourceOrderItemFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -86,7 +85,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -106,7 +104,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -126,7 +123,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -146,7 +142,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderHref")
   public String getResourceOrderHref() {
     return resourceOrderHref;
   }
@@ -166,7 +161,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderId")
   public String getResourceOrderId() {
     return resourceOrderId;
   }
@@ -186,7 +180,6 @@ public class RelatedResourceOrderItemFVO {
   */
   @Valid 
   @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemAction")
   public OrderItemActionType getItemAction() {
     return itemAction;
   }
@@ -206,7 +199,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemId")
   public String getItemId() {
     return itemId;
   }
@@ -226,7 +218,6 @@ public class RelatedResourceOrderItemFVO {
   */
   
   @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java
index 3627a63ad9ecb147133410df4732b890c715b882..ea7d3a06876a2f933a3fac38ebe7e84dd31e384c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java
@@ -66,7 +66,6 @@ public class RelatedResourceOrderItemMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -86,7 +85,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -106,7 +104,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -126,7 +123,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -146,7 +142,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderHref")
   public String getResourceOrderHref() {
     return resourceOrderHref;
   }
@@ -166,7 +161,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderId")
   public String getResourceOrderId() {
     return resourceOrderId;
   }
@@ -186,7 +180,6 @@ public class RelatedResourceOrderItemMVO {
   */
   @Valid 
   @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemAction")
   public OrderItemActionType getItemAction() {
     return itemAction;
   }
@@ -206,7 +199,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("itemId")
   public String getItemId() {
     return itemId;
   }
@@ -226,7 +218,6 @@ public class RelatedResourceOrderItemMVO {
   */
   
   @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("role")
   public String getRole() {
     return role;
   }
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..81f60f10abf56ef4f294cceedb7b280e138dd3d3 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;
 
@@ -188,7 +186,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   
   @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("category")
   public String getCategory() {
     return category;
   }
@@ -208,7 +205,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   
   @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -229,6 +225,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 != null) ? endOperatingDate.toString() : null;
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -248,7 +254,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("administrativeState")
   public ResourceAdministrativeStateType getAdministrativeState() {
     return administrativeState;
   }
@@ -268,7 +273,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("operationalState")
   public ResourceOperationalStateType getOperationalState() {
     return operationalState;
   }
@@ -288,7 +292,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceStatus")
   public ResourceStatusType getResourceStatus() {
     return resourceStatus;
   }
@@ -308,7 +311,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("usageState")
   public ResourceUsageStateType getUsageState() {
     return usageState;
   }
@@ -328,7 +330,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -356,7 +357,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("note")
   public List<Note> getNote() {
     return note;
   }
@@ -384,7 +384,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderItem")
   public List<RelatedResourceOrderItem> getResourceOrderItem() {
     return resourceOrderItem;
   }
@@ -412,7 +411,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("place")
   public List<RelatedPlaceRef> getPlace() {
     return place;
   }
@@ -440,7 +438,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relatedParty")
   public List<RelatedPartyRefOrPartyRoleRef> getRelatedParty() {
     return relatedParty;
   }
@@ -468,7 +465,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationship")
   public List<ResourceRelationship> getResourceRelationship() {
     return resourceRelationship;
   }
@@ -496,7 +492,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceCharacteristic")
   public List<Characteristic> getResourceCharacteristic() {
     return resourceCharacteristic;
   }
@@ -524,7 +519,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("attachment")
   public List<AttachmentRef> getAttachment() {
     return attachment;
   }
@@ -544,7 +538,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceSpecification")
   public ResourceSpecificationRef getResourceSpecification() {
     return resourceSpecification;
   }
@@ -565,6 +558,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 != null) ? startOperatingDate.toString() : null;
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
@@ -584,7 +587,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   
   @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceVersion")
   public String getResourceVersion() {
     return resourceVersion;
   }
@@ -612,7 +614,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("activationFeature")
   public List<Feature> getActivationFeature() {
     return activationFeature;
   }
@@ -632,7 +633,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("intent")
   public IntentRef getIntent() {
     return intent;
   }
@@ -660,7 +660,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
   */
   @Valid 
   @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("externalIdentifier")
   public List<ExternalIdentifier> getExternalIdentifier() {
     return externalIdentifier;
   }
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..7fa5d26195d111fa25d0d19c427f051019974073 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;
 
@@ -151,7 +149,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -171,7 +168,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -191,7 +187,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -211,7 +206,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -231,7 +225,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -251,7 +244,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("category")
   public String getCategory() {
     return category;
   }
@@ -271,7 +263,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -291,7 +282,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "name", description = "the name of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -312,6 +302,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 != null) ? endOperatingDate.toString() : null;
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -331,7 +331,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("administrativeState")
   public ResourceAdministrativeStateType getAdministrativeState() {
     return administrativeState;
   }
@@ -351,7 +350,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("operationalState")
   public ResourceOperationalStateType getOperationalState() {
     return operationalState;
   }
@@ -371,7 +369,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceStatus")
   public ResourceStatusType getResourceStatus() {
     return resourceStatus;
   }
@@ -391,7 +388,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("usageState")
   public ResourceUsageStateType getUsageState() {
     return usageState;
   }
@@ -411,7 +407,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -439,7 +434,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("note")
   public List<NoteFVO> getNote() {
     return note;
   }
@@ -467,7 +461,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderItem")
   public List<RelatedResourceOrderItemFVO> getResourceOrderItem() {
     return resourceOrderItem;
   }
@@ -495,7 +488,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("place")
   public List<RelatedPlaceRefFVO> getPlace() {
     return place;
   }
@@ -523,7 +515,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relatedParty")
   public List<RelatedPartyRefOrPartyRoleRefFVO> getRelatedParty() {
     return relatedParty;
   }
@@ -551,7 +542,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationship")
   public List<ResourceRelationshipFVO> getResourceRelationship() {
     return resourceRelationship;
   }
@@ -579,7 +569,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceCharacteristic")
   public List<CharacteristicFVO> getResourceCharacteristic() {
     return resourceCharacteristic;
   }
@@ -607,7 +596,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("attachment")
   public List<AttachmentRefFVO> getAttachment() {
     return attachment;
   }
@@ -627,7 +615,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceSpecification")
   public ResourceSpecificationRefFVO getResourceSpecification() {
     return resourceSpecification;
   }
@@ -648,6 +635,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 != null) ? startOperatingDate.toString() : null;
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
@@ -667,7 +664,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceVersion")
   public String getResourceVersion() {
     return resourceVersion;
   }
@@ -695,7 +691,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("activationFeature")
   public List<FeatureFVO> getActivationFeature() {
     return activationFeature;
   }
@@ -715,7 +710,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("intent")
   public IntentRefFVO getIntent() {
     return intent;
   }
@@ -743,7 +737,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
   */
   @Valid 
   @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("externalIdentifier")
   public List<ExternalIdentifierFVO> getExternalIdentifier() {
     return externalIdentifier;
   }
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..6baa14d700dabd1e947dd8f404bbb4c518244842 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;
 
@@ -151,7 +149,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -171,7 +168,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -191,7 +187,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -211,7 +206,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -231,7 +225,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -251,7 +244,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("category")
   public String getCategory() {
     return category;
   }
@@ -271,7 +263,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -291,7 +282,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "name", description = "the name of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -312,6 +302,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 != null) ? endOperatingDate.toString() : null;
+  }
+
+  public void setEndOperatingDate(String endOperatingDate) {
+    if ( endOperatingDate!= null ) {
+      this.endOperatingDate = OffsetDateTime.parse( endOperatingDate );
+    }
+  }
+
   public OffsetDateTime getEndOperatingDate() {
     return endOperatingDate;
   }
@@ -331,7 +331,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("administrativeState")
   public ResourceAdministrativeStateType getAdministrativeState() {
     return administrativeState;
   }
@@ -351,7 +350,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("operationalState")
   public ResourceOperationalStateType getOperationalState() {
     return operationalState;
   }
@@ -371,7 +369,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceStatus")
   public ResourceStatusType getResourceStatus() {
     return resourceStatus;
   }
@@ -391,7 +388,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("usageState")
   public ResourceUsageStateType getUsageState() {
     return usageState;
   }
@@ -411,7 +407,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("validFor")
   public TimePeriod getValidFor() {
     return validFor;
   }
@@ -439,7 +434,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("note")
   public List<NoteMVO> getNote() {
     return note;
   }
@@ -467,7 +461,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceOrderItem")
   public List<RelatedResourceOrderItemMVO> getResourceOrderItem() {
     return resourceOrderItem;
   }
@@ -495,7 +488,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("place")
   public List<RelatedPlaceRefMVO> getPlace() {
     return place;
   }
@@ -523,7 +515,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relatedParty")
   public List<RelatedPartyRefOrPartyRoleRefMVO> getRelatedParty() {
     return relatedParty;
   }
@@ -551,7 +542,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationship")
   public List<ResourceRelationshipMVO> getResourceRelationship() {
     return resourceRelationship;
   }
@@ -579,7 +569,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceCharacteristic")
   public List<CharacteristicMVO> getResourceCharacteristic() {
     return resourceCharacteristic;
   }
@@ -607,7 +596,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("attachment")
   public List<AttachmentRefMVO> getAttachment() {
     return attachment;
   }
@@ -627,7 +615,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceSpecification")
   public ResourceSpecificationRefMVO getResourceSpecification() {
     return resourceSpecification;
   }
@@ -648,6 +635,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 != null) ? startOperatingDate.toString() : null;
+  }
+
+  public void setStartOperatingDate(String startOperatingDate) {
+    if ( startOperatingDate!= null ) {
+      this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );
+    }
+  }
+
   public OffsetDateTime getStartOperatingDate() {
     return startOperatingDate;
   }
@@ -667,7 +664,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceVersion")
   public String getResourceVersion() {
     return resourceVersion;
   }
@@ -695,7 +691,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("activationFeature")
   public List<FeatureMVO> getActivationFeature() {
     return activationFeature;
   }
@@ -715,7 +710,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("intent")
   public IntentRefMVO getIntent() {
     return intent;
   }
@@ -743,7 +737,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
   */
   @Valid 
   @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("externalIdentifier")
   public List<ExternalIdentifierMVO> getExternalIdentifier() {
     return externalIdentifier;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java
index 506214892aa786b2deea608897e7357ac27bf2b3..b693956e1f55e3c6b425f834369b77349af9b72a 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java
@@ -44,7 +44,6 @@ public class ResourceRef extends BaseRootNamedEntity implements ResourceRefOrVal
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java
index 660e50bfb39b12baef42c8ff675a67b49a407611..1ee89019e8640cc5f9704302d8d6332c5c797e1f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java
@@ -59,7 +59,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java
index a826aa4767fe762c1da7d1c3acee4fb315933152..7e745986cea86edd564f32e641c979ebe7dd62d7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java
@@ -59,7 +59,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -79,7 +78,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -99,7 +97,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -119,7 +116,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -139,7 +135,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -159,7 +154,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,7 +173,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java
index a82363a1fbcdfdc34d3a956325359c6dc17b0ed1..d1cf795221b218582103efd4ea75d3b0842dd278 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java
@@ -73,7 +73,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -93,7 +92,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -113,7 +111,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -141,7 +138,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationshipCharacteristic")
   public List<Characteristic> getResourceRelationshipCharacteristic() {
     return resourceRelationshipCharacteristic;
   }
@@ -161,7 +157,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resource")
   public ResourceRefOrValue getResource() {
     return resource;
   }
@@ -181,7 +176,6 @@ public class ResourceRelationship extends BaseRootEntity {
   */
   
   @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java
index 5421fd4b8d33c2d2c0b3cf1c5a9d00d5212941fa..5d4b6d504deb450ddf142814a2f0fdf4af442332 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java
@@ -61,7 +61,6 @@ public class ResourceRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class ResourceRelationshipFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class ResourceRelationshipFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -129,7 +126,6 @@ public class ResourceRelationshipFVO {
   */
   @Valid 
   @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationshipCharacteristic")
   public List<CharacteristicFVO> getResourceRelationshipCharacteristic() {
     return resourceRelationshipCharacteristic;
   }
@@ -149,7 +145,6 @@ public class ResourceRelationshipFVO {
   */
   @NotNull @Valid 
   @Schema(name = "resource", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("resource")
   public ResourceRefOrValueFVO getResource() {
     return resource;
   }
@@ -169,7 +164,6 @@ public class ResourceRelationshipFVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java
index 0c876f7711521fb3086a8a7a6fe55e3c53ed4315..27b02be3bc730c06b40b4a8758bec229206c5872 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java
@@ -64,7 +64,6 @@ public class ResourceRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -84,7 +83,6 @@ public class ResourceRelationshipMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -104,7 +102,6 @@ public class ResourceRelationshipMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -124,7 +121,6 @@ public class ResourceRelationshipMVO {
    */
 
   @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -152,7 +148,6 @@ public class ResourceRelationshipMVO {
   */
   @Valid 
   @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("resourceRelationshipCharacteristic")
   public List<CharacteristicMVO> getResourceRelationshipCharacteristic() {
     return resourceRelationshipCharacteristic;
   }
@@ -172,7 +167,6 @@ public class ResourceRelationshipMVO {
   */
   @NotNull @Valid 
   @Schema(name = "resource", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("resource")
   public ResourceRefOrValueMVO getResource() {
     return resource;
   }
@@ -192,7 +186,6 @@ public class ResourceRelationshipMVO {
   */
   @NotNull 
   @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java
index e4feb9455b77bbfbce70cd1c7dd9467e4985c76e..f264ed73288bad78e2154622e7f8106cf3bc0a40 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java
@@ -61,7 +61,6 @@ public class ResourceSpecificationRefFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -141,7 +137,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -161,7 +156,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -181,7 +175,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -201,7 +194,6 @@ public class ResourceSpecificationRefFVO {
   */
   
   @Schema(name = "version", description = "Resource Specification version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java
index 4a562330e492106897d1c28ff37f1235b8ea99f1..a4907b2e7a4ed18c71f7a4c4f86752eb6c892b57 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java
@@ -61,7 +61,6 @@ public class ResourceSpecificationRefMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -81,7 +80,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -101,7 +99,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -121,7 +118,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -141,7 +137,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -161,7 +156,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -181,7 +175,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@referredType")
   public String getReferredType() {
     return referredType;
   }
@@ -201,7 +194,6 @@ public class ResourceSpecificationRefMVO {
   */
   
   @Schema(name = "version", description = "Resource Specification version", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("version")
   public String getVersion() {
     return version;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
index cb8ede20f185391b412c7859b00f3258d3b7f28a..780123221f02cf0b8eec96b63c1da42dff852352 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
@@ -87,7 +87,7 @@ public class ScheduleDefinition extends BaseRootEntity {
   
   @JsonProperty("scheduleDefinitionStartTime")
   public String getScheduleDefinitionStartTimeString() {
-    return scheduleDefinitionStartTime.toString();
+    return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
   }
   
   
@@ -119,7 +119,7 @@ public class ScheduleDefinition extends BaseRootEntity {
   
   @JsonProperty("scheduleDefinitionEndTime")
   public String getScheduleDefinitionEndTimeString() {
-    return scheduleDefinitionEndTime.toString();
+    return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
   }
   
   public void setScheduleDefinitionEndTime(String t) {
@@ -143,7 +143,6 @@ public class ScheduleDefinition extends BaseRootEntity {
   */
   
   @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringFrequency")
   public String getRecurringFrequency() {
     return recurringFrequency;
   }
@@ -244,7 +243,6 @@ public class ScheduleDefinition extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("WeeklyScheduledDefinition")
   public List<DayOfWeekRecurrence> getWeeklyScheduledDefinition() {
     return weeklyScheduledDefinition;
   }
@@ -317,7 +315,6 @@ public class ScheduleDefinition extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("MonthlyScheduleDayOfWeekDefinition")
   public MonthlyScheduleDayOfWeekDefinition getMonthlyScheduleDayOfWeekDefinition() {
     return monthlyScheduleDayOfWeekDefinition;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
index 8df65f117c28d401ca7c60df7b63752e4cb97573..af6403c1d4b16e08e2644837a4f85cd926eb1488 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
@@ -43,14 +43,17 @@ public class ScheduleDefinitionFVO {
   @Valid
   private List<OffsetDateTime> excludedDate = new ArrayList<>();
 
+  @JsonProperty("scheduleDefinitionHourRange")
   private String scheduleDefinitionHourRange;
 
   @Valid
+  @JsonProperty("WeeklyScheduledDefinition")
   private List<DayOfWeekRecurrenceFVO> weeklyScheduledDefinition = new ArrayList<>();
 
   @Valid
   private List<OffsetDateTime> monthlyScheduleDayOfMonthDefinition = new ArrayList<>();
 
+  @JsonProperty("MonthlyScheduleDayOfWeekDefinition")
   private MonthlyScheduleDayOfWeekDefinitionFVO monthlyScheduleDayOfWeekDefinition;
 
   @Valid
@@ -78,7 +81,6 @@ public class ScheduleDefinitionFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -98,7 +100,6 @@ public class ScheduleDefinitionFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -118,7 +119,6 @@ public class ScheduleDefinitionFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -141,7 +141,7 @@ public class ScheduleDefinitionFVO {
 
   @JsonProperty("scheduleDefinitionStartTime")
   public String getScheduleDefinitionStartTimeString() {
-    return scheduleDefinitionStartTime.toString();
+    return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
   }
   
   
@@ -171,7 +171,7 @@ public class ScheduleDefinitionFVO {
   @Schema(name = "scheduleDefinitionEndTime", description = "The End time of the Schedule Definition. If the attribute is empty the Schedule run forever, not having a time constraint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("scheduleDefinitionEndTime")
   public String getScheduleDefinitionEndTimeString() {
-    return scheduleDefinitionEndTime.toString();
+    return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
   }
   
   public void setScheduleDefinitionEndTime(String t) {
@@ -199,7 +199,6 @@ public class ScheduleDefinitionFVO {
   */
   
   @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringFrequency")
   public String getRecurringFrequency() {
     return recurringFrequency;
   }
@@ -270,7 +269,6 @@ public class ScheduleDefinitionFVO {
   */
   
   @Schema(name = "scheduleDefinitionHourRange", description = "A list of time ranges within a specific day that the schedule will be active on, for example 08:00-12:00, 16:00-19:00.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("scheduleDefinitionHourRange")
   public String getScheduleDefinitionHourRange() {
     return scheduleDefinitionHourRange;
   }
@@ -298,7 +296,6 @@ public class ScheduleDefinitionFVO {
   */
   @Valid 
   @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("WeeklyScheduledDefinition")
   public List<DayOfWeekRecurrenceFVO> getWeeklyScheduledDefinition() {
     return weeklyScheduledDefinition;
   }
@@ -370,7 +367,6 @@ public class ScheduleDefinitionFVO {
   */
   @Valid 
   @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("MonthlyScheduleDayOfWeekDefinition")
   public MonthlyScheduleDayOfWeekDefinitionFVO getMonthlyScheduleDayOfWeekDefinition() {
     return monthlyScheduleDayOfWeekDefinition;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
index 1ac941975d37d1882e2eb03948ab1568b905099c..236df256baa9a22cb1371e36e488b4ca4ff7438c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
@@ -83,7 +83,6 @@ public class ScheduleDefinitionMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -103,7 +102,6 @@ public class ScheduleDefinitionMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -123,7 +121,6 @@ public class ScheduleDefinitionMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -143,7 +140,6 @@ public class ScheduleDefinitionMVO {
   */
   
   @Schema(name = "uuid", description = "Identifier of the schedule definition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }
@@ -166,7 +162,7 @@ public class ScheduleDefinitionMVO {
 
   @JsonProperty("scheduleDefinitionStartTime")
   public String getScheduleDefinitionStartTimeString() {
-    return scheduleDefinitionStartTime.toString();
+    return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
   }
   
   
@@ -199,7 +195,7 @@ public class ScheduleDefinitionMVO {
   @Schema(name = "scheduleDefinitionEndTime", description = "The End time of the Schedule Definition. If the attribute is empty the Schedule run forever, not having a time constraint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("scheduleDefinitionEndTime")
   public String getScheduleDefinitionEndTimeString() {
-    return scheduleDefinitionEndTime.toString();
+    return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
   }
   
   public void setScheduleDefinitionEndTime(String t) {
@@ -226,7 +222,6 @@ public class ScheduleDefinitionMVO {
   */
   
   @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("recurringFrequency")
   public String getRecurringFrequency() {
     return recurringFrequency;
   }
@@ -299,7 +294,6 @@ public class ScheduleDefinitionMVO {
   */
   
   @Schema(name = "scheduleDefinitionHourRange", description = "A list of time ranges within a specific day that the schedule will be active on, for example 08:00-12:00, 16:00-19:00.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("scheduleDefinitionHourRange")
   public String getScheduleDefinitionHourRange() {
     return scheduleDefinitionHourRange;
   }
@@ -327,7 +321,6 @@ public class ScheduleDefinitionMVO {
   */
   @Valid 
   @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("WeeklyScheduledDefinition")
   public List<DayOfWeekRecurrenceMVO> getWeeklyScheduledDefinition() {
     return weeklyScheduledDefinition;
   }
@@ -399,7 +392,6 @@ public class ScheduleDefinitionMVO {
   */
   @Valid 
   @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("MonthlyScheduleDayOfWeekDefinition")
   public MonthlyScheduleDayOfWeekDefinitionMVO getMonthlyScheduleDayOfWeekDefinition() {
     return monthlyScheduleDayOfWeekDefinition;
   }
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..bb04ae80251715888eebebd138f2cb42880d80e3 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;
 
@@ -67,7 +66,6 @@ public class TrackingRecord extends BaseRootEntity {
   */
   
   @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -95,7 +93,6 @@ public class TrackingRecord extends BaseRootEntity {
   */
   @Valid 
   @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("characteristic")
   public List<Characteristic> getCharacteristic() {
     return characteristic;
   }
@@ -115,7 +112,6 @@ public class TrackingRecord extends BaseRootEntity {
   */
   
   @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("systemId")
   public String getSystemId() {
     return systemId;
   }
@@ -136,6 +132,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 != null) ? time.toString() : null;
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }
@@ -155,7 +161,6 @@ public class TrackingRecord extends BaseRootEntity {
   */
   
   @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("user")
   public String getUser() {
     return user;
   }
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..8a92f10c79c42c19eaf18519cb6d60a6077ae3f1 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;
 
@@ -71,7 +70,6 @@ public class TrackingRecordFVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -91,7 +89,6 @@ public class TrackingRecordFVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -111,7 +108,6 @@ public class TrackingRecordFVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -131,7 +127,6 @@ public class TrackingRecordFVO {
   */
   
   @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -159,7 +154,6 @@ public class TrackingRecordFVO {
   */
   @Valid 
   @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("characteristic")
   public List<CharacteristicFVO> getCharacteristic() {
     return characteristic;
   }
@@ -179,7 +173,6 @@ public class TrackingRecordFVO {
   */
   
   @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("systemId")
   public String getSystemId() {
     return systemId;
   }
@@ -200,6 +193,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 != null) ? time.toString() : null;
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }
@@ -219,7 +222,6 @@ public class TrackingRecordFVO {
   */
   
   @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("user")
   public String getUser() {
     return user;
   }
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..b0ab0cf4576173df5a7a3161297fbd863cf1cf02 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;
 
@@ -74,7 +73,6 @@ public class TrackingRecordMVO {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
-  @JsonProperty("@type")
   public String getType() {
     return type;
   }
@@ -94,7 +92,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@baseType")
   public String getBaseType() {
     return baseType;
   }
@@ -114,7 +111,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("@schemaLocation")
   public String getSchemaLocation() {
     return schemaLocation;
   }
@@ -134,7 +130,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -162,7 +157,6 @@ public class TrackingRecordMVO {
   */
   @Valid 
   @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("characteristic")
   public List<CharacteristicMVO> getCharacteristic() {
     return characteristic;
   }
@@ -182,7 +176,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("systemId")
   public String getSystemId() {
     return systemId;
   }
@@ -203,6 +196,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 != null) ? time.toString() : null;
+  }
+
+  public void setTime(String time) {
+    if ( time!= null ) {
+      this.time = OffsetDateTime.parse( time );
+    }
+  }
+
   public OffsetDateTime getTime() {
     return time;
   }
@@ -222,7 +225,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("user")
   public String getUser() {
     return user;
   }
@@ -242,7 +244,6 @@ public class TrackingRecordMVO {
   */
   
   @Schema(name = "uuid", description = "Identifier of the TrackingRecord.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-  @JsonProperty("uuid")
   public String getUuid() {
     return uuid;
   }