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 ca8aee88d282c25aa8073ced5fa0e1ffa8687e3b..c0d060b655dd64683bf872851bd57867dff4f1fa 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
@@ -38,7 +38,7 @@ public class CharacteristicMVO {
 
   @JsonProperty("characteristicRelationship")
   @Valid
-  private List<CharacteristicRelationshipMVO> characteristicRelationship = new ArrayList<>();
+  private List<CharacteristicRelationshipMVO> characteristicRelationship;
 
   public CharacteristicMVO() {
     super();
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 ed61247284df2f6a63ed1e62ccf5fe828953e554..b4e4371c6ac326f54bdbc32c61084f2546d6cb26 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
@@ -49,15 +49,15 @@ public class ManagementJobMVO {
 
   @JsonProperty("fileTransferData")
   @Valid
-  private List<FileTransferDataMVO> fileTransferData = new ArrayList<>();
+  private List<FileTransferDataMVO> fileTransferData = null;
 
   @JsonProperty("dataAccessEndpoint")
   @Valid
-  private List<DataAccessEndpointMVO> dataAccessEndpoint = new ArrayList<>();
+  private List<DataAccessEndpointMVO> dataAccessEndpoint = null;
 
   @JsonProperty("scheduleDefinition")
   @Valid
-  private List<ScheduleDefinitionMVO> scheduleDefinition = new ArrayList<>();
+  private List<ScheduleDefinitionMVO> scheduleDefinition = null;
 
   // Property bellow was added by UoP and is not officialy part of TMF628 Model
   // @JsonProperty("executionState")
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java
index a1244ba8131e847073385340730ebf61c70f2ab2..1c211fdb3f41156de65c415baf01ea53b282776b 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java
@@ -2,6 +2,8 @@ package org.etsi.osl.tmf.pm628.model;
 
 import org.mapstruct.*;
 
+import java.util.List;
+
 @Mapper(
         nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
@@ -23,4 +25,17 @@ public interface MeasurementCollectionJobMapper {
     @Mapping(target = "uuid", ignore = true)
     @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
     MeasurementCollectionJob updateMeasurementCollectionJob(MeasurementCollectionJobMVO measurementCollectionJobMVO, @MappingTarget MeasurementCollectionJob measurementCollectionJob);
+
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<DataAccessEndpoint> dataAccessEndpointMVOListToDataAccessEndpointList(List<DataAccessEndpointMVO> list);
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<PerformanceIndicatorGroupSpecification> performanceIndicatorGroupSpecificationMVOListToPerformanceIndicatorGroupSpecificationList(List<PerformanceIndicatorGroupSpecificationMVO> list);
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<PerformanceIndicatorSpecificationRefOrValue> performanceIndicatorSpecificationMVOListToPerformanceIndicatorSpecificationList(List<PerformanceIndicatorSpecificationRefOrValueMVO> list);
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<TrackingRecord> trackingRecordMVOListToTrackingRecordList(List<TrackingRecordMVO> list);
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<FileTransferData> fileTransferDataMVOListToFileTransferDataList(List<FileTransferDataMVO> list);
+    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)
+    List<ScheduleDefinition> scheduleDefinitionMVOListToScheduleDefinitionList(List<ScheduleDefinitionMVO> list);
 }
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 b971db1057e5d3b8dbe45188f85ecd4201393dc6..0c9c1d1dbc8538257a743ea797bd55178c216a46 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
@@ -41,15 +41,15 @@ public class MeasurementJobMVO extends ManagementJobMVO {
 
   @JsonProperty("performanceIndicatorGroupSpecification")
   @Valid
-  private List<PerformanceIndicatorGroupSpecificationMVO> performanceIndicatorGroupSpecification = new ArrayList<>();
+  private List<PerformanceIndicatorGroupSpecificationMVO> performanceIndicatorGroupSpecification;
 
   @JsonProperty("performanceIndicatorSpecification")
   @Valid
-  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification = new ArrayList<>();
+  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification;
 
   @JsonProperty("trackingRecord")
   @Valid
-  private List<TrackingRecordMVO> trackingRecord = new ArrayList<>();
+  private List<TrackingRecordMVO> trackingRecord;
 
   public MeasurementJobMVO() {
     super();
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 09a52a0aae7ae69d27f03fbd85106e542966c95d..c108d597dbb827b7238ff5c83da3e8e8ca6a15d0 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
@@ -29,7 +29,7 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO {
 
   @JsonProperty("dayOfMonthRecurrence")
   @Valid
-  private List<DayOfMonthRecurrenceMVO> dayOfMonthRecurrence = new ArrayList<>();
+  private List<DayOfMonthRecurrenceMVO> dayOfMonthRecurrence;
 
   @JsonProperty("recurringDaySequence")
   private String recurringDaySequence;
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 211304d30be209af7a7069a80f65bf04ed4328ee..8d3a2e2351889bfc7a2fdd7b97d6cdfc6afc12c9 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
@@ -39,7 +39,7 @@ public class PerformanceIndicatorGroupSpecificationMVO {
 
   @JsonProperty("performanceIndicatorSpecification")
   @Valid
-  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification = new ArrayList<>();
+  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification;
 
   public PerformanceIndicatorGroupSpecificationMVO() {
     super();
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 e4364c7e4546112d4e676061efbd413e545a89fb..5c5f60493d5701359ed3d5cd37d2107f13b31982 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
@@ -67,7 +67,7 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato
 
   @JsonProperty("performanceIndicatorSpecRelationship")
   @Valid
-  private List<PerformanceIndicatorSpecRelationshipMVO> performanceIndicatorSpecRelationship = new ArrayList<>();
+  private List<PerformanceIndicatorSpecRelationshipMVO> performanceIndicatorSpecRelationship;
 
   public PerformanceIndicatorSpecificationMVO() {
     super();
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 6baa14d700dabd1e947dd8f404bbb4c518244842..90885e35866e7e36737d49c7ad874436d90c3f0e 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
@@ -81,31 +81,31 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
 
   @JsonProperty("note")
   @Valid
-  private List<NoteMVO> note = new ArrayList<>();
+  private List<NoteMVO> note;
 
   @JsonProperty("resourceOrderItem")
   @Valid
-  private List<RelatedResourceOrderItemMVO> resourceOrderItem = new ArrayList<>();
+  private List<RelatedResourceOrderItemMVO> resourceOrderItem;
 
   @JsonProperty("place")
   @Valid
-  private List<RelatedPlaceRefMVO> place = new ArrayList<>();
+  private List<RelatedPlaceRefMVO> place;
 
   @JsonProperty("relatedParty")
   @Valid
-  private List<RelatedPartyRefOrPartyRoleRefMVO> relatedParty = new ArrayList<>();
+  private List<RelatedPartyRefOrPartyRoleRefMVO> relatedParty ;
 
   @JsonProperty("resourceRelationship")
   @Valid
-  private List<ResourceRelationshipMVO> resourceRelationship = new ArrayList<>();
+  private List<ResourceRelationshipMVO> resourceRelationship;
 
   @JsonProperty("resourceCharacteristic")
   @Valid
-  private List<CharacteristicMVO> resourceCharacteristic = new ArrayList<>();
+  private List<CharacteristicMVO> resourceCharacteristic;
 
   @JsonProperty("attachment")
   @Valid
-  private List<AttachmentRefMVO> attachment = new ArrayList<>();
+  private List<AttachmentRefMVO> attachment;
 
   @JsonProperty("resourceSpecification")
   private ResourceSpecificationRefMVO resourceSpecification;
@@ -118,14 +118,14 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
 
   @JsonProperty("activationFeature")
   @Valid
-  private List<FeatureMVO> activationFeature = new ArrayList<>();
+  private List<FeatureMVO> activationFeature;
 
   @JsonProperty("intent")
   private IntentRefMVO intent;
 
   @JsonProperty("externalIdentifier")
   @Valid
-  private List<ExternalIdentifierMVO> externalIdentifier = new ArrayList<>();
+  private List<ExternalIdentifierMVO> externalIdentifier;
 
   public ResourceMVO() {
     super();
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 27b02be3bc730c06b40b4a8758bec229206c5872..40d0e35d312f524c0ac58159b1cde944cec75cea 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
@@ -32,7 +32,7 @@ public class ResourceRelationshipMVO {
 
   @JsonProperty("resourceRelationshipCharacteristic")
   @Valid
-  private List<CharacteristicMVO> resourceRelationshipCharacteristic = new ArrayList<>();
+  private List<CharacteristicMVO> resourceRelationshipCharacteristic;
 
   @JsonProperty("resource")
   private ResourceRefOrValueMVO resource;
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 236df256baa9a22cb1371e36e488b4ca4ff7438c..e9f904d54a4afb82881db2c1dc9b307f910c2c92 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
@@ -44,22 +44,22 @@ public class ScheduleDefinitionMVO {
   private String recurringFrequency;
 
   @Valid
-  private List<OffsetDateTime> excludedDate = new ArrayList<>();
+  private List<OffsetDateTime> excludedDate;
 
   @JsonProperty("scheduleDefinitionHourRange")
   private String scheduleDefinitionHourRange;
 
   @Valid
-  private List<DayOfWeekRecurrenceMVO> weeklyScheduledDefinition = new ArrayList<>();
+  private List<DayOfWeekRecurrenceMVO> weeklyScheduledDefinition;
 
   @Valid
-  private List<OffsetDateTime> monthlyScheduleDayOfMonthDefinition = new ArrayList<>();
+  private List<OffsetDateTime> monthlyScheduleDayOfMonthDefinition;
 
   @JsonProperty("MonthlyScheduleDayOfWeekDefinition")
   private MonthlyScheduleDayOfWeekDefinitionMVO monthlyScheduleDayOfWeekDefinition;
 
   @Valid
-  private List<OffsetDateTime> dateScheduleDefintion = new ArrayList<>();
+  private List<OffsetDateTime> dateScheduleDefintion;
 
   public ScheduleDefinitionMVO() {
     super();
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 b0ab0cf4576173df5a7a3161297fbd863cf1cf02..ef74d805376d944776c1fa424b98ce3cb9c5303a 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
@@ -37,7 +37,7 @@ public class TrackingRecordMVO {
 
   @JsonProperty("characteristic")
   @Valid
-  private List<CharacteristicMVO> characteristic = new ArrayList<>();
+  private List<CharacteristicMVO> characteristic;
 
   @JsonProperty("systemId")
   private String systemId;