diff --git a/pom.xml b/pom.xml
index ca6ca6ed092f9fa321d971631c3154840f293f7a..f112fd238b79ebc39c58adf3e78b481b70c18544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,6 +193,16 @@
 			<artifactId>org.etsi.osl.model.nfv</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.etsi.osl</groupId>
+			<artifactId>org.etsi.osl.model.tmf</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.etsi.osl</groupId>
+			<artifactId>org.etsi.osl.model.k8s</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.etsi.osl</groupId>
 			<artifactId>org.etsi.osl.centrallog.client</artifactId>
diff --git a/src/main/java/org/etsi/osl/domain/model/DomainModelDefinition.java b/src/main/java/org/etsi/osl/domain/model/DomainModelDefinition.java
deleted file mode 100644
index 7e5f6d6ec43b0f8efd8d84e353fc819cecd6d1b0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/DomainModelDefinition.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.etsi.osl.domain.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-
-@Getter
-@Setter
-@AllArgsConstructor
-public class DomainModelDefinition {
-	
-	//instance variables
-	protected String uuid;
-	protected String name;
-	protected String version;
-	protected String description;
-	protected String category;
-	
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/ITMFRCM634_ModelTransformer.java b/src/main/java/org/etsi/osl/domain/model/ITMFRCM634_ModelTransformer.java
deleted file mode 100644
index 3eb1340ca6f4dec0dd0ee4dac7ead9d1f8d293c9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/ITMFRCM634_ModelTransformer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.etsi.osl.domain.model;
-
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
-
-/**
- * @author ctranoris
- * 
- * Transforms the PoJo class to/from the equivalent TMF model 
- */
-public interface ITMFRCM634_ModelTransformer {
-	
-	
-	ResourceSpecificationCreate toRSpecCreate_InitRepo();
-	
-	
-	default ResourceSpecificationCreate toRSpecCreate() {
-		return null;
-	}
-	
-	default ResourceSpecificationUpdate toRSpecUpdate() {
-		return null;
-	}
-	
-	/**
-	 * loads the class fields from this model
-	 * @param rSpec
-	 */
-	DomainModelDefinition fromRSpec( ResourceSpecification rSpec ) ;
-	
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/ITMFRI639_ModelTransformer.java b/src/main/java/org/etsi/osl/domain/model/ITMFRI639_ModelTransformer.java
deleted file mode 100644
index 0ebcd095184d0469f0e28763bf14608949806d26..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/ITMFRI639_ModelTransformer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.etsi.osl.domain.model;
-
-import org.etsi.osl.tmf.ri639.model.Resource;
-import org.etsi.osl.tmf.ri639.model.ResourceCreate;
-import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
-
-/**
- * @author ctranoris
- * 
- * Transforms the PoJo class to/from the equivalent TMF model 
- */
-public interface ITMFRI639_ModelTransformer {
-	
-	
-
-	
-	default ResourceCreate toResourceCreate() throws Exception {
-		return null;
-	};
-
-	default ResourceUpdate toResourceUpdate() throws Exception {
-		return null;
-	};
-	
-	/**
-	 * loads the class fields from this model
-	 * @param rSpec
-	 */
-	default void fromResource( Resource rSpec ) {
-		
-	}
-
-	
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDProperty.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDProperty.java
deleted file mode 100644
index f67d484e478e0892441a40cbd97a286e01d72c91..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDProperty.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.etsi.osl.domain.model.kubernetes;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-@Getter
-@Setter
-@Builder
-public class KubernetesCRDProperty {
-
-	String name;
-	String valueType;
-	String defaultValue;
-	String description;
-	Map<String, KubernetesCRDProperty> properties;
-	
-	public Map<String, KubernetesCRDProperty> getProperties() {
-		if ( properties == null) {
-			this.properties = new HashMap<>();			
-		}
-		return properties;
-	}
-	
-
-	
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDV1.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDV1.java
deleted file mode 100644
index 07c17ac6462ea1f52f07414e216532d9eedc2da2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDV1.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.etsi.osl.domain.model.kubernetes;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.etsi.osl.domain.model.DomainModelDefinition;
-import org.etsi.osl.domain.model.ITMFRCM634_ModelTransformer;
-import org.etsi.osl.domain.model.ITMFRI639_ModelTransformer;
-import org.etsi.osl.tmf.common.model.ELifecycle;
-import org.etsi.osl.tmf.common.model.EValueType;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
-import org.etsi.osl.tmf.ri639.model.ResourceCreate;
-import org.etsi.osl.tmf.ri639.model.ResourceOperationalStateType;
-import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
-import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-@Getter
-@Setter
-public class KubernetesCRDV1 extends DomainModelDefinition
-		implements ITMFRCM634_ModelTransformer, ITMFRI639_ModelTransformer {
-
-	public static final String OSL_KUBCRD_RSPEC_NAME = "kubernetes-crd.openslice.io";
-	public static final String OSL_KUBCRD_RSPEC_VERSION = "0.0.3";
-	public static final String OSL_KUBCRD_RSPEC_CATEGORY = "KubernetesCRD-apiextensions.k8s.io/v1";
-	public static final String OSL_KUBCRD_RESOURCE_CATEGORY = "KubernetesCRD-apiextensions.k8s.io/v1";
-	public static final String OSL_KUBCRD_RSPEC_TYPE = "LogicalResourceSpecification";
-	public static final String OSL_KUBCRD_RSPEC_DESCRIPTION = "This Specification is used to describe a generic KubernetesCRD";
-
-	private String osl_KUBCRD_RSPEC_UUID = null; //this is assigned by the system through the DB for a specific instance
-	
-	private String clusterMasterURL;
-	private String currentContextCluster;
-	private String fullResourceName;
-	private String kind;
-	private String apiGroup;
-	private String UID;
-	private String metadata;
-	private String yaml;
-	private String json;
-	private Map<String, KubernetesCRDProperty> properties;
-	private Map<String, KubernetesCRDProperty> additionalProperties;
-    private String cr_spec;
-    private String statusCheckFieldName;
-    private String statusCheckValueStandby;
-    private String statusCheckValueAlarm;
-    private String statusCheckValueAvailable;
-    private String statusCheckValueReserved;
-    private String statusCheckValueUnknown;
-    private String statusCheckValueSuspended;
-
-
-	@Builder
-	public KubernetesCRDV1(String osl_KUBCRD_RSPEC_UUID, String uuid, String name, String version, String description, String category,
-			String clusterMasterURL, String currentContextCluster, String fullResourceName,
-			String kind, String apiGroup, String uID,
-			String metadata,
-			String yaml,
-			String json) {
-		super(uuid, name, version, description, category);
-		this.osl_KUBCRD_RSPEC_UUID = osl_KUBCRD_RSPEC_UUID;
-		this.clusterMasterURL = clusterMasterURL;
-		this.currentContextCluster = currentContextCluster;
-		this.fullResourceName = fullResourceName;
-		this.kind = kind;
-		this.apiGroup = apiGroup;
-		this.UID = uID;
-		this.metadata = metadata;
-		this.yaml = yaml;
-		this.json = json;
-		this.properties = new HashMap<>();
-		this.additionalProperties = new HashMap<>();	
-	}
-	
-	
-
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate_InitRepo() {
-
-		ResourceSpecificationCreate rsc = this.toRSpecCreate();
-		rsc.setName( OSL_KUBCRD_RSPEC_NAME );
-		rsc.setCategory( OSL_KUBCRD_RSPEC_CATEGORY );
-		rsc.setVersion(OSL_KUBCRD_RSPEC_VERSION);
-		rsc.setDescription( OSL_KUBCRD_RSPEC_DESCRIPTION );
-		rsc.setType( OSL_KUBCRD_RSPEC_TYPE );
-		
-		
-
-		return rsc;
-	}
-	
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate() {
-
-		ResourceSpecificationCreate rsc = new ResourceSpecificationCreate();
-		rsc.setName( this.name );
-		rsc.setCategory( OSL_KUBCRD_RSPEC_CATEGORY );
-		rsc.setVersion( this.version );
-		rsc.setDescription( this.version );
-		rsc.setType( OSL_KUBCRD_RSPEC_TYPE );
-		
-		rsc.setLifecycleStatus( ELifecycle.ACTIVE.getValue() );
-		rsc.addResourceSpecificationCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue(), "URL of cluster",  false);
-		rsc.addResourceSpecificationCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("metadata", this.metadata, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue(), "", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_SPEC", "", EValueType.TEXT.getValue(), "Used for providing the json Custom Resource description to apply", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECK_FIELD", "", EValueType.TEXT.getValue(), "Used for providing the field that need to be checked for the resource status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_STANDBY", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the standby status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_ALARM", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the alarm status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_AVAILABLE", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the available status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_RESERVED", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the reserved status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_UNKNOWN", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the unknown status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_SUSPENDED", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the suspended status", false);
-        
-//		rsc.addResourceSpecificationCharacteristicItemShort( "properties", "", EValueType.SET.getValue());
-//		rsc.addResourceSpecificationCharacteristicItemShort( "additionalProperties", "", EValueType.SET.getValue());
-		if (this.properties != null)
-			this.properties.forEach((kPropName, vProVal) -> {
-
-						EValueType etype;
-						if ( vProVal.getValueType().equalsIgnoreCase("boolean")) {
-							etype = EValueType.BOOLEAN;
-						} else if ( vProVal.getValueType().equalsIgnoreCase("integer")) {
-							etype = EValueType.INTEGER;
-						} else if ( vProVal.getValueType().equalsIgnoreCase("object")) {
-							etype = EValueType.OBJECT;
-						} else
-							etype = EValueType.TEXT;
-
-						rsc.addResourceSpecificationCharacteristicItemShort(kPropName , vProVal.getDefaultValue(), etype.getValue(), vProVal.getDescription(), false);
-
-			});
-
-		if (this.additionalProperties != null ) {
-			this.additionalProperties.forEach((kPropName, vProVal) -> {
-						rsc.addResourceSpecificationCharacteristicItemShort("additionalProperty." + kPropName, vProVal.getDefaultValue(), EValueType.TEXT.getValue(), vProVal.getDescription(), false);
-
-					});
-		}
-
-		return rsc;
-	}
-	
-	@Override
-	public ResourceSpecificationUpdate toRSpecUpdate() {
-		return this.toRSpecCreate();
-	}
-
-	@Override
-	public KubernetesCRDV1 fromRSpec(ResourceSpecification rSpec) {
-		this.osl_KUBCRD_RSPEC_UUID = rSpec.getUuid();
-		return this;
-	}
-	
-	@Override
-	public ResourceCreate toResourceCreate() {
-
-		if (osl_KUBCRD_RSPEC_UUID == null) {
-			return null;
-		}
-
-		ResourceSpecificationRef rSpecRef = new ResourceSpecificationRef();
-		rSpecRef.setId( osl_KUBCRD_RSPEC_UUID  );
-		rSpecRef.setName( OSL_KUBCRD_RSPEC_NAME );
-		rSpecRef.setVersion( OSL_KUBCRD_RSPEC_VERSION );
-		
-		ResourceCreate rs = new ResourceCreate();
-		rs.name( this.name )
-		.category( OSL_KUBCRD_RESOURCE_CATEGORY )
-		.description( this.description )
-		.resourceStatus( ResourceStatusType.AVAILABLE )
-		.operationalState( ResourceOperationalStateType.ENABLE )
-		.resourceSpecification( rSpecRef )
-		.resourceVersion( this.version);
-		
-		rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());
-		
-        rs.addResourceCharacteristicItemShort("_CR_SPEC", this.cr_spec, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECK_FIELD", this.statusCheckFieldName, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_STANDBY", this.statusCheckValueStandby, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_ALARM", this.statusCheckValueAlarm, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_AVAILABLE", this.statusCheckValueAvailable, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_RESERVED", this.statusCheckValueReserved, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_UNKNOWN", this.statusCheckValueUnknown, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_SUSPENDED", this.statusCheckValueSuspended, EValueType.TEXT.getValue());
-
-
-        
-		if (this.properties != null)
-			this.properties.forEach((kPropName, vProVal) -> {
-
-						EValueType etype;
-						if ( vProVal.getValueType().equalsIgnoreCase("boolean")) {
-							etype = EValueType.BOOLEAN;
-						} else if ( vProVal.getValueType().equalsIgnoreCase("integer")) {
-							etype = EValueType.INTEGER;
-						} else if ( vProVal.getValueType().equalsIgnoreCase("object")) {
-							etype = EValueType.OBJECT;
-						} else
-							etype = EValueType.TEXT;
-
-						rs.addResourceCharacteristicItemShort(kPropName , "", etype.getValue());
-
-			});
-
-		if (this.additionalProperties != null ) {
-			this.additionalProperties.forEach((kPropName, vProVal) -> {
-						rs.addResourceCharacteristicItemShort("additionalProperty." + kPropName, "", EValueType.TEXT.getValue());
-
-					});
-		}
-
-
-		return rs;
-	}
-	
-	@Override
-	public ResourceUpdate toResourceUpdate() {
-	
-		return this.toResourceCreate();
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java
deleted file mode 100644
index ec06b718e09ebd177c8ccebd8a39853d13680240..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRV1.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.etsi.osl.domain.model.kubernetes;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.etsi.osl.domain.model.DomainModelDefinition;
-import org.etsi.osl.domain.model.ITMFRCM634_ModelTransformer;
-import org.etsi.osl.domain.model.ITMFRI639_ModelTransformer;
-import org.etsi.osl.tmf.common.model.ELifecycle;
-import org.etsi.osl.tmf.common.model.EValueType;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
-import org.etsi.osl.tmf.ri639.model.ResourceCreate;
-import org.etsi.osl.tmf.ri639.model.ResourceOperationalStateType;
-import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
-import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-@Getter
-@Setter
-public class KubernetesCRV1 extends DomainModelDefinition
-		implements ITMFRCM634_ModelTransformer, ITMFRI639_ModelTransformer {
-
-	public static final String OSL_KUBCRV1_RSPEC_NAME = "kubernetes-cr-v1.openslice.io";
-	public static final String OSL_KUBCRV1_RSPEC_VERSION = "0.0.4";
-	public static final String OSL_KUBCRV1_RSPEC_CATEGORY = "KubernetesCRV1-apiextensions.k8s.io/v1";
-	public static final String OSL_KUBCRV1_RSPEC_TYPE = "LogicalResourceSpecification";
-	public static final String OSL_KUBCRV1_RSPEC_DESCRIPTION = "This Specification is used to describe a generic KubernetesCRV1";
-
-	private String osl_KUBCRV1_RSPEC_UUID = null; //this is assigned by the system through the DB for a specific instance
-	
-	private String clusterMasterURL;
-	private String currentContextCluster;
-	private String fullResourceName;
-	private String kind;
-	private String apiGroup;
-	private String namespace;
-	private String UID;
-	private String metadata;
-	private String yaml;
-	private String json;
-	private Map<String, String> properties;
-	private Map<String, String> additionalProperties;
-    private String cr_spec_applied;
-	private String statusCheckFieldName;
-    private String statusCheckValueStandby;
-    private String statusCheckValueAlarm;
-    private String statusCheckValueAvailable;
-    private String statusCheckValueReserved;
-    private String statusCheckValueUnknown;
-    private String statusCheckValueSuspended;
-    private ResourceStatusType statusValue;
-
-	@Builder
-	public KubernetesCRV1(String osl_KUBCRV1_RSPEC_UUID, String uuid, String name, String version, String description, String category,
-			String clusterMasterURL, String currentContextCluster, String fullResourceName, String namespace,
-			String kind, String apiGroup, String uID, String metadata, ResourceStatusType statusValue,
-			String yaml,
-			String json) {
-		super(uuid, name, version, description, category);
-		this.osl_KUBCRV1_RSPEC_UUID = osl_KUBCRV1_RSPEC_UUID;
-		this.clusterMasterURL = clusterMasterURL;
-		this.currentContextCluster = currentContextCluster;
-		this.fullResourceName = fullResourceName;
-		this.kind = kind;
-		this.apiGroup = apiGroup;
-		this.namespace = namespace;
-		this.UID = uID;
-		this.metadata = metadata;
-		this.yaml = yaml;
-        this.json = json;
-        this.statusValue = statusValue;
-		this.properties = new HashMap<>();
-		this.additionalProperties = new HashMap<>();	
-	}
-	
-	
-
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate_InitRepo() {
-
-		ResourceSpecificationCreate rsc = toRSpecCreate();
-		rsc.setName( OSL_KUBCRV1_RSPEC_NAME );
-		rsc.setCategory( OSL_KUBCRV1_RSPEC_CATEGORY );
-		rsc.setVersion(OSL_KUBCRV1_RSPEC_VERSION);
-		rsc.setDescription( OSL_KUBCRV1_RSPEC_DESCRIPTION );
-		rsc.setType( OSL_KUBCRV1_RSPEC_TYPE );
-		
-		return rsc;
-	}
-	
-	
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate() {
-
-		ResourceSpecificationCreate rsc = new ResourceSpecificationCreate();
-		rsc.setName( this.name );
-		rsc.setCategory( OSL_KUBCRV1_RSPEC_CATEGORY );
-		rsc.setVersion(this.version);
-		rsc.setDescription( this.description );
-		rsc.setType( OSL_KUBCRV1_RSPEC_TYPE );
-		
-		rsc.setLifecycleStatus( ELifecycle.ACTIVE.getValue() );
-		rsc.addResourceSpecificationCharacteristicItemShort( "clusterMasterURL", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "currentContextCluster", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "fullResourceName", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "Kind", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "apiGroup", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "UID", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "namespace", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "metadata", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "yaml", "", EValueType.TEXT.getValue(), "", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "json", "", EValueType.TEXT.getValue(), "", false);
-
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_SPEC", "", EValueType.TEXT.getValue(), "Used for providing the json Custom Resource description to apply", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_SPEC_APPLIED", "", EValueType.TEXT.getValue(), "Used for providing the json Custom Resource description as applied", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECK_FIELD", "", EValueType.TEXT.getValue(), "Used for providing the field that need to be checked for the resource status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_STANDBY", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the standby status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_ALARM", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the alarm status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_AVAILABLE", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the available status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_RESERVED", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the reserved status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_UNKNOWN", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the unknown status", false);
-        rsc.addResourceSpecificationCharacteristicItemShort( "_CR_CHECKVAL_SUSPENDED", "", EValueType.TEXT.getValue(), "Used for providing the equivalent value from resource to signal the suspended status", false);
-	    
-//		rsc.addResourceSpecificationCharacteristicItemShort( "properties", "", EValueType.SET.getValue());
-//		rsc.addResourceSpecificationCharacteristicItemShort( "additionalProperties", "", EValueType.SET.getValue());
-
-
-		return rsc;
-	}
-	
-	@Override
-	public ResourceSpecificationUpdate toRSpecUpdate() {
-		return this.toRSpecCreate();
-	}
-
-	@Override
-	public KubernetesCRV1 fromRSpec(ResourceSpecification rSpec) {
-		osl_KUBCRV1_RSPEC_UUID = rSpec.getUuid();
-		return this;
-	}
-	
-	@Override
-	public ResourceCreate toResourceCreate() {
-
-		if (osl_KUBCRV1_RSPEC_UUID == null) {
-			return null;
-		}
-
-		ResourceSpecificationRef rSpecRef = new ResourceSpecificationRef();
-		rSpecRef.setId( osl_KUBCRV1_RSPEC_UUID  );
-		rSpecRef.setName( OSL_KUBCRV1_RSPEC_NAME );
-		rSpecRef.setVersion( OSL_KUBCRV1_RSPEC_VERSION );
-		
-		ResourceCreate rs = new ResourceCreate();
-		rs.name( this.name )
-		.category( this.category )
-		.description( this.description )
-		
-		.resourceStatus( ResourceStatusType.RESERVED )
-		
-		.operationalState( ResourceOperationalStateType.ENABLE )
-		.resourceSpecification( rSpecRef )
-		.resourceVersion( this.version);
-		
-		rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("apiVersion", this.version , EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("namespace", this.namespace, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());
-        
-
-        rs.addResourceCharacteristicItemShort("_CR_SPEC_APPLIED", this.cr_spec_applied, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECK_FIELD", this.statusCheckFieldName, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_STANDBY", this.statusCheckValueStandby, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_ALARM", this.statusCheckValueAlarm, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_AVAILABLE", this.statusCheckValueAvailable, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_RESERVED", this.statusCheckValueReserved, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_UNKNOWN", this.statusCheckValueUnknown, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("_CR_CHECKVAL_SUSPENDED", this.statusCheckValueSuspended, EValueType.TEXT.getValue());
-
-        rs.resourceStatus( this.statusValue );        
-        
-		if (this.properties != null)
-			this.properties.forEach((kPropName, vProVal) -> {
-						rs.addResourceCharacteristicItemShort(kPropName , vProVal, EValueType.TEXT.getValue());
-
-			});
-
-		if (this.additionalProperties != null ) {
-			this.additionalProperties.forEach((kPropName, vProVal) -> {
-						rs.addResourceCharacteristicItemShort(kPropName, vProVal, EValueType.TEXT.getValue());
-
-					});
-		}
-
-
-		return rs;
-	}
-	
-	@Override
-	public ResourceUpdate toResourceUpdate() {
-	
-		return this.toResourceCreate();
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesContextDefinition.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesContextDefinition.java
deleted file mode 100644
index c4f6a01987e8efe01f00b13e345b202ddda564f8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesContextDefinition.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.etsi.osl.domain.model.kubernetes;
-
-import org.etsi.osl.domain.model.DomainModelDefinition;
-import org.etsi.osl.domain.model.ITMFRCM634_ModelTransformer;
-import org.etsi.osl.domain.model.ITMFRI639_ModelTransformer;
-import org.etsi.osl.tmf.common.model.ELifecycle;
-import org.etsi.osl.tmf.common.model.EValueType;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
-import org.etsi.osl.tmf.ri639.model.ResourceCreate;
-import org.etsi.osl.tmf.ri639.model.ResourceOperationalStateType;
-import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
-import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-@Getter
-@Setter
-public class KubernetesContextDefinition 
-	extends DomainModelDefinition 
-	implements ITMFRCM634_ModelTransformer,	ITMFRI639_ModelTransformer {
-
-	
-	public static final String OSL_KUBD_RSPEC_NAME = "kubernetes-context-definition.openslice.io";
-	public static final String OSL_KUBD_RSPEC_VERSION = "0.0.1";
-	public static final String OSL_KUBD_RSPEC_CATEGORY = "KubernetesContextDefinition";
-	public static final String OSL_KUBD_RESOURCE_CATEGORY = "KubernetesContextDefinition";
-	public static final String OSL_KUBD_RSPEC_TYPE = "LogicalResourceSpecification";
-	public static final String OSL_KUBD_RSPEC_DESCRIPTION = "This Specification is used to describe a KubernetesClient";	
-
-	private String osl_KUBD_SPEC_UUID = null; //this is assigned by the system through the DB for a specific instance
-	
-	//properties of an instance
-	private String masterURL;
-	private String currentContextName;
-	private String currentContextCluster;
-	private String currentContextUser;
-	private String clusterVersion;
-	
-
-    @Builder
-	public KubernetesContextDefinition(String osl_KUBD_SPEC_UUID, String uuid, String name, String version, String description, String category,
-			String masterURL, String currentContextName, String currentContextCluster, String currentContextUser,
-			String clusterVersion) {
-		super(uuid, name, version, description, category);
-		this.osl_KUBD_SPEC_UUID = osl_KUBD_SPEC_UUID;
-		this.masterURL = masterURL;
-		this.currentContextName = currentContextName;
-		this.currentContextCluster = currentContextCluster;
-		this.currentContextUser = currentContextUser;
-		this.clusterVersion = clusterVersion;
-	}
-
-	
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate_InitRepo() {
-		ResourceSpecificationCreate rsc = this.toRSpecCreate();
-		rsc.setName( OSL_KUBD_RSPEC_NAME );
-		rsc.setVersion( OSL_KUBD_RSPEC_VERSION );
-		rsc.setCategory( OSL_KUBD_RSPEC_CATEGORY );
-		rsc.setDescription( OSL_KUBD_RSPEC_DESCRIPTION );
-		rsc.setType( OSL_KUBD_RSPEC_TYPE );
-		rsc.setLifecycleStatus( ELifecycle.ACTIVE.getValue() );
-
-		return rsc;
-		
-	}
-	
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate() {
-		ResourceSpecificationCreate rsc = new ResourceSpecificationCreate();
-		rsc.setName( this.name );
-		rsc.setVersion( this.version );
-		rsc.setCategory( OSL_KUBD_RSPEC_CATEGORY );
-		rsc.setDescription( this.description );
-		rsc.setType( OSL_KUBD_RSPEC_TYPE );
-		rsc.setLifecycleStatus( ELifecycle.ACTIVE.getValue() );
-		rsc.addResourceSpecificationCharacteristicItemShort( "masterURL", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "resourceVersion", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "currentContextName", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "currentContextCluster", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "currentContextUser", "", EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort( "clusterVersion", "", EValueType.TEXT.getValue(), "", false);		
-		return rsc;
-		
-	}
-	
-	@Override
-	public ResourceSpecificationUpdate toRSpecUpdate() {
-		return this.toRSpecCreate();
-	}
-	
-	/* we care only for the ID of the specification from the stored model. The definition will be static
-	 * (non-Javadoc)
-	 * @see org.etsi.osl.domain.model.ITMFRCM634_ModelTransformer#fromRSpec(org.etsi.osl.tmf.rcm634.model.ResourceSpecification)
-	 */
-	@Override
-	public KubernetesContextDefinition fromRSpec(ResourceSpecification rSpec) {
-		osl_KUBD_SPEC_UUID = rSpec.getUuid();
-		return this;
-	}
-	
-	
-	/* 
-	 * returns Null if OSL_KUBD_RSPEC_UUID is not initialized
-	 * (non-Javadoc)
-	 * @see org.etsi.osl.domain.model.ITMFRI639_ModelTransformer#toResourceCreate()
-	 */
-	@Override
-	public ResourceCreate toResourceCreate() throws Exception {
-		if (this.osl_KUBD_SPEC_UUID == null) {
-			throw new Exception( "osl_UUID is null. Resource cannot be created without referring a Resource specification" );
-
-		}
-		
-		ResourceSpecificationRef rSpecRef = new ResourceSpecificationRef();
-		rSpecRef.setId( this.osl_KUBD_SPEC_UUID  );
-		rSpecRef.setName( OSL_KUBD_RSPEC_NAME );
-		rSpecRef.setVersion( OSL_KUBD_RSPEC_VERSION );
-		
-		ResourceCreate rs = new ResourceCreate();
-		rs.setName( this.name );
-		rs.setResourceStatus( ResourceStatusType.AVAILABLE );
-		rs.setOperationalState( ResourceOperationalStateType.ENABLE);
-		rs.setCategory( OSL_KUBD_RESOURCE_CATEGORY );
-		rs.setResourceSpecification(rSpecRef);
-		rs.resourceVersion( this.clusterVersion );
-
-		rs.addResourceCharacteristicItemShort("masterUrl", this.masterURL, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextName", this.currentContextName  , EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster   , EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextUser", this.currentContextUser  , EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("clusterVersion", this.clusterVersion  , EValueType.TEXT.getValue());
-		
-		
-		
-		
-		return rs;
-	}
-	
-	@Override
-	public ResourceUpdate toResourceUpdate() throws Exception {
-		return this.toResourceCreate();
-	}
-
-	
-
-	
-}
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java
deleted file mode 100644
index 820c777f39fcc275e8d3eea9d6b822313cd057cc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.etsi.osl.domain.model.kubernetes;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.etsi.osl.domain.model.DomainModelDefinition;
-import org.etsi.osl.domain.model.ITMFRCM634_ModelTransformer;
-import org.etsi.osl.domain.model.ITMFRI639_ModelTransformer;
-import org.etsi.osl.tmf.common.model.ELifecycle;
-import org.etsi.osl.tmf.common.model.EValueType;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;
-import org.etsi.osl.tmf.ri639.model.ResourceCreate;
-import org.etsi.osl.tmf.ri639.model.ResourceOperationalStateType;
-import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
-import org.etsi.osl.tmf.ri639.model.ResourceUpdate;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author ctranoris
- */
-@Getter
-@Setter
-public class KubernetesSecret extends DomainModelDefinition
-		implements ITMFRCM634_ModelTransformer, ITMFRI639_ModelTransformer {
-
-	public static final String OSL_KUBSECRET_RSPEC_NAME = "kubernetes-secret.openslice.io";
-	public static final String OSL_KUBSECRET_RSPEC_VERSION = "0.0.3";
-	public static final String OSL_KUBSECRET_RSPEC_CATEGORY = "Secret/Kubernetes/v1";
-	public static final String OSL_KUBSECRET_RESOURCE_CATEGORY = "Secret/Kubernetes/v1";
-	public static final String OSL_KUBSECRET_RSPEC_TYPE = "LogicalResourceSpecification";
-	public static final String OSL_KUBSECRET_RSPEC_DESCRIPTION = "This Specification is used to describe a generic Kubernetes Secret";
-
-	private String osl_KUBCRD_RSPEC_UUID = null; //this is assigned by the system through the DB for a specific instance
-	
-	private String clusterMasterURL;
-	private String currentContextCluster;
-	private String fullResourceName;
-	private String kind;
-	private String apiGroup;
-	private String UID;
-	private String metadata;
-	private String yaml;
-	private String json;
-    private String namespace;
-	
-
-    private Map<String, String> data;
-    private String dataObj;
-	private Map<String, String> properties;
-
-
-	@Builder
-	public KubernetesSecret(String osl_KUBCRD_RSPEC_UUID, String uuid, String name, String version, String description, String category,
-			String clusterMasterURL, String currentContextCluster, String fullResourceName, String namespace,
-			String kind, String apiGroup, String uID,
-			String metadata,
-			String yaml,
-			String json) {
-		super(uuid, name, version, description, category);
-		this.osl_KUBCRD_RSPEC_UUID = osl_KUBCRD_RSPEC_UUID;
-		this.clusterMasterURL = clusterMasterURL;
-		this.currentContextCluster = currentContextCluster;
-		this.fullResourceName = fullResourceName;
-		this.kind = kind;
-		this.apiGroup = apiGroup;
-        this.namespace = namespace;
-		this.UID = uID;
-		this.metadata = metadata;
-		this.yaml = yaml;
-		this.json = json;
-        this.properties = new HashMap<>();
-        this.data = new HashMap<>();
-		this.category = OSL_KUBSECRET_RSPEC_CATEGORY;
-	}
-	
-	
-
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate_InitRepo() {
-
-		ResourceSpecificationCreate rsc = this.toRSpecCreate();
-		rsc.setName( OSL_KUBSECRET_RSPEC_NAME );
-		rsc.setCategory( OSL_KUBSECRET_RSPEC_CATEGORY );
-		rsc.setVersion(OSL_KUBSECRET_RSPEC_VERSION);
-		rsc.setDescription( OSL_KUBSECRET_RSPEC_DESCRIPTION );
-		rsc.setType( OSL_KUBSECRET_RSPEC_TYPE );
-		
-		
-
-		return rsc;
-	}
-	
-	@Override
-	public ResourceSpecificationCreate toRSpecCreate() {
-
-		ResourceSpecificationCreate rsc = new ResourceSpecificationCreate();
-		rsc.setName( this.name );
-		rsc.setCategory( OSL_KUBSECRET_RSPEC_CATEGORY );
-		rsc.setVersion( this.version );
-		rsc.setDescription( this.version );
-		rsc.setType( OSL_KUBSECRET_RSPEC_TYPE );
-		
-		rsc.setLifecycleStatus( ELifecycle.ACTIVE.getValue() );
-		rsc.addResourceSpecificationCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue(), "URL of cluster",  false);
-		rsc.addResourceSpecificationCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue(), "", false);
-		rsc.addResourceSpecificationCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue(), "", false);
-        rsc.addResourceSpecificationCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue(), "", false);
-        
-		if (this.properties != null)
-		  this.properties.forEach((kPropName, vProVal) -> {
-		    EValueType etype;		 
-		    etype = EValueType.TEXT;
-		    rsc.addResourceSpecificationCharacteristicItemShort(kPropName , vProVal, etype.getValue(), "", false);
-
-		  });
-		if (this.data != null)
-		  this.data.forEach((kPropName, vProVal) -> {
-		    EValueType etype;        
-		    etype = EValueType.TEXT;
-		    rsc.addResourceSpecificationCharacteristicItemShort(kPropName , vProVal, etype.getValue(), "", false);
-
-		  });
-		
-
-
-		return rsc;
-	}
-	
-	@Override
-	public ResourceSpecificationUpdate toRSpecUpdate() {
-		return this.toRSpecCreate();
-	}
-
-	@Override
-	public KubernetesSecret fromRSpec(ResourceSpecification rSpec) {
-		this.osl_KUBCRD_RSPEC_UUID = rSpec.getUuid();
-		return this;
-	}
-	
-	@Override
-	public ResourceCreate toResourceCreate() {
-
-		if (osl_KUBCRD_RSPEC_UUID == null) {
-			return null;
-		}
-
-		ResourceSpecificationRef rSpecRef = new ResourceSpecificationRef();
-		rSpecRef.setId( osl_KUBCRD_RSPEC_UUID  );
-		rSpecRef.setName( OSL_KUBSECRET_RSPEC_NAME );
-		rSpecRef.setVersion( OSL_KUBSECRET_RSPEC_VERSION );
-		
-		ResourceCreate rs = new ResourceCreate();
-		rs.name( this.name )
-		.category( OSL_KUBSECRET_RESOURCE_CATEGORY )
-		.description( this.description )
-		.resourceStatus( ResourceStatusType.AVAILABLE )
-		.operationalState( ResourceOperationalStateType.ENABLE )
-		.resourceSpecification( rSpecRef )
-		.resourceVersion( this.version);
-		
-		rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("Kind", this.kind, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());
-        rs.addResourceCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue());
-		
-
-
-        
-		if (this.properties != null)
-		  this.properties.forEach((kPropName, vProVal) -> {
-		    EValueType etype;
-		    etype = EValueType.TEXT;
-
-		    rs.addResourceCharacteristicItemShort(kPropName , vProVal, etype.getValue());
-
-		  });
-        if (this.data != null)
-          this.data.forEach((kPropName, vProVal) -> {
-            EValueType etype;        
-            etype = EValueType.TEXT;
-            rs.addResourceCharacteristicItemShort(kPropName , vProVal, etype.getValue());
-
-          });
-
-
-
-
-		return rs;
-	}
-	
-	@Override
-	public ResourceUpdate toResourceUpdate() {
-	
-		return this.toResourceCreate();
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/sd/model/ServiceDescriptor.java b/src/main/java/org/etsi/osl/sd/model/ServiceDescriptor.java
deleted file mode 100644
index 94e7296af69c0259db61d49ec601eae2992357e9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/sd/model/ServiceDescriptor.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.sd.model;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * This model will hold information that will help later on service orchestration.
- * It should be attached to entities that we need to orchestrate in general, like {@link ServiceSpecification} 
- * 
- * @author ctranoris
- *
- */
-@Schema(description = "This model will hold information that will help later on service orchestration.")
-@Validated
-@Entity(name = "ServiceDescriptor")
-public class ServiceDescriptor {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-
-
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	Set<ServiceDescriptorAttr> metadata = new HashSet<>();
-	
-	
-	/**
-	 * references the root entity ID of this SD 
-	 */
-	private String rootEntityID;
-
-	/**
-	 * references the root entity ID of this SD 
-	 */
-	private String rootEntityType;
-	
-	
-	public ServiceDescriptor() {
-
-	}
-
-
-	/**
-	 * @return the metadata
-	 */
-	public Set<ServiceDescriptorAttr> getMetadata() {
-		return metadata;
-	}
-
-
-	/**
-	 * @param metadata the metadata to set
-	 */
-	public void setMetadata(Set<ServiceDescriptorAttr> metadata) {
-		this.metadata = metadata;
-	}
-
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-
-	/**
-	 * @return the rootEntityID
-	 */
-	public String getRootEntityID() {
-		return rootEntityID;
-	}
-
-
-	/**
-	 * @param rootEntityID the rootEntityID to set
-	 */
-	public void setRootEntityID(String rootEntityID) {
-		this.rootEntityID = rootEntityID;
-	}
-
-
-	/**
-	 * @return the rootEntityType
-	 */
-	public String getRootEntityType() {
-		return rootEntityType;
-	}
-
-
-	/**
-	 * @param rootEntityType the rootEntityType to set
-	 */
-	public void setRootEntityType(String rootEntityType) {
-		this.rootEntityType = rootEntityType;
-	}
-	
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/sd/model/ServiceDescriptorAttr.java b/src/main/java/org/etsi/osl/sd/model/ServiceDescriptorAttr.java
deleted file mode 100644
index 364dd46a3e203624af2fd63481985e8a2dc08193..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/sd/model/ServiceDescriptorAttr.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.sd.model;
-
-import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
-import org.hibernate.annotations.GenericGenerator;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-
-/**
- * This model will hold information that will help later on service
- * orchestration. It should be attached to entities that we need to orchestrate
- * in general, like {@link ServiceSpecification}
- * 
- * @author ctranoris
- *
- */
-@Entity(name = "ServiceDescriptorAttr")
-public class ServiceDescriptorAttr {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-
-	private String name;
-
-	private String value;
-
-	public ServiceDescriptorAttr() {
-
-	}
-
-	public ServiceDescriptorAttr(String name, String value) {
-		super();
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @param value the value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/BootstrapResources.java b/src/main/java/org/etsi/osl/tmf/BootstrapResources.java
index 7b4432f4df650633beb585161b6b1cf76511a064..dacfb02b6c0f9c82d758949409ef662b163cadaf 100644
--- a/src/main/java/org/etsi/osl/tmf/BootstrapResources.java
+++ b/src/main/java/org/etsi/osl/tmf/BootstrapResources.java
@@ -19,28 +19,20 @@
  */
 package org.etsi.osl.tmf;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.etsi.osl.domain.model.kubernetes.KubernetesCRDV1;
 import org.etsi.osl.domain.model.kubernetes.KubernetesCRV1;
 import org.etsi.osl.domain.model.kubernetes.KubernetesContextDefinition;
 import org.etsi.osl.domain.model.kubernetes.KubernetesSecret;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.rcm634.model.ResourceCandidate;
-import org.etsi.osl.tmf.rcm634.model.ResourceCandidateCreate;
 import org.etsi.osl.tmf.rcm634.model.ResourceCandidateUpdate;
 import org.etsi.osl.tmf.rcm634.model.ResourceCatalog;
 import org.etsi.osl.tmf.rcm634.model.ResourceCatalogCreate;
-import org.etsi.osl.tmf.rcm634.model.ResourceCatalogUpdate;
 import org.etsi.osl.tmf.rcm634.model.ResourceCategory;
 import org.etsi.osl.tmf.rcm634.model.ResourceCategoryCreate;
 import org.etsi.osl.tmf.rcm634.model.ResourceCategoryRef;
 import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
 import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
 import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRelationship;
 import org.etsi.osl.tmf.rcm634.repo.ResourceCatalogRepository;
 import org.etsi.osl.tmf.rcm634.repo.ResourceSpecificationRepository;
 import org.etsi.osl.tmf.rcm634.reposervices.ResourceCandidateRepoService;
@@ -48,12 +40,9 @@ import org.etsi.osl.tmf.rcm634.reposervices.ResourceCatalogRepoService;
 import org.etsi.osl.tmf.rcm634.reposervices.ResourceCategoryRepoService;
 import org.etsi.osl.tmf.rcm634.reposervices.ResourceSpecificationRepoService;
 import org.etsi.osl.tmf.ri639.reposervices.ResourceRepoService;
-import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.PostConstruct;
 
 @Service
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarms.java
deleted file mode 100644
index 7749774ca769f97a0bd90fc20e24d36d8eb4f9d4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarms.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for the acknowledge alarms operation
- */
-@Schema(description = "Task resource for the acknowledge alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMAckAlarms")
-@Table(name = "AMAckAlarms")
-public class AckAlarms extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("ackSystemId")
-	private String ackSystemId = null;
-
-	private OffsetDateTime ackTime = null;
-
-	@JsonProperty("ackUserId")
-	private String ackUserId = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("ackedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> ackedAlarm =  new HashSet<>();
-
-	@JsonProperty("alarmPattern")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Alarm> alarmPattern =  new HashSet<>();
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	
-
-	public AckAlarms ackSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-		return this;
-	}
-
-	/**
-	 * Name of the acknowledging system
-	 * 
-	 * @return ackSystemId
-	 **/
-	@Schema(description = "Name of the acknowledging system")
-
-	public String getAckSystemId() {
-		return ackSystemId;
-	}
-
-	public void setAckSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-	}
-
-	public AckAlarms ackTime(OffsetDateTime ackTime) {
-		this.ackTime = ackTime;
-		return this;
-	}
-
-	/**
-	 * Time of the acknowledgement
-	 * 
-	 * @return ackTime
-	 **/
-	@Schema(description = "Time of the acknowledgement")
-
-	@Valid
-	public OffsetDateTime getAckTime() {
-		return ackTime;
-	}
-
-	public void setAckTime(OffsetDateTime ackTime) {
-		this.ackTime = ackTime;
-	}	
-	
-
-	@JsonProperty("ackTime")
-	public String getAckTimeStr() {
-		if (this.ackTime != null) {
-			return this.ackTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public AckAlarms ackUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-		return this;
-	}
-
-	/**
-	 * Name of the acknowledging user
-	 * 
-	 * @return ackUserId
-	 **/
-	@Schema(description = "Name of the acknowledging user")
-
-	public String getAckUserId() {
-		return ackUserId;
-	}
-
-	public void setAckUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-	}
-
-	public AckAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public AckAlarms ackedAlarm(Set<AlarmRefOrValue> ackedAlarm) {
-		this.ackedAlarm = ackedAlarm;
-		return this;
-	}
-
-	public AckAlarms addAckedAlarmItem(AlarmRefOrValue ackedAlarmItem) {
-		if (this.ackedAlarm == null) {
-			this.ackedAlarm = new HashSet<>();
-		}
-		this.ackedAlarm.add(ackedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully acknowledged alarms
-	 * 
-	 * @return ackedAlarm
-	 **/
-	@Schema(description = "The successfully acknowledged alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getAckedAlarm() {
-		return ackedAlarm;
-	}
-
-	public void setAckedAlarm(Set<AlarmRefOrValue> ackedAlarm) {
-		this.ackedAlarm = ackedAlarm;
-	}
-
-	public AckAlarms alarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-		return this;
-	}
-
-	public AckAlarms addAlarmPatternItem(Alarm alarmPatternItem) {
-		if (this.alarmPattern == null) {
-			this.alarmPattern = new HashSet<>();
-		}
-		this.alarmPattern.add(alarmPatternItem);
-		return this;
-	}
-
-	/**
-	 * Alarm patterns to match target alarms. An alarm will match if all of the
-	 * sttributes in any of the patterns compare equal to those attributes of the
-	 * alarm.
-	 * 
-	 * @return alarmPattern
-	 **/
-	@Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-	@Valid
-	public Set<Alarm> getAlarmPattern() {
-		return alarmPattern;
-	}
-
-	public void setAlarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AckAlarms ackAlarms = (AckAlarms) o;
-		return Objects.equals(this.id, ackAlarms.id) && Objects.equals(this.href, ackAlarms.href)
-				&& Objects.equals(this.ackSystemId, ackAlarms.ackSystemId)
-				&& Objects.equals(this.ackTime, ackAlarms.ackTime)
-				&& Objects.equals(this.ackUserId, ackAlarms.ackUserId) && Objects.equals(this.state, ackAlarms.state)
-				&& Objects.equals(this.ackedAlarm, ackAlarms.ackedAlarm)
-				&& Objects.equals(this.alarmPattern, ackAlarms.alarmPattern)
-				&& Objects.equals(this.baseType, ackAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, ackAlarms.schemaLocation)
-				&& Objects.equals(this.type, ackAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, ackSystemId, ackTime, ackUserId, state, ackedAlarm, alarmPattern, baseType,
-				schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AckAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackTime: ").append(toIndentedString(ackTime)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    ackedAlarm: ").append(toIndentedString(ackedAlarm)).append("\n");
-		sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreate.java
deleted file mode 100644
index 2171d8369b43a6dbd4559515a2f74611a6cb7d00..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreate.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for the acknowledge alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for the acknowledge alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AckAlarmsCreate   {
-  @JsonProperty("ackSystemId")
-  private String ackSystemId = null;
-
-  @JsonProperty("ackTime")
-  private OffsetDateTime ackTime = null;
-
-  @JsonProperty("ackUserId")
-  private String ackUserId = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("ackedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> ackedAlarm = null;
-
-  @JsonProperty("alarmPattern")
-  @Valid
-  private List<Alarm> alarmPattern = new ArrayList<>();
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AckAlarmsCreate ackSystemId(String ackSystemId) {
-    this.ackSystemId = ackSystemId;
-    return this;
-  }
-
-  /**
-   * Name of the acknowledging system
-   * @return ackSystemId
-  **/
-  @Schema(description = "Name of the acknowledging system")
-      @NotNull
-
-    public String getAckSystemId() {
-    return ackSystemId;
-  }
-
-  public void setAckSystemId(String ackSystemId) {
-    this.ackSystemId = ackSystemId;
-  }
-
-  public AckAlarmsCreate ackTime(OffsetDateTime ackTime) {
-    this.ackTime = ackTime;
-    return this;
-  }
-
-  /**
-   * Time of the acknowledgement
-   * @return ackTime
-  **/
-  @Schema(description = "Time of the acknowledgement")
-  
-    @Valid
-    public OffsetDateTime getAckTime() {
-    return ackTime;
-  }
-
-  public void setAckTime(OffsetDateTime ackTime) {
-    this.ackTime = ackTime;
-  }
-
-  public AckAlarmsCreate ackUserId(String ackUserId) {
-    this.ackUserId = ackUserId;
-    return this;
-  }
-
-  /**
-   * Name of the acknowledging user
-   * @return ackUserId
-  **/
-  @Schema(description = "Name of the acknowledging user")
-      @NotNull
-
-    public String getAckUserId() {
-    return ackUserId;
-  }
-
-  public void setAckUserId(String ackUserId) {
-    this.ackUserId = ackUserId;
-  }
-
-  public AckAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public AckAlarmsCreate ackedAlarm(List<AlarmRefOrValue> ackedAlarm) {
-    this.ackedAlarm = ackedAlarm;
-    return this;
-  }
-
-  public AckAlarmsCreate addAckedAlarmItem(AlarmRefOrValue ackedAlarmItem) {
-    if (this.ackedAlarm == null) {
-      this.ackedAlarm = new ArrayList<>();
-    }
-    this.ackedAlarm.add(ackedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully acknowledged alarms
-   * @return ackedAlarm
-  **/
-  @Schema(description = "The successfully acknowledged alarms")
-      @Valid
-    public List<AlarmRefOrValue> getAckedAlarm() {
-    return ackedAlarm;
-  }
-
-  public void setAckedAlarm(List<AlarmRefOrValue> ackedAlarm) {
-    this.ackedAlarm = ackedAlarm;
-  }
-
-  public AckAlarmsCreate alarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-    return this;
-  }
-
-  public AckAlarmsCreate addAlarmPatternItem(Alarm alarmPatternItem) {
-    this.alarmPattern.add(alarmPatternItem);
-    return this;
-  }
-
-  /**
-   * Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.
-   * @return alarmPattern
-  **/
-  @Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<Alarm> getAlarmPattern() {
-    return alarmPattern;
-  }
-
-  public void setAlarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-  }
-
-  public AckAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AckAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AckAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AckAlarmsCreate ackAlarmsCreate = (AckAlarmsCreate) o;
-    return Objects.equals(this.ackSystemId, ackAlarmsCreate.ackSystemId) &&
-        Objects.equals(this.ackTime, ackAlarmsCreate.ackTime) &&
-        Objects.equals(this.ackUserId, ackAlarmsCreate.ackUserId) &&
-        Objects.equals(this.state, ackAlarmsCreate.state) &&
-        Objects.equals(this.ackedAlarm, ackAlarmsCreate.ackedAlarm) &&
-        Objects.equals(this.alarmPattern, ackAlarmsCreate.alarmPattern) &&
-        Objects.equals(this.baseType, ackAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, ackAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, ackAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ackSystemId, ackTime, ackUserId, state, ackedAlarm, alarmPattern, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AckAlarmsCreate {\n");
-    
-    sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-    sb.append("    ackTime: ").append(toIndentedString(ackTime)).append("\n");
-    sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    ackedAlarm: ").append(toIndentedString(ackedAlarm)).append("\n");
-    sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEvent.java
deleted file mode 100644
index a515722e59b347cbfcff3ad4556a05b07b2774e5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AckAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private AckAlarmsCreateEventPayload event = null;
-
-  public AckAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AckAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AckAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public AckAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public AckAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public AckAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public AckAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public AckAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public AckAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AckAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public AckAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public AckAlarmsCreateEvent event(AckAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AckAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AckAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AckAlarmsCreateEvent ackAlarmsCreateEvent = (AckAlarmsCreateEvent) o;
-    return Objects.equals(this.id, ackAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, ackAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, ackAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, ackAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, ackAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, ackAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, ackAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, ackAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, ackAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, ackAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, ackAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, ackAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AckAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEventPayload.java
deleted file mode 100644
index 788d11c3fc82f0df9a09f02100cf8e13ed37be06..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AckAlarmsCreateEventPayload   {
-  @JsonProperty("ackAlarms")
-  private AckAlarms ackAlarms = null;
-
-  public AckAlarmsCreateEventPayload ackAlarms(AckAlarms ackAlarms) {
-    this.ackAlarms = ackAlarms;
-    return this;
-  }
-
-  /**
-   * Get ackAlarms
-   * @return ackAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AckAlarms getAckAlarms() {
-    return ackAlarms;
-  }
-
-  public void setAckAlarms(AckAlarms ackAlarms) {
-    this.ackAlarms = ackAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AckAlarmsCreateEventPayload ackAlarmsCreateEventPayload = (AckAlarmsCreateEventPayload) o;
-    return Objects.equals(this.ackAlarms, ackAlarmsCreateEventPayload.ackAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ackAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AckAlarmsCreateEventPayload {\n");
-    
-    sb.append("    ackAlarms: ").append(toIndentedString(ackAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEvent.java
deleted file mode 100644
index 96006442c17eb33529772637204c455d3a8c9e47..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AckAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private AckAlarmsStateChangeEventPayload event = null;
-
-  public AckAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AckAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AckAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public AckAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public AckAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public AckAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public AckAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public AckAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public AckAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AckAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public AckAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public AckAlarmsStateChangeEvent event(AckAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AckAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AckAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AckAlarmsStateChangeEvent ackAlarmsStateChangeEvent = (AckAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, ackAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, ackAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, ackAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, ackAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, ackAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, ackAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, ackAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, ackAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, ackAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, ackAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, ackAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, ackAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AckAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEventPayload.java
deleted file mode 100644
index 16c385e95415be9c63e6941ec4fae1a042191fa4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AckAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AckAlarmsStateChangeEventPayload   {
-  @JsonProperty("ackAlarms")
-  private AckAlarms ackAlarms = null;
-
-  public AckAlarmsStateChangeEventPayload ackAlarms(AckAlarms ackAlarms) {
-    this.ackAlarms = ackAlarms;
-    return this;
-  }
-
-  /**
-   * Get ackAlarms
-   * @return ackAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AckAlarms getAckAlarms() {
-    return ackAlarms;
-  }
-
-  public void setAckAlarms(AckAlarms ackAlarms) {
-    this.ackAlarms = ackAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AckAlarmsStateChangeEventPayload ackAlarmsStateChangeEventPayload = (AckAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.ackAlarms, ackAlarmsStateChangeEventPayload.ackAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ackAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AckAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    ackAlarms: ").append(toIndentedString(ackAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AffectedService.java b/src/main/java/org/etsi/osl/tmf/am642/model/AffectedService.java
deleted file mode 100644
index a6110ff67ea6509b4b19e472e63cadade81cf043..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AffectedService.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * AffectedService
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMAffectedService")
-@Table(name = "AMAffectedService")
-public class AffectedService extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	public void setId(String anid) {
-
-		this.id = anid;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-
-		return id;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AffectedService affectedService = (AffectedService) o;
-		return Objects.equals(this.id, affectedService.id) && Objects.equals(this.href, affectedService.href)
-				&& Objects.equals(this.baseType, affectedService.baseType)
-				&& Objects.equals(this.schemaLocation, affectedService.schemaLocation)
-				&& Objects.equals(this.type, affectedService.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AffectedService {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/Alarm.java b/src/main/java/org/etsi/osl/tmf/am642/model/Alarm.java
deleted file mode 100644
index b86f34435adf13858692f3203271665b23c2c42d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/Alarm.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * This resource represents an alarm supporting the information model defined in
- * ITU-T X.733.
- */
-@Schema(description = "This resource represents an alarm supporting the information model defined in ITU-T X.733.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-
-@Entity(name = "AMAlarm")
-@Table(name = "AMAlarm")
-public class Alarm extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("ackState")
-	private String ackState = null;
-
-	@JsonProperty("ackSystemId")
-	private String ackSystemId = null;
-
-	@JsonProperty("ackUserId")
-	private String ackUserId = null;
-
-	private OffsetDateTime alarmChangedTime = null;
-
-	private OffsetDateTime alarmClearedTime = null;
-
-	@JsonProperty("alarmDetails")
-	@Lob
-	@Column(name = "LALARMDETAILS", columnDefinition = "LONGTEXT")
-	private String alarmDetails = null;
-
-	@JsonProperty("alarmEscalation")
-	private Boolean alarmEscalation = null;
-
-	private OffsetDateTime alarmRaisedTime = null;
-
-	private OffsetDateTime alarmReportingTime = null;
-
-	@JsonProperty("alarmType")
-	private String alarmType = null;
-
-	@JsonProperty("alarmedObjectType")
-	private String alarmedObjectType = null;
-
-	@JsonProperty("clearSystemId")
-	private String clearSystemId = null;
-
-	@JsonProperty("clearUserId")
-	private String clearUserId = null;
-
-	@JsonProperty("externalAlarmId")
-	private String externalAlarmId = null;
-
-	@JsonProperty("isRootCause")
-	private Boolean isRootCause = null;
-
-	@JsonProperty("perceivedSeverity")
-	private String perceivedSeverity = null;
-
-	@JsonProperty("plannedOutageIndicator")
-	private String plannedOutageIndicator = null;
-
-	@JsonProperty("probableCause")
-	private String probableCause = null;
-
-	@JsonProperty("proposedRepairedActions")
-	private String proposedRepairedActions = null;
-
-	@JsonProperty("reportingSystemId")
-	private String reportingSystemId = null;
-
-	@JsonProperty("serviceAffecting")
-	private Boolean serviceAffecting = null;
-
-	@JsonProperty("sourceSystemId")
-	private String sourceSystemId = null;
-
-	@JsonProperty("specificProblem")
-	@Lob
-	@Column(name = "LSPECIFICPROB", columnDefinition = "LONGTEXT")
-	private String specificProblem = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("affectedService")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AffectedService> affectedService = new HashSet<>();
-
-	@JsonProperty("alarmedObject")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private AlarmedObject alarmedObject = null;
-
-	@JsonProperty("comment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Comment> comment = new HashSet<>();
-
-	@JsonProperty("correlatedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRef> correlatedAlarm = new HashSet<>();
-
-	@JsonProperty("crossedThresholdInformation")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private CrossedThresholdInformation crossedThresholdInformation = null;
-
-	@JsonProperty("parentAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRef> parentAlarm = new HashSet<>();
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedPlaceRefOrValue> place = new HashSet<>();
-
-
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public Alarm href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A reference to the alarm.
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A reference to the alarm.")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public Alarm ackState(String ackState) {
-		this.ackState = ackState;
-		return this;
-	}
-
-	/**
-	 * Provides the Acknowledgement State of the alarm
-	 * 
-	 * @return ackState
-	 **/
-	@Schema(description = "Provides the Acknowledgement State of the alarm")
-
-	public String getAckState() {
-		return ackState;
-	}
-
-	public void setAckState(String ackState) {
-		this.ackState = ackState;
-	}
-
-	public Alarm ackSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the name of the system that last changed the ackState of an alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackSystemId
-	 **/
-	@Schema(description = "Provides the name of the system that last changed the ackState of an alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckSystemId() {
-		return ackSystemId;
-	}
-
-	public void setAckSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-	}
-
-	public Alarm ackUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who has last changed the ack state of the alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackUserId
-	 **/
-	@Schema(description = "Provides the id of the user who has last changed the ack state of the alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckUserId() {
-		return ackUserId;
-	}
-
-	public void setAckUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-	}
-
-	public Alarm alarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the last date and time when the alarm is changed on the
-	 * alarm-owning system. Any change to the alarm whether coming from the alarmed
-	 * resource, or triggered by a change from the client is changing this time.
-	 * 
-	 * @return alarmChangedTime
-	 **/
-	@Schema(description = "Indicates the last date and time when the alarm is changed on the alarm-owning system. Any change to the alarm whether coming from the alarmed resource, or triggered by a change from the client is changing this time.")
-
-	@Valid
-	public OffsetDateTime getAlarmChangedTime() {
-		return alarmChangedTime;
-	}
-
-	public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-	}
-	
-	public void setAlarmChangedTime(String alarmChangedTime) {
-		if ( alarmChangedTime != null) {
-			this.alarmChangedTime = OffsetDateTime.parse( alarmChangedTime );
-			
-		}
-	}
-
-	@JsonProperty("alarmChangedTime")
-	public String getAlarmChangedTimeStr() {
-		if (this.alarmChangedTime != null) {
-			return this.alarmChangedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public Alarm alarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-		return this;
-	}
-	
-	
-	
-	
-
-	
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm is cleared at the
-	 * source.
-	 * 
-	 * @return alarmClearedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm is cleared at the source. ")
-
-	@Valid
-	public OffsetDateTime getAlarmClearedTime() {
-		return alarmClearedTime;
-	}
-
-	public void setAlarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-	}
-	
-	public void setAlarmClearedTime(String alarmClearedTime) {
-		if ( alarmClearedTime != null) {
-			this.alarmClearedTime = OffsetDateTime.parse( alarmClearedTime );			
-		}
-	}
-	
-
-	@JsonProperty("alarmClearedTime")
-	public String getAlarmClearedTimeStr() {
-		if (this.alarmClearedTime != null) {
-			return this.alarmClearedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public Alarm alarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-		return this;
-	}
-
-	/**
-	 * Contains further information on the alarm.
-	 * 
-	 * @return alarmDetails
-	 **/
-	@Schema(description = "Contains further information on the alarm.")
-
-	public String getAlarmDetails() {
-		return alarmDetails;
-	}
-
-	public void setAlarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-	}
-
-	public Alarm alarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-		return this;
-	}
-
-	/**
-	 * Indicates if this alarm has been escalated or not.
-	 * 
-	 * @return alarmEscalation
-	 **/
-	@Schema(description = "Indicates if this alarm has been escalated or not. ")
-
-	public Boolean isAlarmEscalation() {
-		return alarmEscalation;
-	}
-
-	public void setAlarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-	}
-
-	public Alarm alarmRaisedTime(OffsetDateTime alarmRaisedTime) {
-		this.alarmRaisedTime = alarmRaisedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm occurred at its
-	 * source.
-	 * 
-	 * @return alarmRaisedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm occurred at its source.")
-
-	@Valid
-	public OffsetDateTime getAlarmRaisedTime() {
-		return alarmRaisedTime;
-	}
-
-	public void setAlarmRaisedTime(OffsetDateTime alarmRaisedTime) {
-		this.alarmRaisedTime = alarmRaisedTime;
-	}
-	
-	public void setAlarmRaisedTime(String alarmRaisedTime) {
-
-		if ( alarmRaisedTime != null) {
-			this.alarmRaisedTime = OffsetDateTime.parse( alarmRaisedTime );
-			
-		}
-	}
-	
-
-	@JsonProperty("alarmRaisedTime")
-	public String getAlarmRaisedTimeStr() {
-		if (this.alarmRaisedTime != null) {
-			return this.alarmRaisedTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	
-
-	public Alarm alarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm was reported by the
-	 * owning OSS. It might be different from the alarmRaisedTime. For instance, if
-	 * the alarm list is maintained by an EMS, the alarmRaisedtime would be the time
-	 * the alarm was detected by the NE, while the alarmReportingTime would be the
-	 * time this alarm was stored in the alarm list of the EMS.
-	 * 
-	 * @return alarmReportingTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm was reported by the owning OSS. It might be different from the alarmRaisedTime. For instance, if the alarm list is maintained by an EMS, the alarmRaisedtime would be the time the alarm   was detected by the NE, while the alarmReportingTime would be the time this alarm was stored in the alarm list of the EMS.")
-
-	@Valid
-	public OffsetDateTime getAlarmReportingTime() {
-		return alarmReportingTime;
-	}
-
-	public void setAlarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-	}
-	
-	
-	public void setAlarmReportingTime(String alarmReportingTime) {
-		if ( alarmReportingTime != null) {
-			this.alarmReportingTime = OffsetDateTime.parse( alarmReportingTime );
-			
-		}
-	}
-
-	@JsonProperty("alarmReportingTime")
-	public String getAlarmReportingTimeStr() {
-		if (this.alarmReportingTime != null) {
-			return this.alarmReportingTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-
-	public Alarm alarmType(String alarmType) {
-		this.alarmType = alarmType;
-		return this;
-	}
-
-	/**
-	 * Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or
-	 * 3GPP TS 32.111-2 Annex A: Communications Alarm Processing Error Alarm
-	 * Environmental Alarm Quality of Service Alarm Equipment Alarm Integrity
-	 * Violation Operational Violation Physical Violation Security Service or
-	 * Mechanism Violation Time Domain Violation
-	 * 
-	 * @return alarmType
-	 **/
-	@Schema(description = "Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or 3GPP TS 32.111-2 Annex A:  Communications Alarm  Processing Error Alarm  Environmental Alarm  Quality of Service Alarm  Equipment Alarm  Integrity Violation  Operational Violation  Physical Violation  Security Service or Mechanism Violation  Time Domain Violation")
-
-	public String getAlarmType() {
-		return alarmType;
-	}
-
-	public void setAlarmType(String alarmType) {
-		this.alarmType = alarmType;
-	}
-
-	public Alarm alarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-		return this;
-	}
-
-	/**
-	 * The type (class) of the managed object associated with the event.
-	 * 
-	 * @return alarmedObjectType
-	 **/
-	@Schema(description = "The type (class) of the managed object associated with the event.")
-
-	public String getAlarmedObjectType() {
-		return alarmedObjectType;
-	}
-
-	public void setAlarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-	}
-
-	public Alarm clearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the system where the user who invoked the alarmCleared
-	 * operation is located.
-	 * 
-	 * @return clearSystemId
-	 **/
-	@Schema(description = "Provides the id of the system where the user who invoked the alarmCleared operation is located. ")
-
-	public String getClearSystemId() {
-		return clearSystemId;
-	}
-
-	public void setClearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-	}
-
-	public Alarm clearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who invoked the alarmCleared operation
-	 * 
-	 * @return clearUserId
-	 **/
-	@Schema(description = "Provides the id of the user who invoked the alarmCleared operation")
-
-	public String getClearUserId() {
-		return clearUserId;
-	}
-
-	public void setClearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-	}
-
-	public Alarm externalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-		return this;
-	}
-
-	/**
-	 * An identifier of the alarm in the source system.
-	 * 
-	 * @return externalAlarmId
-	 **/
-	@Schema(description = "An identifier of the alarm in the source system.")
-
-	public String getExternalAlarmId() {
-		return externalAlarmId;
-	}
-
-	public void setExternalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-	}
-
-	public Alarm isRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm is a root cause alarm..
-	 * 
-	 * @return isRootCause
-	 **/
-	@Schema(description = "Indicates whether the alarm is a root cause alarm.. ")
-
-	public Boolean isIsRootCause() {
-		return isRootCause;
-	}
-
-	public void setIsRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-	}
-
-	public Alarm perceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-		return this;
-	}
-
-	/**
-	 * Lists the possible severities that can be allocated to an Alarm. The values
-	 * are consistent with ITU-T Recommendation X.733. Once an alarm has been
-	 * cleared, its perceived severity is set to 'cleared' and can no longer be set.
-	 * 
-	 * @return perceivedSeverity
-	 **/
-	@Schema(description = "Lists the possible severities that can be allocated to an Alarm. The values are consistent with ITU-T Recommendation X.733. Once an alarm has been cleared, its perceived severity is set to 'cleared' and can no longer be set.")
-
-	public String getPerceivedSeverity() {
-		return perceivedSeverity;
-	}
-
-	public void setPerceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-	}
-
-	public Alarm plannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-		return this;
-	}
-
-	/**
-	 * Indicates that the Managed Object (related to this alarm) is in planned
-	 * outage (in planned maintenance, or out-of-service).
-	 * 
-	 * @return plannedOutageIndicator
-	 **/
-	@Schema(description = "Indicates that the Managed Object (related to this alarm) is in planned outage (in planned maintenance, or out-of-service). ")
-
-	public String getPlannedOutageIndicator() {
-		return plannedOutageIndicator;
-	}
-
-	public void setPlannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-	}
-
-	public Alarm probableCause(String probableCause) {
-		this.probableCause = probableCause;
-		return this;
-	}
-
-	/**
-	 * Provides the probable cause of the alarm. The values are consistent with
-	 * ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.
-	 * 
-	 * @return probableCause
-	 **/
-	@Schema(description = "Provides the probable cause of the alarm. The values are consistent with ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.")
-
-	public String getProbableCause() {
-		return probableCause;
-	}
-
-	public void setProbableCause(String probableCause) {
-		this.probableCause = probableCause;
-	}
-
-	public Alarm proposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-		return this;
-	}
-
-	/**
-	 * Indicates proposed repair actions, if known to the system emitting the alarm.
-	 * 
-	 * @return proposedRepairedActions
-	 **/
-	@Schema(description = "Indicates proposed repair actions, if known to the system emitting the alarm.")
-
-	public String getProposedRepairedActions() {
-		return proposedRepairedActions;
-	}
-
-	public void setProposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-	}
-
-	public Alarm reportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-		return this;
-	}
-
-	/**
-	 * Reporting system identity.
-	 * 
-	 * @return reportingSystemId
-	 **/
-	@Schema(description = "Reporting system identity.")
-
-	public String getReportingSystemId() {
-		return reportingSystemId;
-	}
-
-	public void setReportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-	}
-
-	public Alarm serviceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm affects service or not.
-	 * 
-	 * @return serviceAffecting
-	 **/
-	@Schema(description = "Indicates whether the alarm affects service or not.")
-
-	public Boolean isServiceAffecting() {
-		return serviceAffecting;
-	}
-
-	public void setServiceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-	}
-
-	public Alarm sourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-		return this;
-	}
-
-	/**
-	 * Source system identity.
-	 * 
-	 * @return sourceSystemId
-	 **/
-	@Schema(description = "Source system identity.")
-
-	public String getSourceSystemId() {
-		return sourceSystemId;
-	}
-
-	public void setSourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-	}
-
-	public Alarm specificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-		return this;
-	}
-
-	/**
-	 * Provides more specific information about the alarm.
-	 * 
-	 * @return specificProblem
-	 **/
-	@Schema(description = "Provides more specific information about the alarm.")
-
-	public String getSpecificProblem() {
-		return specificProblem;
-	}
-
-	public void setSpecificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-	}
-
-	public Alarm state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Defines the alarm state during its life cycle
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Defines the alarm state during its life cycle")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public Alarm affectedService(Set<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-		return this;
-	}
-
-	public Alarm addAffectedServiceItem(AffectedService affectedServiceItem) {
-		if (this.affectedService == null) {
-			this.affectedService = new HashSet<>();
-		}
-		this.affectedService.add(affectedServiceItem);
-		return this;
-	}
-
-	/**
-	 * Get affectedService
-	 * 
-	 * @return affectedService
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AffectedService> getAffectedService() {
-		return affectedService;
-	}
-
-	public void setAffectedService(Set<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-	}
-
-	public Alarm alarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-		return this;
-	}
-
-	/**
-	 * Get alarmedObject
-	 * 
-	 * @return alarmedObject
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AlarmedObject getAlarmedObject() {
-		return alarmedObject;
-	}
-
-	public void setAlarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-	}
-
-	public Alarm comment(Set<Comment> comment) {
-		this.comment = comment;
-		return this;
-	}
-
-	public Alarm addCommentItem(Comment commentItem) {
-		if (this.comment == null) {
-			this.comment = new HashSet<>();
-		}
-		this.comment.add(commentItem);
-		return this;
-	}
-
-	/**
-	 * Get comment
-	 * 
-	 * @return comment
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<Comment> getComment() {
-		return comment;
-	}
-
-	public void setComment(Set<Comment> comment) {
-		this.comment = comment;
-	}
-
-	public Alarm correlatedAlarm(Set<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-		return this;
-	}
-
-	public Alarm addCorrelatedAlarmItem(AlarmRef correlatedAlarmItem) {
-		if (this.correlatedAlarm == null) {
-			this.correlatedAlarm = new HashSet<>();
-		}
-		this.correlatedAlarm.add(correlatedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get correlatedAlarm
-	 * 
-	 * @return correlatedAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AlarmRef> getCorrelatedAlarm() {
-		return correlatedAlarm;
-	}
-
-	public void setCorrelatedAlarm(Set<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-	}
-
-	public Alarm crossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-		return this;
-	}
-
-	/**
-	 * Get crossedThresholdInformation
-	 * 
-	 * @return crossedThresholdInformation
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public CrossedThresholdInformation getCrossedThresholdInformation() {
-		return crossedThresholdInformation;
-	}
-
-	public void setCrossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-	}
-
-	public Alarm parentAlarm(Set<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-		return this;
-	}
-
-	public Alarm addParentAlarmItem(AlarmRef parentAlarmItem) {
-		if (this.parentAlarm == null) {
-			this.parentAlarm = new HashSet<>();
-		}
-		this.parentAlarm.add(parentAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get parentAlarm
-	 * 
-	 * @return parentAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AlarmRef> getParentAlarm() {
-		return parentAlarm;
-	}
-
-	public void setParentAlarm(Set<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-	}
-
-	public Alarm place(Set<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-		return this;
-	}
-
-	public Alarm addPlaceItem(RelatedPlaceRefOrValue placeItem) {
-		if (this.place == null) {
-			this.place = new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<RelatedPlaceRefOrValue> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Alarm alarm = (Alarm) o;
-		return Objects.equals(this.id, alarm.id) && Objects.equals(this.href, alarm.href)
-				&& Objects.equals(this.ackState, alarm.ackState) && Objects.equals(this.ackSystemId, alarm.ackSystemId)
-				&& Objects.equals(this.ackUserId, alarm.ackUserId)
-				&& Objects.equals(this.alarmChangedTime, alarm.alarmChangedTime)
-				&& Objects.equals(this.alarmClearedTime, alarm.alarmClearedTime)
-				&& Objects.equals(this.alarmDetails, alarm.alarmDetails)
-				&& Objects.equals(this.alarmEscalation, alarm.alarmEscalation)
-				&& Objects.equals(this.alarmRaisedTime, alarm.alarmRaisedTime)
-				&& Objects.equals(this.alarmReportingTime, alarm.alarmReportingTime)
-				&& Objects.equals(this.alarmType, alarm.alarmType)
-				&& Objects.equals(this.alarmedObjectType, alarm.alarmedObjectType)
-				&& Objects.equals(this.clearSystemId, alarm.clearSystemId)
-				&& Objects.equals(this.clearUserId, alarm.clearUserId)
-				&& Objects.equals(this.externalAlarmId, alarm.externalAlarmId)
-				&& Objects.equals(this.isRootCause, alarm.isRootCause)
-				&& Objects.equals(this.perceivedSeverity, alarm.perceivedSeverity)
-				&& Objects.equals(this.plannedOutageIndicator, alarm.plannedOutageIndicator)
-				&& Objects.equals(this.probableCause, alarm.probableCause)
-				&& Objects.equals(this.proposedRepairedActions, alarm.proposedRepairedActions)
-				&& Objects.equals(this.reportingSystemId, alarm.reportingSystemId)
-				&& Objects.equals(this.serviceAffecting, alarm.serviceAffecting)
-				&& Objects.equals(this.sourceSystemId, alarm.sourceSystemId)
-				&& Objects.equals(this.specificProblem, alarm.specificProblem)
-				&& Objects.equals(this.state, alarm.state)
-				&& Objects.equals(this.affectedService, alarm.affectedService)
-				&& Objects.equals(this.alarmedObject, alarm.alarmedObject)
-				&& Objects.equals(this.comment, alarm.comment)
-				&& Objects.equals(this.correlatedAlarm, alarm.correlatedAlarm)
-				&& Objects.equals(this.crossedThresholdInformation, alarm.crossedThresholdInformation)
-				&& Objects.equals(this.parentAlarm, alarm.parentAlarm) && Objects.equals(this.place, alarm.place)
-				&& Objects.equals(this.baseType, alarm.baseType)
-				&& Objects.equals(this.schemaLocation, alarm.schemaLocation)
-				&& Objects.equals(this.type, alarm.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, ackState, ackSystemId, ackUserId, alarmChangedTime, alarmClearedTime,
-//				alarmDetails, alarmEscalation, alarmRaisedTime, alarmReportingTime, alarmType, alarmedObjectType,
-//				clearSystemId, clearUserId, externalAlarmId, isRootCause, perceivedSeverity, plannedOutageIndicator,
-//				probableCause, proposedRepairedActions, reportingSystemId, serviceAffecting, sourceSystemId,
-//				specificProblem, state, affectedService, alarmedObject, comment, correlatedAlarm,
-//				crossedThresholdInformation, parentAlarm, place, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Alarm {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    ackState: ").append(toIndentedString(ackState)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-		sb.append("    alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n");
-		sb.append("    alarmEscalation: ").append(toIndentedString(alarmEscalation)).append("\n");
-		sb.append("    alarmRaisedTime: ").append(toIndentedString(alarmRaisedTime)).append("\n");
-		sb.append("    alarmReportingTime: ").append(toIndentedString(alarmReportingTime)).append("\n");
-		sb.append("    alarmType: ").append(toIndentedString(alarmType)).append("\n");
-		sb.append("    alarmedObjectType: ").append(toIndentedString(alarmedObjectType)).append("\n");
-		sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-		sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-		sb.append("    externalAlarmId: ").append(toIndentedString(externalAlarmId)).append("\n");
-		sb.append("    isRootCause: ").append(toIndentedString(isRootCause)).append("\n");
-		sb.append("    perceivedSeverity: ").append(toIndentedString(perceivedSeverity)).append("\n");
-		sb.append("    plannedOutageIndicator: ").append(toIndentedString(plannedOutageIndicator)).append("\n");
-		sb.append("    probableCause: ").append(toIndentedString(probableCause)).append("\n");
-		sb.append("    proposedRepairedActions: ").append(toIndentedString(proposedRepairedActions)).append("\n");
-		sb.append("    reportingSystemId: ").append(toIndentedString(reportingSystemId)).append("\n");
-		sb.append("    serviceAffecting: ").append(toIndentedString(serviceAffecting)).append("\n");
-		sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-		sb.append("    specificProblem: ").append(toIndentedString(specificProblem)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    affectedService: ").append(toIndentedString(affectedService)).append("\n");
-		sb.append("    alarmedObject: ").append(toIndentedString(alarmedObject)).append("\n");
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    crossedThresholdInformation: ").append(toIndentedString(crossedThresholdInformation))
-				.append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEvent.java
deleted file mode 100644
index 87c66a8e7a2f23eef19f986ccc187c8cd3a85713..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private AlarmAttributeValueChangeEventPayload event = null;
-
-  public AlarmAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public AlarmAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public AlarmAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public AlarmAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public AlarmAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public AlarmAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public AlarmAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AlarmAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public AlarmAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public AlarmAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public AlarmAttributeValueChangeEvent event(AlarmAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AlarmAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AlarmAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmAttributeValueChangeEvent alarmAttributeValueChangeEvent = (AlarmAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, alarmAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, alarmAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, alarmAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, alarmAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, alarmAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, alarmAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, alarmAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, alarmAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, alarmAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, alarmAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, alarmAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEventPayload.java
deleted file mode 100644
index 092af2f4c7c9327af5cb18b18a10438222b04132..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmAttributeValueChangeEventPayload   {
-  @JsonProperty("alarm")
-  private Alarm alarm = null;
-
-  public AlarmAttributeValueChangeEventPayload alarm(Alarm alarm) {
-    this.alarm = alarm;
-    return this;
-  }
-
-  /**
-   * Get alarm
-   * @return alarm
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Alarm getAlarm() {
-    return alarm;
-  }
-
-  public void setAlarm(Alarm alarm) {
-    this.alarm = alarm;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmAttributeValueChangeEventPayload alarmAttributeValueChangeEventPayload = (AlarmAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.alarm, alarmAttributeValueChangeEventPayload.alarm);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarm);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    alarm: ").append(toIndentedString(alarm)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreate.java
deleted file mode 100644
index 22e01c6c29215cd69383b7092169df8aa33ece03..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreate.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * This resource represents an alarm supporting the information model defined in
- * ITU-T X.733. Skipped properties: id,href
- */
-@Schema(description = "This resource represents an alarm supporting the information model defined in ITU-T X.733. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmCreate extends AlarmUpdate {
-
-	private OffsetDateTime alarmRaisedTime = null;
-
-	@JsonProperty("sourceSystemId")
-	private String sourceSystemId = null;
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm occurred at its
-	 * source.
-	 * 
-	 * @return alarmRaisedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm occurred at its source.")
-	@NotNull
-
-	@Valid
-	public OffsetDateTime getAlarmRaisedTime() {
-		return alarmRaisedTime;
-	}
-
-	public void setAlarmRaisedTime(OffsetDateTime alarmRaisedTime) {
-		this.alarmRaisedTime = alarmRaisedTime;
-	}
-
-	@JsonProperty("alarmRaisedTime")
-	public String getAlarmRaisedTimeStr() {
-		if (this.alarmRaisedTime != null) {
-			return this.alarmRaisedTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setAlarmRaisedTime(String aalarmRaisedTime) {
-		if (aalarmRaisedTime != null) {
-			this.alarmRaisedTime = OffsetDateTime.parse(aalarmRaisedTime);
-		}
-
-	}
-
-	public AlarmCreate sourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-		return this;
-	}
-
-	/**
-	 * Source system identity.
-	 * 
-	 * @return sourceSystemId
-	 **/
-	@Schema(description = "Source system identity.")
-	@NotNull
-
-	public String getSourceSystemId() {
-		return sourceSystemId;
-	}
-
-	public void setSourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AlarmCreate alarmCreate = (AlarmCreate) o;
-		return Objects.equals(this.ackState, alarmCreate.ackState)
-				&& Objects.equals(this.ackSystemId, alarmCreate.ackSystemId)
-				&& Objects.equals(this.ackUserId, alarmCreate.ackUserId)
-				&& Objects.equals(this.alarmChangedTime, alarmCreate.alarmChangedTime)
-				&& Objects.equals(this.alarmClearedTime, alarmCreate.alarmClearedTime)
-				&& Objects.equals(this.alarmDetails, alarmCreate.alarmDetails)
-				&& Objects.equals(this.alarmEscalation, alarmCreate.alarmEscalation)
-				&& Objects.equals(this.alarmRaisedTime, alarmCreate.alarmRaisedTime)
-				&& Objects.equals(this.alarmReportingTime, alarmCreate.alarmReportingTime)
-				&& Objects.equals(this.alarmType, alarmCreate.alarmType)
-				&& Objects.equals(this.alarmedObjectType, alarmCreate.alarmedObjectType)
-				&& Objects.equals(this.clearSystemId, alarmCreate.clearSystemId)
-				&& Objects.equals(this.clearUserId, alarmCreate.clearUserId)
-				&& Objects.equals(this.externalAlarmId, alarmCreate.externalAlarmId)
-				&& Objects.equals(this.isRootCause, alarmCreate.isRootCause)
-				&& Objects.equals(this.perceivedSeverity, alarmCreate.perceivedSeverity)
-				&& Objects.equals(this.plannedOutageIndicator, alarmCreate.plannedOutageIndicator)
-				&& Objects.equals(this.probableCause, alarmCreate.probableCause)
-				&& Objects.equals(this.proposedRepairedActions, alarmCreate.proposedRepairedActions)
-				&& Objects.equals(this.reportingSystemId, alarmCreate.reportingSystemId)
-				&& Objects.equals(this.serviceAffecting, alarmCreate.serviceAffecting)
-				&& Objects.equals(this.sourceSystemId, alarmCreate.sourceSystemId)
-				&& Objects.equals(this.specificProblem, alarmCreate.specificProblem)
-				&& Objects.equals(this.state, alarmCreate.state)
-				&& Objects.equals(this.affectedService, alarmCreate.affectedService)
-				&& Objects.equals(this.alarmedObject, alarmCreate.alarmedObject)
-				&& Objects.equals(this.comment, alarmCreate.comment)
-				&& Objects.equals(this.correlatedAlarm, alarmCreate.correlatedAlarm)
-				&& Objects.equals(this.crossedThresholdInformation, alarmCreate.crossedThresholdInformation)
-				&& Objects.equals(this.parentAlarm, alarmCreate.parentAlarm)
-				&& Objects.equals(this.place, alarmCreate.place) && Objects.equals(this.baseType, alarmCreate.baseType)
-				&& Objects.equals(this.schemaLocation, alarmCreate.schemaLocation)
-				&& Objects.equals(this.type, alarmCreate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(ackState, ackSystemId, ackUserId, alarmChangedTime, alarmClearedTime, alarmDetails,
-				alarmEscalation, alarmRaisedTime, alarmReportingTime, alarmType, alarmedObjectType, clearSystemId,
-				clearUserId, externalAlarmId, isRootCause, perceivedSeverity, plannedOutageIndicator, probableCause,
-				proposedRepairedActions, reportingSystemId, serviceAffecting, sourceSystemId, specificProblem, state,
-				affectedService, alarmedObject, comment, correlatedAlarm, crossedThresholdInformation, parentAlarm,
-				place, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmCreate {\n");
-
-		sb.append("    ackState: ").append(toIndentedString(ackState)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-		sb.append("    alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n");
-		sb.append("    alarmEscalation: ").append(toIndentedString(alarmEscalation)).append("\n");
-		sb.append("    alarmRaisedTime: ").append(toIndentedString(alarmRaisedTime)).append("\n");
-		sb.append("    alarmReportingTime: ").append(toIndentedString(alarmReportingTime)).append("\n");
-		sb.append("    alarmType: ").append(toIndentedString(alarmType)).append("\n");
-		sb.append("    alarmedObjectType: ").append(toIndentedString(alarmedObjectType)).append("\n");
-		sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-		sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-		sb.append("    externalAlarmId: ").append(toIndentedString(externalAlarmId)).append("\n");
-		sb.append("    isRootCause: ").append(toIndentedString(isRootCause)).append("\n");
-		sb.append("    perceivedSeverity: ").append(toIndentedString(perceivedSeverity)).append("\n");
-		sb.append("    plannedOutageIndicator: ").append(toIndentedString(plannedOutageIndicator)).append("\n");
-		sb.append("    probableCause: ").append(toIndentedString(probableCause)).append("\n");
-		sb.append("    proposedRepairedActions: ").append(toIndentedString(proposedRepairedActions)).append("\n");
-		sb.append("    reportingSystemId: ").append(toIndentedString(reportingSystemId)).append("\n");
-		sb.append("    serviceAffecting: ").append(toIndentedString(serviceAffecting)).append("\n");
-		sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-		sb.append("    specificProblem: ").append(toIndentedString(specificProblem)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    affectedService: ").append(toIndentedString(affectedService)).append("\n");
-		sb.append("    alarmedObject: ").append(toIndentedString(alarmedObject)).append("\n");
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    crossedThresholdInformation: ").append(toIndentedString(crossedThresholdInformation))
-				.append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEvent.java
deleted file mode 100644
index e1297e483f4907bd655651f7eb46b8b08cc90ea8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEvent.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.OpensliceEvent;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmCreateEvent extends OpensliceEvent  {
-  
-
-  @JsonProperty("event")
-  private AlarmCreateEventPayload event = null;
-
- 
-
-  public AlarmCreateEvent event(AlarmCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AlarmCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AlarmCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmCreateEvent alarmCreateEvent = (AlarmCreateEvent) o;
-    return Objects.equals(this.id, alarmCreateEvent.id) &&
-        Objects.equals(this.href, alarmCreateEvent.href) &&
-        Objects.equals(this.eventId, alarmCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, alarmCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, alarmCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, alarmCreateEvent.correlationId) &&
-        Objects.equals(this.domain, alarmCreateEvent.domain) &&
-        Objects.equals(this.title, alarmCreateEvent.title) &&
-        Objects.equals(this.description, alarmCreateEvent.description) &&
-        Objects.equals(this.priority, alarmCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, alarmCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, alarmCreateEvent.event);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEventPayload.java
deleted file mode 100644
index 7a499c94e1acb84528d73914e87bb8042d1c1712..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmCreateEventPayload   {
-  @JsonProperty("alarm")
-  private Alarm alarm = null;
-
-  public AlarmCreateEventPayload alarm(Alarm alarm) {
-    this.alarm = alarm;
-    return this;
-  }
-
-  /**
-   * Get alarm
-   * @return alarm
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Alarm getAlarm() {
-    return alarm;
-  }
-
-  public void setAlarm(Alarm alarm) {
-    this.alarm = alarm;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmCreateEventPayload alarmCreateEventPayload = (AlarmCreateEventPayload) o;
-    return Objects.equals(this.alarm, alarmCreateEventPayload.alarm);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarm);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmCreateEventPayload {\n");
-    
-    sb.append("    alarm: ").append(toIndentedString(alarm)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEvent.java
deleted file mode 100644
index 38d5a4ddeefa9ff8147efd3e5d06f81cb0881c95..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private AlarmDeleteEventPayload event = null;
-
-  public AlarmDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AlarmDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AlarmDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public AlarmDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public AlarmDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public AlarmDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public AlarmDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public AlarmDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public AlarmDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AlarmDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public AlarmDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public AlarmDeleteEvent event(AlarmDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AlarmDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AlarmDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmDeleteEvent alarmDeleteEvent = (AlarmDeleteEvent) o;
-    return Objects.equals(this.id, alarmDeleteEvent.id) &&
-        Objects.equals(this.href, alarmDeleteEvent.href) &&
-        Objects.equals(this.eventId, alarmDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, alarmDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, alarmDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, alarmDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, alarmDeleteEvent.domain) &&
-        Objects.equals(this.title, alarmDeleteEvent.title) &&
-        Objects.equals(this.description, alarmDeleteEvent.description) &&
-        Objects.equals(this.priority, alarmDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, alarmDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, alarmDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEventPayload.java
deleted file mode 100644
index f9ce09e70692d6d1f0eb3f6e25850cd2f114736d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmDeleteEventPayload   {
-  @JsonProperty("alarm")
-  private Alarm alarm = null;
-
-  public AlarmDeleteEventPayload alarm(Alarm alarm) {
-    this.alarm = alarm;
-    return this;
-  }
-
-  /**
-   * Get alarm
-   * @return alarm
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Alarm getAlarm() {
-    return alarm;
-  }
-
-  public void setAlarm(Alarm alarm) {
-    this.alarm = alarm;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmDeleteEventPayload alarmDeleteEventPayload = (AlarmDeleteEventPayload) o;
-    return Objects.equals(this.alarm, alarmDeleteEventPayload.alarm);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarm);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmDeleteEventPayload {\n");
-    
-    sb.append("    alarm: ").append(toIndentedString(alarm)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRef.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRef.java
deleted file mode 100644
index e62ef125ffe305abfbe618d13af6c8c5e1ce31ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRef.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * AlarmRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMAlarmRef")
-@Table(name = "AMAlarmRef")
-public class AlarmRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	
-
-	public AlarmRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AlarmRef alarmRef = (AlarmRef) o;
-		return Objects.equals(this.id, alarmRef.id) && Objects.equals(this.href, alarmRef.href)
-				&& Objects.equals(this.name, alarmRef.name) && Objects.equals(this.baseType, alarmRef.baseType)
-				&& Objects.equals(this.schemaLocation, alarmRef.schemaLocation)
-				&& Objects.equals(this.type, alarmRef.type)
-				&& Objects.equals(this._atReferredType, alarmRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRefOrValue.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRefOrValue.java
deleted file mode 100644
index f09201996192314f82e550eaa0852675252c3399..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmRefOrValue.java
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * An alarm defined by reference or value. The polymorphic
- * attributes @type, @schemaLocation &amp; @referredType are related to the
- * alarm entity and not the RelatedAlarmRefOrValue class itself
- */
-@Schema(description = "An alarm defined by reference or value. The polymorphic attributes @type, @schemaLocation & @referredType are related to the alarm entity and not the RelatedAlarmRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMAlarmRefOrVal")
-@Table(name = "AMAlarmRefOrVal")
-public class AlarmRefOrValue extends BaseRootNamedEntity {
-	
-	@JsonProperty("id")
-	private Integer id = null;
-
-	@JsonProperty("ackState")
-	private String ackState = null;
-
-	@JsonProperty("ackSystemId")
-	private String ackSystemId = null;
-
-	@JsonProperty("ackUserId")
-	private String ackUserId = null;
-
-	private OffsetDateTime alarmChangedTime = null;
-
-	private OffsetDateTime alarmClearedTime = null;
-
-	@JsonProperty("alarmDetails")
-	private String alarmDetails = null;
-
-	@JsonProperty("alarmEscalation")
-	private Boolean alarmEscalation = null;
-
-	private OffsetDateTime alarmRaisedTime = null;
-
-	private OffsetDateTime alarmReportingTime = null;
-
-	@JsonProperty("alarmType")
-	private String alarmType = null;
-
-	@JsonProperty("alarmedObjectType")
-	private String alarmedObjectType = null;
-
-	@JsonProperty("clearSystemId")
-	private String clearSystemId = null;
-
-	@JsonProperty("clearUserId")
-	private String clearUserId = null;
-
-	@JsonProperty("externalAlarmId")
-	private String externalAlarmId = null;
-
-	@JsonProperty("isRootCause")
-	private Boolean isRootCause = null;
-
-	@JsonProperty("perceivedSeverity")
-	private String perceivedSeverity = null;
-
-	@JsonProperty("plannedOutageIndicator")
-	private String plannedOutageIndicator = null;
-
-	@JsonProperty("probableCause")
-	private String probableCause = null;
-
-	@JsonProperty("proposedRepairedActions")
-	private String proposedRepairedActions = null;
-
-	@JsonProperty("reportingSystemId")
-	private String reportingSystemId = null;
-
-	@JsonProperty("serviceAffecting")
-	private Boolean serviceAffecting = null;
-
-	@JsonProperty("sourceSystemId")
-	private String sourceSystemId = null;
-
-	@JsonProperty("specificProblem")
-	private String specificProblem = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("affectedService")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AffectedService> affectedService = new HashSet<>();
-
-	@JsonProperty("alarmedObject")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private AlarmedObject alarmedObject = null;
-
-	@JsonProperty("comment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Comment> comment = new HashSet<>();
-
-	@JsonProperty("correlatedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRef> correlatedAlarm = new HashSet<>();
-
-	@JsonProperty("crossedThresholdInformation")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private CrossedThresholdInformation crossedThresholdInformation = null;
-
-	@JsonProperty("parentAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRef> parentAlarm = new HashSet<>();
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedPlaceRefOrValue> place = new HashSet<>();
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public AlarmRefOrValue id(Integer id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Identifier of the alarm, determined by the alarm owning system
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of the alarm, determined by the alarm owning system")
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public AlarmRefOrValue href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A reference to the alarm.
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A reference to the alarm.")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public AlarmRefOrValue ackState(String ackState) {
-		this.ackState = ackState;
-		return this;
-	}
-
-	/**
-	 * Provides the Acknowledgement State of the alarm
-	 * 
-	 * @return ackState
-	 **/
-	@Schema(description = "Provides the Acknowledgement State of the alarm")
-
-	public String getAckState() {
-		return ackState;
-	}
-
-	public void setAckState(String ackState) {
-		this.ackState = ackState;
-	}
-
-	public AlarmRefOrValue ackSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the name of the system that last changed the ackState of an alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackSystemId
-	 **/
-	@Schema(description = "Provides the name of the system that last changed the ackState of an alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckSystemId() {
-		return ackSystemId;
-	}
-
-	public void setAckSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-	}
-
-	public AlarmRefOrValue ackUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who has last changed the ack state of the alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackUserId
-	 **/
-	@Schema(description = "Provides the id of the user who has last changed the ack state of the alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckUserId() {
-		return ackUserId;
-	}
-
-	public void setAckUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-	}
-
-	public AlarmRefOrValue alarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the last date and time when the alarm is changed on the
-	 * alarm-owning system. Any change to the alarm whether coming from the alarmed
-	 * resource, or triggered by a change from the client is changing this time.
-	 * 
-	 * @return alarmChangedTime
-	 **/
-	@Schema(description = "Indicates the last date and time when the alarm is changed on the alarm-owning system. Any change to the alarm whether coming from the alarmed resource, or triggered by a change from the client is changing this time.")
-
-	@Valid
-	public OffsetDateTime getAlarmChangedTime() {
-		return alarmChangedTime;
-	}
-
-	public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-	}
-
-	@JsonProperty("alarmChangedTime")
-	public String getAlarmChangedTimeStr() {
-		if (this.alarmChangedTime != null) {
-			return this.alarmChangedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public AlarmRefOrValue alarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm is cleared at the
-	 * source.
-	 * 
-	 * @return alarmClearedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm is cleared at the source. ")
-
-	@Valid
-	public OffsetDateTime getAlarmClearedTime() {
-		return alarmClearedTime;
-	}
-
-	public void setAlarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-	}
-
-	@JsonProperty("alarmClearedTime")
-	public String getAlarmClearedTimeStr() {
-		if (this.alarmClearedTime != null) {
-			return this.alarmClearedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public AlarmRefOrValue alarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-		return this;
-	}
-
-	/**
-	 * Contains further information on the alarm.
-	 * 
-	 * @return alarmDetails
-	 **/
-	@Schema(description = "Contains further information on the alarm.")
-
-	public String getAlarmDetails() {
-		return alarmDetails;
-	}
-
-	public void setAlarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-	}
-
-	public AlarmRefOrValue alarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-		return this;
-	}
-
-	/**
-	 * Indicates if this alarm has been escalated or not.
-	 * 
-	 * @return alarmEscalation
-	 **/
-	@Schema(description = "Indicates if this alarm has been escalated or not. ")
-
-	public Boolean isAlarmEscalation() {
-		return alarmEscalation;
-	}
-
-	public void setAlarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-	}
-
-	public AlarmRefOrValue alarmRaisedTime(OffsetDateTime alarmRaisedTime) {
-		this.alarmRaisedTime = alarmRaisedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm occurred at its
-	 * source.
-	 * 
-	 * @return alarmRaisedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm occurred at its source.")
-
-	@Valid
-	public OffsetDateTime getAlarmRaisedTime() {
-		return alarmRaisedTime;
-	}
-
-	public void setAlarmRaisedTime(OffsetDateTime alarmRaisedTime) {
-		this.alarmRaisedTime = alarmRaisedTime;
-	}
-
-	@JsonProperty("alarmRaisedTime")
-	public String getAlarmRaisedTimeStr() {
-		if (this.alarmRaisedTime != null) {
-			return this.alarmRaisedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public AlarmRefOrValue alarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm was reported by the
-	 * owning OSS. It might be different from the alarmRaisedTime. For instance, if
-	 * the alarm list is maintained by an EMS, the alarmRaisedtime would be the time
-	 * the alarm was detected by the NE, while the alarmReportingTime would be the
-	 * time this alarm was stored in the alarm list of the EMS.
-	 * 
-	 * @return alarmReportingTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm was reported by the owning OSS. It might be different from the alarmRaisedTime. For instance, if the alarm list is maintained by an EMS, the alarmRaisedtime would be the time the alarm   was detected by the NE, while the alarmReportingTime would be the time this alarm was stored in the alarm list of the EMS.")
-
-	@Valid
-	public OffsetDateTime getAlarmReportingTime() {
-		return alarmReportingTime;
-	}
-
-	public void setAlarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-	}
-
-	@JsonProperty("alarmReportingTime")
-	public String getAlarmReportingTimeStr() {
-		if (this.alarmReportingTime != null) {
-			return this.alarmReportingTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public AlarmRefOrValue alarmType(String alarmType) {
-		this.alarmType = alarmType;
-		return this;
-	}
-
-	/**
-	 * Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or
-	 * 3GPP TS 32.111-2 Annex A: Communications Alarm Processing Error Alarm
-	 * Environmental Alarm Quality of Service Alarm Equipment Alarm Integrity
-	 * Violation Operational Violation Physical Violation Security Service or
-	 * Mechanism Violation Time Domain Violation
-	 * 
-	 * @return alarmType
-	 **/
-	@Schema(description = "Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or 3GPP TS 32.111-2 Annex A:  Communications Alarm  Processing Error Alarm  Environmental Alarm  Quality of Service Alarm  Equipment Alarm  Integrity Violation  Operational Violation  Physical Violation  Security Service or Mechanism Violation  Time Domain Violation")
-
-	public String getAlarmType() {
-		return alarmType;
-	}
-
-	public void setAlarmType(String alarmType) {
-		this.alarmType = alarmType;
-	}
-
-	public AlarmRefOrValue alarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-		return this;
-	}
-
-	/**
-	 * The type (class) of the managed object associated with the event.
-	 * 
-	 * @return alarmedObjectType
-	 **/
-	@Schema(description = "The type (class) of the managed object associated with the event.")
-
-	public String getAlarmedObjectType() {
-		return alarmedObjectType;
-	}
-
-	public void setAlarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-	}
-
-	public AlarmRefOrValue clearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the system where the user who invoked the alarmCleared
-	 * operation is located.
-	 * 
-	 * @return clearSystemId
-	 **/
-	@Schema(description = "Provides the id of the system where the user who invoked the alarmCleared operation is located. ")
-
-	public String getClearSystemId() {
-		return clearSystemId;
-	}
-
-	public void setClearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-	}
-
-	public AlarmRefOrValue clearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who invoked the alarmCleared operation
-	 * 
-	 * @return clearUserId
-	 **/
-	@Schema(description = "Provides the id of the user who invoked the alarmCleared operation")
-
-	public String getClearUserId() {
-		return clearUserId;
-	}
-
-	public void setClearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-	}
-
-	public AlarmRefOrValue externalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-		return this;
-	}
-
-	/**
-	 * An identifier of the alarm in the source system.
-	 * 
-	 * @return externalAlarmId
-	 **/
-	@Schema(description = "An identifier of the alarm in the source system.")
-
-	public String getExternalAlarmId() {
-		return externalAlarmId;
-	}
-
-	public void setExternalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-	}
-
-	public AlarmRefOrValue isRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm is a root cause alarm..
-	 * 
-	 * @return isRootCause
-	 **/
-	@Schema(description = "Indicates whether the alarm is a root cause alarm.. ")
-
-	public Boolean isIsRootCause() {
-		return isRootCause;
-	}
-
-	public void setIsRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-	}
-
-	public AlarmRefOrValue perceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-		return this;
-	}
-
-	/**
-	 * Lists the possible severities that can be allocated to an Alarm. The values
-	 * are consistent with ITU-T Recommendation X.733. Once an alarm has been
-	 * cleared, its perceived severity is set to 'cleared' and can no longer be set.
-	 * 
-	 * @return perceivedSeverity
-	 **/
-	@Schema(description = "Lists the possible severities that can be allocated to an Alarm. The values are consistent with ITU-T Recommendation X.733. Once an alarm has been cleared, its perceived severity is set to 'cleared' and can no longer be set.")
-
-	public String getPerceivedSeverity() {
-		return perceivedSeverity;
-	}
-
-	public void setPerceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-	}
-
-	public AlarmRefOrValue plannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-		return this;
-	}
-
-	/**
-	 * Indicates that the Managed Object (related to this alarm) is in planned
-	 * outage (in planned maintenance, or out-of-service).
-	 * 
-	 * @return plannedOutageIndicator
-	 **/
-	@Schema(description = "Indicates that the Managed Object (related to this alarm) is in planned outage (in planned maintenance, or out-of-service). ")
-
-	public String getPlannedOutageIndicator() {
-		return plannedOutageIndicator;
-	}
-
-	public void setPlannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-	}
-
-	public AlarmRefOrValue probableCause(String probableCause) {
-		this.probableCause = probableCause;
-		return this;
-	}
-
-	/**
-	 * Provides the probable cause of the alarm. The values are consistent with
-	 * ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.
-	 * 
-	 * @return probableCause
-	 **/
-	@Schema(description = "Provides the probable cause of the alarm. The values are consistent with ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.")
-
-	public String getProbableCause() {
-		return probableCause;
-	}
-
-	public void setProbableCause(String probableCause) {
-		this.probableCause = probableCause;
-	}
-
-	public AlarmRefOrValue proposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-		return this;
-	}
-
-	/**
-	 * Indicates proposed repair actions, if known to the system emitting the alarm.
-	 * 
-	 * @return proposedRepairedActions
-	 **/
-	@Schema(description = "Indicates proposed repair actions, if known to the system emitting the alarm.")
-
-	public String getProposedRepairedActions() {
-		return proposedRepairedActions;
-	}
-
-	public void setProposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-	}
-
-	public AlarmRefOrValue reportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-		return this;
-	}
-
-	/**
-	 * Reporting system identity.
-	 * 
-	 * @return reportingSystemId
-	 **/
-	@Schema(description = "Reporting system identity.")
-
-	public String getReportingSystemId() {
-		return reportingSystemId;
-	}
-
-	public void setReportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-	}
-
-	public AlarmRefOrValue serviceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm affects service or not.
-	 * 
-	 * @return serviceAffecting
-	 **/
-	@Schema(description = "Indicates whether the alarm affects service or not.")
-
-	public Boolean isServiceAffecting() {
-		return serviceAffecting;
-	}
-
-	public void setServiceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-	}
-
-	public AlarmRefOrValue sourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-		return this;
-	}
-
-	/**
-	 * Source system identity.
-	 * 
-	 * @return sourceSystemId
-	 **/
-	@Schema(description = "Source system identity.")
-
-	public String getSourceSystemId() {
-		return sourceSystemId;
-	}
-
-	public void setSourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-	}
-
-	public AlarmRefOrValue specificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-		return this;
-	}
-
-	/**
-	 * Provides more specific information about the alarm.
-	 * 
-	 * @return specificProblem
-	 **/
-	@Schema(description = "Provides more specific information about the alarm.")
-
-	public String getSpecificProblem() {
-		return specificProblem;
-	}
-
-	public void setSpecificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-	}
-
-	public AlarmRefOrValue state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Defines the alarm state during its life cycle
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Defines the alarm state during its life cycle")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public AlarmRefOrValue affectedService(Set<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-		return this;
-	}
-
-	public AlarmRefOrValue addAffectedServiceItem(AffectedService affectedServiceItem) {
-		if (this.affectedService == null) {
-			this.affectedService = new HashSet<>();
-		}
-		this.affectedService.add(affectedServiceItem);
-		return this;
-	}
-
-	/**
-	 * Get affectedService
-	 * 
-	 * @return affectedService
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AffectedService> getAffectedService() {
-		return affectedService;
-	}
-
-	public void setAffectedService(Set<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-	}
-
-	public AlarmRefOrValue alarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-		return this;
-	}
-
-	/**
-	 * Get alarmedObject
-	 * 
-	 * @return alarmedObject
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AlarmedObject getAlarmedObject() {
-		return alarmedObject;
-	}
-
-	public void setAlarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-	}
-
-	public AlarmRefOrValue comment(Set<Comment> comment) {
-		this.comment = comment;
-		return this;
-	}
-
-	public AlarmRefOrValue addCommentItem(Comment commentItem) {
-		if (this.comment == null) {
-			this.comment = new HashSet<>();
-		}
-		this.comment.add(commentItem);
-		return this;
-	}
-
-	/**
-	 * Get comment
-	 * 
-	 * @return comment
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<Comment> getComment() {
-		return comment;
-	}
-
-	public void setComment(Set<Comment> comment) {
-		this.comment = comment;
-	}
-
-	public AlarmRefOrValue correlatedAlarm(Set<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-		return this;
-	}
-
-	public AlarmRefOrValue addCorrelatedAlarmItem(AlarmRef correlatedAlarmItem) {
-		if (this.correlatedAlarm == null) {
-			this.correlatedAlarm = new HashSet<>();
-		}
-		this.correlatedAlarm.add(correlatedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get correlatedAlarm
-	 * 
-	 * @return correlatedAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AlarmRef> getCorrelatedAlarm() {
-		return correlatedAlarm;
-	}
-
-	public void setCorrelatedAlarm(Set<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-	}
-
-	public AlarmRefOrValue crossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-		return this;
-	}
-
-	/**
-	 * Get crossedThresholdInformation
-	 * 
-	 * @return crossedThresholdInformation
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public CrossedThresholdInformation getCrossedThresholdInformation() {
-		return crossedThresholdInformation;
-	}
-
-	public void setCrossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-	}
-
-	public AlarmRefOrValue parentAlarm(Set<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-		return this;
-	}
-
-	public AlarmRefOrValue addParentAlarmItem(AlarmRef parentAlarmItem) {
-		if (this.parentAlarm == null) {
-			this.parentAlarm = new HashSet<>();
-		}
-		this.parentAlarm.add(parentAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get parentAlarm
-	 * 
-	 * @return parentAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AlarmRef> getParentAlarm() {
-		return parentAlarm;
-	}
-
-	public void setParentAlarm(Set<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-	}
-
-	public AlarmRefOrValue place(Set<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-		return this;
-	}
-
-	public AlarmRefOrValue addPlaceItem(RelatedPlaceRefOrValue placeItem) {
-		if (this.place == null) {
-			this.place = new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<RelatedPlaceRefOrValue> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-	}
-
-	public AlarmRefOrValue _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AlarmRefOrValue alarmRefOrValue = (AlarmRefOrValue) o;
-		return Objects.equals(this.id, alarmRefOrValue.id) && Objects.equals(this.href, alarmRefOrValue.href)
-				&& Objects.equals(this.ackState, alarmRefOrValue.ackState)
-				&& Objects.equals(this.ackSystemId, alarmRefOrValue.ackSystemId)
-				&& Objects.equals(this.ackUserId, alarmRefOrValue.ackUserId)
-				&& Objects.equals(this.alarmChangedTime, alarmRefOrValue.alarmChangedTime)
-				&& Objects.equals(this.alarmClearedTime, alarmRefOrValue.alarmClearedTime)
-				&& Objects.equals(this.alarmDetails, alarmRefOrValue.alarmDetails)
-				&& Objects.equals(this.alarmEscalation, alarmRefOrValue.alarmEscalation)
-				&& Objects.equals(this.alarmRaisedTime, alarmRefOrValue.alarmRaisedTime)
-				&& Objects.equals(this.alarmReportingTime, alarmRefOrValue.alarmReportingTime)
-				&& Objects.equals(this.alarmType, alarmRefOrValue.alarmType)
-				&& Objects.equals(this.alarmedObjectType, alarmRefOrValue.alarmedObjectType)
-				&& Objects.equals(this.clearSystemId, alarmRefOrValue.clearSystemId)
-				&& Objects.equals(this.clearUserId, alarmRefOrValue.clearUserId)
-				&& Objects.equals(this.externalAlarmId, alarmRefOrValue.externalAlarmId)
-				&& Objects.equals(this.isRootCause, alarmRefOrValue.isRootCause)
-				&& Objects.equals(this.name, alarmRefOrValue.name)
-				&& Objects.equals(this.perceivedSeverity, alarmRefOrValue.perceivedSeverity)
-				&& Objects.equals(this.plannedOutageIndicator, alarmRefOrValue.plannedOutageIndicator)
-				&& Objects.equals(this.probableCause, alarmRefOrValue.probableCause)
-				&& Objects.equals(this.proposedRepairedActions, alarmRefOrValue.proposedRepairedActions)
-				&& Objects.equals(this.reportingSystemId, alarmRefOrValue.reportingSystemId)
-				&& Objects.equals(this.serviceAffecting, alarmRefOrValue.serviceAffecting)
-				&& Objects.equals(this.sourceSystemId, alarmRefOrValue.sourceSystemId)
-				&& Objects.equals(this.specificProblem, alarmRefOrValue.specificProblem)
-				&& Objects.equals(this.state, alarmRefOrValue.state)
-				&& Objects.equals(this.affectedService, alarmRefOrValue.affectedService)
-				&& Objects.equals(this.alarmedObject, alarmRefOrValue.alarmedObject)
-				&& Objects.equals(this.comment, alarmRefOrValue.comment)
-				&& Objects.equals(this.correlatedAlarm, alarmRefOrValue.correlatedAlarm)
-				&& Objects.equals(this.crossedThresholdInformation, alarmRefOrValue.crossedThresholdInformation)
-				&& Objects.equals(this.parentAlarm, alarmRefOrValue.parentAlarm)
-				&& Objects.equals(this.place, alarmRefOrValue.place)
-				&& Objects.equals(this.baseType, alarmRefOrValue.baseType)
-				&& Objects.equals(this.schemaLocation, alarmRefOrValue.schemaLocation)
-				&& Objects.equals(this.type, alarmRefOrValue.type)
-				&& Objects.equals(this._atReferredType, alarmRefOrValue._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, ackState, ackSystemId, ackUserId, alarmChangedTime, alarmClearedTime,
-				alarmDetails, alarmEscalation, alarmRaisedTime, alarmReportingTime, alarmType, alarmedObjectType,
-				clearSystemId, clearUserId, externalAlarmId, isRootCause, name, perceivedSeverity,
-				plannedOutageIndicator, probableCause, proposedRepairedActions, reportingSystemId, serviceAffecting,
-				sourceSystemId, specificProblem, state, affectedService, alarmedObject, comment, correlatedAlarm,
-				crossedThresholdInformation, parentAlarm, place, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmRefOrValue {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    ackState: ").append(toIndentedString(ackState)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-		sb.append("    alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n");
-		sb.append("    alarmEscalation: ").append(toIndentedString(alarmEscalation)).append("\n");
-		sb.append("    alarmRaisedTime: ").append(toIndentedString(alarmRaisedTime)).append("\n");
-		sb.append("    alarmReportingTime: ").append(toIndentedString(alarmReportingTime)).append("\n");
-		sb.append("    alarmType: ").append(toIndentedString(alarmType)).append("\n");
-		sb.append("    alarmedObjectType: ").append(toIndentedString(alarmedObjectType)).append("\n");
-		sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-		sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-		sb.append("    externalAlarmId: ").append(toIndentedString(externalAlarmId)).append("\n");
-		sb.append("    isRootCause: ").append(toIndentedString(isRootCause)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    perceivedSeverity: ").append(toIndentedString(perceivedSeverity)).append("\n");
-		sb.append("    plannedOutageIndicator: ").append(toIndentedString(plannedOutageIndicator)).append("\n");
-		sb.append("    probableCause: ").append(toIndentedString(probableCause)).append("\n");
-		sb.append("    proposedRepairedActions: ").append(toIndentedString(proposedRepairedActions)).append("\n");
-		sb.append("    reportingSystemId: ").append(toIndentedString(reportingSystemId)).append("\n");
-		sb.append("    serviceAffecting: ").append(toIndentedString(serviceAffecting)).append("\n");
-		sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-		sb.append("    specificProblem: ").append(toIndentedString(specificProblem)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    affectedService: ").append(toIndentedString(affectedService)).append("\n");
-		sb.append("    alarmedObject: ").append(toIndentedString(alarmedObject)).append("\n");
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    crossedThresholdInformation: ").append(toIndentedString(crossedThresholdInformation))
-				.append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEvent.java
deleted file mode 100644
index 98667f584fa0c304bd05544936601ac6aca4adba..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private AlarmStateChangeEventPayload event = null;
-
-  public AlarmStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AlarmStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AlarmStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public AlarmStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public AlarmStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public AlarmStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public AlarmStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public AlarmStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public AlarmStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AlarmStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public AlarmStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public AlarmStateChangeEvent event(AlarmStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AlarmStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(AlarmStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmStateChangeEvent alarmStateChangeEvent = (AlarmStateChangeEvent) o;
-    return Objects.equals(this.id, alarmStateChangeEvent.id) &&
-        Objects.equals(this.href, alarmStateChangeEvent.href) &&
-        Objects.equals(this.eventId, alarmStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, alarmStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, alarmStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, alarmStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, alarmStateChangeEvent.domain) &&
-        Objects.equals(this.title, alarmStateChangeEvent.title) &&
-        Objects.equals(this.description, alarmStateChangeEvent.description) &&
-        Objects.equals(this.priority, alarmStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, alarmStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, alarmStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEventPayload.java
deleted file mode 100644
index 8aa83a12c873d0347c8e2e7e756f3d2847911e61..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmStateChangeEventPayload   {
-  @JsonProperty("alarm")
-  private Alarm alarm = null;
-
-  public AlarmStateChangeEventPayload alarm(Alarm alarm) {
-    this.alarm = alarm;
-    return this;
-  }
-
-  /**
-   * Get alarm
-   * @return alarm
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Alarm getAlarm() {
-    return alarm;
-  }
-
-  public void setAlarm(Alarm alarm) {
-    this.alarm = alarm;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AlarmStateChangeEventPayload alarmStateChangeEventPayload = (AlarmStateChangeEventPayload) o;
-    return Objects.equals(this.alarm, alarmStateChangeEventPayload.alarm);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarm);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AlarmStateChangeEventPayload {\n");
-    
-    sb.append("    alarm: ").append(toIndentedString(alarm)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateType.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateType.java
deleted file mode 100644
index 3fee537c4cc4c07434357149f775fbfdbf6ac696..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmStateType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-public enum AlarmStateType {
-	
-	raised,
-	updated,
-	cleared;
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmType.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmType.java
deleted file mode 100644
index a8625e028be12e623ae4862d2d615d0b88701ba3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-public enum AlarmType {
-	
-	communicationsAlarm,
-	processingErrorAlarm,
-	environmentalAlarm,
-	qualityOfServiceAlarm,
-	equipmentAlarm,
-	integrityViolation,
-	operationalViolation,
-	physicalViolation,
-	securityService,
-	mechanismViolation,
-	timeDomainViolation;
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmUpdate.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmUpdate.java
deleted file mode 100644
index af3fde983bf283526b91ce0dc5a4af88a7f18e3d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmUpdate.java
+++ /dev/null
@@ -1,997 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * This resource represents an alarm supporting the information model defined in
- * ITU-T X.733. Skipped properties: id,href,alarmRaisedTime,sourceSystemId
- */
-@Schema(description = "This resource represents an alarm supporting the information model defined in ITU-T X.733. Skipped properties: id,href,alarmRaisedTime,sourceSystemId")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class AlarmUpdate {
-	@JsonProperty("ackState")
-	protected String ackState = null;
-
-	@JsonProperty("ackSystemId")
-	protected String ackSystemId = null;
-
-	@JsonProperty("ackUserId")
-	protected String ackUserId = null;
-
-	protected OffsetDateTime alarmChangedTime = null;
-
-	protected OffsetDateTime alarmClearedTime = null;
-
-	@JsonProperty("alarmDetails")
-	protected String alarmDetails = null;
-
-	@JsonProperty("alarmEscalation")
-	protected Boolean alarmEscalation = null;
-
-	protected OffsetDateTime alarmReportingTime = null;
-
-	@JsonProperty("alarmType")
-	protected String alarmType = null;
-
-	@JsonProperty("alarmedObjectType")
-	protected String alarmedObjectType = null;
-
-	@JsonProperty("clearSystemId")
-	protected String clearSystemId = null;
-
-	@JsonProperty("clearUserId")
-	protected String clearUserId = null;
-
-	@JsonProperty("externalAlarmId")
-	protected String externalAlarmId = null;
-
-	@JsonProperty("isRootCause")
-	protected Boolean isRootCause = null;
-
-	@JsonProperty("perceivedSeverity")
-	protected String perceivedSeverity = null;
-
-	@JsonProperty("plannedOutageIndicator")
-	protected String plannedOutageIndicator = null;
-
-	@JsonProperty("probableCause")
-	protected String probableCause = null;
-
-	@JsonProperty("proposedRepairedActions")
-	protected String proposedRepairedActions = null;
-
-	@JsonProperty("reportingSystemId")
-	protected String reportingSystemId = null;
-
-	@JsonProperty("serviceAffecting")
-	protected Boolean serviceAffecting = null;
-
-	@JsonProperty("specificProblem")
-	protected String specificProblem = null;
-
-	@JsonProperty("state")
-	protected String state = null;
-
-	@JsonProperty("affectedService")
-	@Valid
-	protected List<AffectedService> affectedService = null;
-
-	@JsonProperty("alarmedObject")
-	protected AlarmedObject alarmedObject = null;
-
-	@JsonProperty("comment")
-	@Valid
-	protected List<Comment> comment = null;
-
-	@JsonProperty("correlatedAlarm")
-	@Valid
-	protected List<AlarmRef> correlatedAlarm = null;
-
-	@JsonProperty("crossedThresholdInformation")
-	protected CrossedThresholdInformation crossedThresholdInformation = null;
-
-	@JsonProperty("parentAlarm")
-	@Valid
-	protected List<AlarmRef> parentAlarm = null;
-
-	@JsonProperty("place")
-	@Valid
-	protected List<RelatedPlaceRefOrValue> place = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public AlarmUpdate ackState(String ackState) {
-		this.ackState = ackState;
-		return this;
-	}
-
-	/**
-	 * Provides the Acknowledgement State of the alarm
-	 * 
-	 * @return ackState
-	 **/
-	@Schema(description = "Provides the Acknowledgement State of the alarm")
-
-	public String getAckState() {
-		return ackState;
-	}
-
-	public void setAckState(String ackState) {
-		this.ackState = ackState;
-	}
-
-	public AlarmUpdate ackSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the name of the system that last changed the ackState of an alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackSystemId
-	 **/
-	@Schema(description = "Provides the name of the system that last changed the ackState of an alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckSystemId() {
-		return ackSystemId;
-	}
-
-	public void setAckSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-	}
-
-	public AlarmUpdate ackUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who has last changed the ack state of the alarm,
-	 * i.e. acknowledged or unacknowledged the alarm.
-	 * 
-	 * @return ackUserId
-	 **/
-	@Schema(description = "Provides the id of the user who has last changed the ack state of the alarm, i.e. acknowledged or unacknowledged the alarm.")
-
-	public String getAckUserId() {
-		return ackUserId;
-	}
-
-	public void setAckUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-	}
-
-	public AlarmUpdate alarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the last date and time when the alarm is changed on the
-	 * alarm-owning system. Any change to the alarm whether coming from the alarmed
-	 * resource, or triggered by a change from the client is changing this time.
-	 * 
-	 * @return alarmChangedTime
-	 **/
-	@Schema(description = "Indicates the last date and time when the alarm is changed on the alarm-owning system. Any change to the alarm whether coming from the alarmed resource, or triggered by a change from the client is changing this time.")
-
-	@Valid
-	public OffsetDateTime getAlarmChangedTime() {
-		return alarmChangedTime;
-	}
-
-	@JsonProperty("alarmChangedTime")
-	public String getAlarmChangedTimeStr() {
-		if (this.alarmChangedTime != null) {
-			return this.alarmChangedTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setAlarmChangedTime(String alarmChangedTime) {
-		if (alarmChangedTime != null) {
-			this.alarmChangedTime = OffsetDateTime.parse(alarmChangedTime);
-		}
-
-	}
-
-
-	public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-	}
-
-	public AlarmUpdate alarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm is cleared at the
-	 * source.
-	 * 
-	 * @return alarmClearedTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm is cleared at the source. ")
-
-	@Valid
-	public OffsetDateTime getAlarmClearedTime() {
-		return alarmClearedTime;
-	}
-
-	public void setAlarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-	}
-	
-	@JsonProperty("alarmClearedTime")
-	public String getAlarmClearedTimeStr() {
-		if (this.alarmClearedTime != null) {
-			return this.alarmClearedTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setAlarmClearedTime(String alarmClearedTime) {
-		if (alarmClearedTime != null) {
-			this.alarmClearedTime = OffsetDateTime.parse(alarmClearedTime);
-		}
-
-	}
-
-	public AlarmUpdate alarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-		return this;
-	}
-
-	/**
-	 * Contains further information on the alarm.
-	 * 
-	 * @return alarmDetails
-	 **/
-	@Schema(description = "Contains further information on the alarm.")
-
-	public String getAlarmDetails() {
-		return alarmDetails;
-	}
-
-	public void setAlarmDetails(String alarmDetails) {
-		this.alarmDetails = alarmDetails;
-	}
-
-	public AlarmUpdate alarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-		return this;
-	}
-
-	/**
-	 * Indicates if this alarm has been escalated or not.
-	 * 
-	 * @return alarmEscalation
-	 **/
-	@Schema(description = "Indicates if this alarm has been escalated or not. ")
-
-	public Boolean isAlarmEscalation() {
-		return alarmEscalation;
-	}
-
-	public void setAlarmEscalation(Boolean alarmEscalation) {
-		this.alarmEscalation = alarmEscalation;
-	}
-
-	public AlarmUpdate alarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-		return this;
-	}
-
-	/**
-	 * Indicates the time (as a date + time) at which the alarm was reported by the
-	 * owning OSS. It might be different from the alarmRaisedTime. For instance, if
-	 * the alarm list is maintained by an EMS, the alarmRaisedtime would be the time
-	 * the alarm was detected by the NE, while the alarmReportingTime would be the
-	 * time this alarm was stored in the alarm list of the EMS.
-	 * 
-	 * @return alarmReportingTime
-	 **/
-	@Schema(description = "Indicates the time (as a date + time) at which the alarm was reported by the owning OSS. It might be different from the alarmRaisedTime. For instance, if the alarm list is maintained by an EMS, the alarmRaisedtime would be the time the alarm   was detected by the NE, while the alarmReportingTime would be the time this alarm was stored in the alarm list of the EMS.")
-
-	@Valid
-	public OffsetDateTime getAlarmReportingTime() {
-		return alarmReportingTime;
-	}
-
-	public void setAlarmReportingTime(OffsetDateTime alarmReportingTime) {
-		this.alarmReportingTime = alarmReportingTime;
-	}
-	
-
-	@JsonProperty("alarmReportingTime")
-	public String getAlarmReportingTimeStr() {
-		if (this.alarmReportingTime != null) {
-			return this.alarmReportingTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setAlarmReportingTime(String alarmReportingTime) {
-		if (alarmReportingTime != null) {
-			this.alarmReportingTime = OffsetDateTime.parse(alarmReportingTime);
-		}
-
-	}
-
-	public AlarmUpdate alarmType(String alarmType) {
-		this.alarmType = alarmType;
-		return this;
-	}
-
-	/**
-	 * Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or
-	 * 3GPP TS 32.111-2 Annex A: Communications Alarm Processing Error Alarm
-	 * Environmental Alarm Quality of Service Alarm Equipment Alarm Integrity
-	 * Violation Operational Violation Physical Violation Security Service or
-	 * Mechanism Violation Time Domain Violation
-	 * 
-	 * @return alarmType
-	 **/
-	@Schema(description = "Categorize the alarm. Should be one of the values defined in X.733 8.1.1 or 3GPP TS 32.111-2 Annex A:  Communications Alarm  Processing Error Alarm  Environmental Alarm  Quality of Service Alarm  Equipment Alarm  Integrity Violation  Operational Violation  Physical Violation  Security Service or Mechanism Violation  Time Domain Violation")
-
-	public String getAlarmType() {
-		return alarmType;
-	}
-
-	public void setAlarmType(String alarmType) {
-		this.alarmType = alarmType;
-	}
-
-	public AlarmUpdate alarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-		return this;
-	}
-
-	/**
-	 * The type (class) of the managed object associated with the event.
-	 * 
-	 * @return alarmedObjectType
-	 **/
-	@Schema(description = "The type (class) of the managed object associated with the event.")
-
-	public String getAlarmedObjectType() {
-		return alarmedObjectType;
-	}
-
-	public void setAlarmedObjectType(String alarmedObjectType) {
-		this.alarmedObjectType = alarmedObjectType;
-	}
-
-	public AlarmUpdate clearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the system where the user who invoked the alarmCleared
-	 * operation is located.
-	 * 
-	 * @return clearSystemId
-	 **/
-	@Schema(description = "Provides the id of the system where the user who invoked the alarmCleared operation is located. ")
-
-	public String getClearSystemId() {
-		return clearSystemId;
-	}
-
-	public void setClearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-	}
-
-	public AlarmUpdate clearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-		return this;
-	}
-
-	/**
-	 * Provides the id of the user who invoked the alarmCleared operation
-	 * 
-	 * @return clearUserId
-	 **/
-	@Schema(description = "Provides the id of the user who invoked the alarmCleared operation")
-
-	public String getClearUserId() {
-		return clearUserId;
-	}
-
-	public void setClearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-	}
-
-	public AlarmUpdate externalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-		return this;
-	}
-
-	/**
-	 * An identifier of the alarm in the source system.
-	 * 
-	 * @return externalAlarmId
-	 **/
-	@Schema(description = "An identifier of the alarm in the source system.")
-
-	public String getExternalAlarmId() {
-		return externalAlarmId;
-	}
-
-	public void setExternalAlarmId(String externalAlarmId) {
-		this.externalAlarmId = externalAlarmId;
-	}
-
-	public AlarmUpdate isRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm is a root cause alarm..
-	 * 
-	 * @return isRootCause
-	 **/
-	@Schema(description = "Indicates whether the alarm is a root cause alarm.. ")
-
-	public Boolean isIsRootCause() {
-		return isRootCause;
-	}
-
-	public void setIsRootCause(Boolean isRootCause) {
-		this.isRootCause = isRootCause;
-	}
-
-	public AlarmUpdate perceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-		return this;
-	}
-
-	/**
-	 * Lists the possible severities that can be allocated to an Alarm. The values
-	 * are consistent with ITU-T Recommendation X.733. Once an alarm has been
-	 * cleared, its perceived severity is set to 'cleared' and can no longer be set.
-	 * 
-	 * @return perceivedSeverity
-	 **/
-	@Schema(description = "Lists the possible severities that can be allocated to an Alarm. The values are consistent with ITU-T Recommendation X.733. Once an alarm has been cleared, its perceived severity is set to 'cleared' and can no longer be set.")
-
-	public String getPerceivedSeverity() {
-		return perceivedSeverity;
-	}
-
-	public void setPerceivedSeverity(String perceivedSeverity) {
-		this.perceivedSeverity = perceivedSeverity;
-	}
-
-	public AlarmUpdate plannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-		return this;
-	}
-
-	/**
-	 * Indicates that the Managed Object (related to this alarm) is in planned
-	 * outage (in planned maintenance, or out-of-service).
-	 * 
-	 * @return plannedOutageIndicator
-	 **/
-	@Schema(description = "Indicates that the Managed Object (related to this alarm) is in planned outage (in planned maintenance, or out-of-service). ")
-
-	public String getPlannedOutageIndicator() {
-		return plannedOutageIndicator;
-	}
-
-	public void setPlannedOutageIndicator(String plannedOutageIndicator) {
-		this.plannedOutageIndicator = plannedOutageIndicator;
-	}
-
-	public AlarmUpdate probableCause(String probableCause) {
-		this.probableCause = probableCause;
-		return this;
-	}
-
-	/**
-	 * Provides the probable cause of the alarm. The values are consistent with
-	 * ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.
-	 * 
-	 * @return probableCause
-	 **/
-	@Schema(description = "Provides the probable cause of the alarm. The values are consistent with ITU-T Recommendation X.733 or 3GPP TS 32.111-2 Annex B.")
-
-	public String getProbableCause() {
-		return probableCause;
-	}
-
-	public void setProbableCause(String probableCause) {
-		this.probableCause = probableCause;
-	}
-
-	public AlarmUpdate proposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-		return this;
-	}
-
-	/**
-	 * Indicates proposed repair actions, if known to the system emitting the alarm.
-	 * 
-	 * @return proposedRepairedActions
-	 **/
-	@Schema(description = "Indicates proposed repair actions, if known to the system emitting the alarm.")
-
-	public String getProposedRepairedActions() {
-		return proposedRepairedActions;
-	}
-
-	public void setProposedRepairedActions(String proposedRepairedActions) {
-		this.proposedRepairedActions = proposedRepairedActions;
-	}
-
-	public AlarmUpdate reportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-		return this;
-	}
-
-	/**
-	 * Reporting system identity.
-	 * 
-	 * @return reportingSystemId
-	 **/
-	@Schema(description = "Reporting system identity.")
-
-	public String getReportingSystemId() {
-		return reportingSystemId;
-	}
-
-	public void setReportingSystemId(String reportingSystemId) {
-		this.reportingSystemId = reportingSystemId;
-	}
-
-	public AlarmUpdate serviceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-		return this;
-	}
-
-	/**
-	 * Indicates whether the alarm affects service or not.
-	 * 
-	 * @return serviceAffecting
-	 **/
-	@Schema(description = "Indicates whether the alarm affects service or not.")
-
-	public Boolean isServiceAffecting() {
-		return serviceAffecting;
-	}
-
-	public void setServiceAffecting(Boolean serviceAffecting) {
-		this.serviceAffecting = serviceAffecting;
-	}
-
-	public AlarmUpdate specificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-		return this;
-	}
-
-	/**
-	 * Provides more specific information about the alarm.
-	 * 
-	 * @return specificProblem
-	 **/
-	@Schema(description = "Provides more specific information about the alarm.")
-
-	public String getSpecificProblem() {
-		return specificProblem;
-	}
-
-	public void setSpecificProblem(String specificProblem) {
-		this.specificProblem = specificProblem;
-	}
-
-	public AlarmUpdate state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Defines the alarm state during its life cycle
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Defines the alarm state during its life cycle")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public AlarmUpdate affectedService(List<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-		return this;
-	}
-
-	public AlarmUpdate addAffectedServiceItem(AffectedService affectedServiceItem) {
-		if (this.affectedService == null) {
-			this.affectedService = new ArrayList<>();
-		}
-		this.affectedService.add(affectedServiceItem);
-		return this;
-	}
-
-	/**
-	 * Get affectedService
-	 * 
-	 * @return affectedService
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<AffectedService> getAffectedService() {
-		return affectedService;
-	}
-
-	public void setAffectedService(List<AffectedService> affectedService) {
-		this.affectedService = affectedService;
-	}
-
-	public AlarmUpdate alarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-		return this;
-	}
-
-	/**
-	 * Get alarmedObject
-	 * 
-	 * @return alarmedObject
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AlarmedObject getAlarmedObject() {
-		return alarmedObject;
-	}
-
-	public void setAlarmedObject(AlarmedObject alarmedObject) {
-		this.alarmedObject = alarmedObject;
-	}
-
-	public AlarmUpdate comment(List<Comment> comment) {
-		this.comment = comment;
-		return this;
-	}
-
-	public AlarmUpdate addCommentItem(Comment commentItem) {
-		if (this.comment == null) {
-			this.comment = new ArrayList<>();
-		}
-		this.comment.add(commentItem);
-		return this;
-	}
-
-	/**
-	 * Get comment
-	 * 
-	 * @return comment
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<Comment> getComment() {
-		return comment;
-	}
-
-	public void setComment(List<Comment> comment) {
-		this.comment = comment;
-	}
-
-	public AlarmUpdate correlatedAlarm(List<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-		return this;
-	}
-
-	public AlarmUpdate addCorrelatedAlarmItem(AlarmRef correlatedAlarmItem) {
-		if (this.correlatedAlarm == null) {
-			this.correlatedAlarm = new ArrayList<>();
-		}
-		this.correlatedAlarm.add(correlatedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get correlatedAlarm
-	 * 
-	 * @return correlatedAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<AlarmRef> getCorrelatedAlarm() {
-		return correlatedAlarm;
-	}
-
-	public void setCorrelatedAlarm(List<AlarmRef> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-	}
-
-	public AlarmUpdate crossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-		return this;
-	}
-
-	/**
-	 * Get crossedThresholdInformation
-	 * 
-	 * @return crossedThresholdInformation
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public CrossedThresholdInformation getCrossedThresholdInformation() {
-		return crossedThresholdInformation;
-	}
-
-	public void setCrossedThresholdInformation(CrossedThresholdInformation crossedThresholdInformation) {
-		this.crossedThresholdInformation = crossedThresholdInformation;
-	}
-
-	public AlarmUpdate parentAlarm(List<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-		return this;
-	}
-
-	public AlarmUpdate addParentAlarmItem(AlarmRef parentAlarmItem) {
-		if (this.parentAlarm == null) {
-			this.parentAlarm = new ArrayList<>();
-		}
-		this.parentAlarm.add(parentAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Get parentAlarm
-	 * 
-	 * @return parentAlarm
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<AlarmRef> getParentAlarm() {
-		return parentAlarm;
-	}
-
-	public void setParentAlarm(List<AlarmRef> parentAlarm) {
-		this.parentAlarm = parentAlarm;
-	}
-
-	public AlarmUpdate place(List<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-		return this;
-	}
-
-	public AlarmUpdate addPlaceItem(RelatedPlaceRefOrValue placeItem) {
-		if (this.place == null) {
-			this.place = new ArrayList<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<RelatedPlaceRefOrValue> getPlace() {
-		return place;
-	}
-
-	public void setPlace(List<RelatedPlaceRefOrValue> place) {
-		this.place = place;
-	}
-
-	public AlarmUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * The base type of this alarm.
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "The base type of this alarm.")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public AlarmUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A reference to the schema describing this alarm.
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A reference to the schema describing this alarm.")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public AlarmUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * The type for this alarm.
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "The type for this alarm.")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AlarmUpdate alarmUpdate = (AlarmUpdate) o;
-		return Objects.equals(this.ackState, alarmUpdate.ackState)
-				&& Objects.equals(this.ackSystemId, alarmUpdate.ackSystemId)
-				&& Objects.equals(this.ackUserId, alarmUpdate.ackUserId)
-				&& Objects.equals(this.alarmChangedTime, alarmUpdate.alarmChangedTime)
-				&& Objects.equals(this.alarmClearedTime, alarmUpdate.alarmClearedTime)
-				&& Objects.equals(this.alarmDetails, alarmUpdate.alarmDetails)
-				&& Objects.equals(this.alarmEscalation, alarmUpdate.alarmEscalation)
-				&& Objects.equals(this.alarmReportingTime, alarmUpdate.alarmReportingTime)
-				&& Objects.equals(this.alarmType, alarmUpdate.alarmType)
-				&& Objects.equals(this.alarmedObjectType, alarmUpdate.alarmedObjectType)
-				&& Objects.equals(this.clearSystemId, alarmUpdate.clearSystemId)
-				&& Objects.equals(this.clearUserId, alarmUpdate.clearUserId)
-				&& Objects.equals(this.externalAlarmId, alarmUpdate.externalAlarmId)
-				&& Objects.equals(this.isRootCause, alarmUpdate.isRootCause)
-				&& Objects.equals(this.perceivedSeverity, alarmUpdate.perceivedSeverity)
-				&& Objects.equals(this.plannedOutageIndicator, alarmUpdate.plannedOutageIndicator)
-				&& Objects.equals(this.probableCause, alarmUpdate.probableCause)
-				&& Objects.equals(this.proposedRepairedActions, alarmUpdate.proposedRepairedActions)
-				&& Objects.equals(this.reportingSystemId, alarmUpdate.reportingSystemId)
-				&& Objects.equals(this.serviceAffecting, alarmUpdate.serviceAffecting)
-				&& Objects.equals(this.specificProblem, alarmUpdate.specificProblem)
-				&& Objects.equals(this.state, alarmUpdate.state)
-				&& Objects.equals(this.affectedService, alarmUpdate.affectedService)
-				&& Objects.equals(this.alarmedObject, alarmUpdate.alarmedObject)
-				&& Objects.equals(this.comment, alarmUpdate.comment)
-				&& Objects.equals(this.correlatedAlarm, alarmUpdate.correlatedAlarm)
-				&& Objects.equals(this.crossedThresholdInformation, alarmUpdate.crossedThresholdInformation)
-				&& Objects.equals(this.parentAlarm, alarmUpdate.parentAlarm)
-				&& Objects.equals(this.place, alarmUpdate.place) && Objects.equals(this.baseType, alarmUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, alarmUpdate.schemaLocation)
-				&& Objects.equals(this.type, alarmUpdate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(ackState, ackSystemId, ackUserId, alarmChangedTime, alarmClearedTime, alarmDetails,
-				alarmEscalation, alarmReportingTime, alarmType, alarmedObjectType, clearSystemId, clearUserId,
-				externalAlarmId, isRootCause, perceivedSeverity, plannedOutageIndicator, probableCause,
-				proposedRepairedActions, reportingSystemId, serviceAffecting, specificProblem, state, affectedService,
-				alarmedObject, comment, correlatedAlarm, crossedThresholdInformation, parentAlarm, place, baseType,
-				schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmUpdate {\n");
-
-		sb.append("    ackState: ").append(toIndentedString(ackState)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-		sb.append("    alarmDetails: ").append(toIndentedString(alarmDetails)).append("\n");
-		sb.append("    alarmEscalation: ").append(toIndentedString(alarmEscalation)).append("\n");
-		sb.append("    alarmReportingTime: ").append(toIndentedString(alarmReportingTime)).append("\n");
-		sb.append("    alarmType: ").append(toIndentedString(alarmType)).append("\n");
-		sb.append("    alarmedObjectType: ").append(toIndentedString(alarmedObjectType)).append("\n");
-		sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-		sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-		sb.append("    externalAlarmId: ").append(toIndentedString(externalAlarmId)).append("\n");
-		sb.append("    isRootCause: ").append(toIndentedString(isRootCause)).append("\n");
-		sb.append("    perceivedSeverity: ").append(toIndentedString(perceivedSeverity)).append("\n");
-		sb.append("    plannedOutageIndicator: ").append(toIndentedString(plannedOutageIndicator)).append("\n");
-		sb.append("    probableCause: ").append(toIndentedString(probableCause)).append("\n");
-		sb.append("    proposedRepairedActions: ").append(toIndentedString(proposedRepairedActions)).append("\n");
-		sb.append("    reportingSystemId: ").append(toIndentedString(reportingSystemId)).append("\n");
-		sb.append("    serviceAffecting: ").append(toIndentedString(serviceAffecting)).append("\n");
-		sb.append("    specificProblem: ").append(toIndentedString(specificProblem)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    affectedService: ").append(toIndentedString(affectedService)).append("\n");
-		sb.append("    alarmedObject: ").append(toIndentedString(alarmedObject)).append("\n");
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    crossedThresholdInformation: ").append(toIndentedString(crossedThresholdInformation))
-				.append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmedObject.java b/src/main/java/org/etsi/osl/tmf/am642/model/AlarmedObject.java
deleted file mode 100644
index 6c1879ba762b2a672f8c64d3a986aed7163a88c9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/AlarmedObject.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * Identifies the managed object instance associated with the alarm.
- */
-@Schema(description = "Identifies the managed object instance associated with the alarm.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMAlarmedObject")
-@Table(name = "AMAlarmedObject")
-public class AlarmedObject extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AlarmedObject alarmedObject = (AlarmedObject) o;
-		return Objects.equals(this.id, alarmedObject.id) && Objects.equals(this.href, alarmedObject.href)
-				&& Objects.equals(this.baseType, alarmedObject.baseType)
-				&& Objects.equals(this.schemaLocation, alarmedObject.schemaLocation)
-				&& Objects.equals(this.type, alarmedObject.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmedObject {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarms.java
deleted file mode 100644
index 9278319c7d5f0177f41a40f6db48891f96b24f40..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarms.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for clear alarms operation
- */
-@Schema(description = "Task resource for clear alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-
-@Entity(name = "AMClearAlarms")
-@Table(name = "AMClearAlarms")
-@ApiResponse
-public class ClearAlarms extends BaseRootEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	private OffsetDateTime alarmClearedTime = null;
-
-	@JsonProperty("clearSystemId")
-	private String clearSystemId = null;
-
-	@JsonProperty("clearUserId")
-	private String clearUserId = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("alarmPattern")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Alarm> alarmPattern =  new HashSet<>();
-
-	@JsonProperty("clearedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> clearedAlarm =  new HashSet<>();
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public ClearAlarms alarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-		return this;
-	}
-
-	/**
-	 * Time of the alarm clearing
-	 * 
-	 * @return alarmClearedTime
-	 **/
-	@Schema(description = "Time of the alarm clearing")
-
-	@Valid
-	public OffsetDateTime getAlarmClearedTime() {
-		return alarmClearedTime;
-	}
-
-	public void setAlarmClearedTime(OffsetDateTime alarmClearedTime) {
-		this.alarmClearedTime = alarmClearedTime;
-	}
-	
-
-	@JsonProperty("alarmClearedTime")
-	public String getAlarmClearedTimeStr() {
-		if (this.alarmClearedTime != null) {
-			return this.alarmClearedTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	
-	
-
-	public ClearAlarms clearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-		return this;
-	}
-
-	/**
-	 * Name of the clearing system
-	 * 
-	 * @return clearSystemId
-	 **/
-	@Schema(description = "Name of the clearing system")
-
-	public String getClearSystemId() {
-		return clearSystemId;
-	}
-
-	public void setClearSystemId(String clearSystemId) {
-		this.clearSystemId = clearSystemId;
-	}
-
-	public ClearAlarms clearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-		return this;
-	}
-
-	/**
-	 * Name of the clearing user
-	 * 
-	 * @return clearUserId
-	 **/
-	@Schema(description = "Name of the clearing user")
-
-	public String getClearUserId() {
-		return clearUserId;
-	}
-
-	public void setClearUserId(String clearUserId) {
-		this.clearUserId = clearUserId;
-	}
-
-	public ClearAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public ClearAlarms alarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-		return this;
-	}
-
-	public ClearAlarms addAlarmPatternItem(Alarm alarmPatternItem) {
-		if (this.alarmPattern == null) {
-			this.alarmPattern =  new HashSet<>();
-		}
-		this.alarmPattern.add(alarmPatternItem);
-		return this;
-	}
-
-	/**
-	 * Alarm patterns to match target alarms. An alarm will match if all of the
-	 * sttributes in any of the patterns compare equal to those attributes of the
-	 * alarm.
-	 * 
-	 * @return alarmPattern
-	 **/
-	@Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-	@Valid
-	public Set<Alarm> getAlarmPattern() {
-		return alarmPattern;
-	}
-
-	public void setAlarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-	}
-
-	public ClearAlarms clearedAlarm(Set<AlarmRefOrValue> clearedAlarm) {
-		this.clearedAlarm = clearedAlarm;
-		return this;
-	}
-
-	public ClearAlarms addClearedAlarmItem(AlarmRefOrValue clearedAlarmItem) {
-		if (this.clearedAlarm == null) {
-			this.clearedAlarm =  new HashSet<>();
-		}
-		this.clearedAlarm.add(clearedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully cleared alarms
-	 * 
-	 * @return clearedAlarm
-	 **/
-	@Schema(description = "The successfully cleared alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getClearedAlarm() {
-		return clearedAlarm;
-	}
-
-	public void setClearedAlarm(Set<AlarmRefOrValue> clearedAlarm) {
-		this.clearedAlarm = clearedAlarm;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ClearAlarms clearAlarms = (ClearAlarms) o;
-		return Objects.equals(this.id, clearAlarms.id) && Objects.equals(this.href, clearAlarms.href)
-				&& Objects.equals(this.alarmClearedTime, clearAlarms.alarmClearedTime)
-				&& Objects.equals(this.clearSystemId, clearAlarms.clearSystemId)
-				&& Objects.equals(this.clearUserId, clearAlarms.clearUserId)
-				&& Objects.equals(this.state, clearAlarms.state)
-				&& Objects.equals(this.alarmPattern, clearAlarms.alarmPattern)
-				&& Objects.equals(this.clearedAlarm, clearAlarms.clearedAlarm)
-				&& Objects.equals(this.baseType, clearAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, clearAlarms.schemaLocation)
-				&& Objects.equals(this.type, clearAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, alarmClearedTime, clearSystemId, clearUserId, state, alarmPattern, clearedAlarm,
-				baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ClearAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-		sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-		sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-		sb.append("    clearedAlarm: ").append(toIndentedString(clearedAlarm)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreate.java
deleted file mode 100644
index e16667c2cec75f4141e0f639ddf029003770737d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreate.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for clear alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for clear alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class ClearAlarmsCreate   {
-  @JsonProperty("alarmClearedTime")
-  private OffsetDateTime alarmClearedTime = null;
-
-  @JsonProperty("clearSystemId")
-  private String clearSystemId = null;
-
-  @JsonProperty("clearUserId")
-  private String clearUserId = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("alarmPattern")
-  @Valid
-  private List<Alarm> alarmPattern = new ArrayList<>();
-
-  @JsonProperty("clearedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> clearedAlarm = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ClearAlarmsCreate alarmClearedTime(OffsetDateTime alarmClearedTime) {
-    this.alarmClearedTime = alarmClearedTime;
-    return this;
-  }
-
-  /**
-   * Time of the alarm clearing
-   * @return alarmClearedTime
-  **/
-  @Schema(description = "Time of the alarm clearing")
-      @NotNull
-
-    @Valid
-    public OffsetDateTime getAlarmClearedTime() {
-    return alarmClearedTime;
-  }
-
-  public void setAlarmClearedTime(OffsetDateTime alarmClearedTime) {
-    this.alarmClearedTime = alarmClearedTime;
-  }
-
-  public ClearAlarmsCreate clearSystemId(String clearSystemId) {
-    this.clearSystemId = clearSystemId;
-    return this;
-  }
-
-  /**
-   * Name of the clearing system
-   * @return clearSystemId
-  **/
-  @Schema(description = "Name of the clearing system")
-      @NotNull
-
-    public String getClearSystemId() {
-    return clearSystemId;
-  }
-
-  public void setClearSystemId(String clearSystemId) {
-    this.clearSystemId = clearSystemId;
-  }
-
-  public ClearAlarmsCreate clearUserId(String clearUserId) {
-    this.clearUserId = clearUserId;
-    return this;
-  }
-
-  /**
-   * Name of the clearing user
-   * @return clearUserId
-  **/
-  @Schema(description = "Name of the clearing user")
-      @NotNull
-
-    public String getClearUserId() {
-    return clearUserId;
-  }
-
-  public void setClearUserId(String clearUserId) {
-    this.clearUserId = clearUserId;
-  }
-
-  public ClearAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public ClearAlarmsCreate alarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-    return this;
-  }
-
-  public ClearAlarmsCreate addAlarmPatternItem(Alarm alarmPatternItem) {
-    this.alarmPattern.add(alarmPatternItem);
-    return this;
-  }
-
-  /**
-   * Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.
-   * @return alarmPattern
-  **/
-  @Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<Alarm> getAlarmPattern() {
-    return alarmPattern;
-  }
-
-  public void setAlarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-  }
-
-  public ClearAlarmsCreate clearedAlarm(List<AlarmRefOrValue> clearedAlarm) {
-    this.clearedAlarm = clearedAlarm;
-    return this;
-  }
-
-  public ClearAlarmsCreate addClearedAlarmItem(AlarmRefOrValue clearedAlarmItem) {
-    if (this.clearedAlarm == null) {
-      this.clearedAlarm = new ArrayList<>();
-    }
-    this.clearedAlarm.add(clearedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully cleared alarms
-   * @return clearedAlarm
-  **/
-  @Schema(description = "The successfully cleared alarms")
-      @Valid
-    public List<AlarmRefOrValue> getClearedAlarm() {
-    return clearedAlarm;
-  }
-
-  public void setClearedAlarm(List<AlarmRefOrValue> clearedAlarm) {
-    this.clearedAlarm = clearedAlarm;
-  }
-
-  public ClearAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ClearAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ClearAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClearAlarmsCreate clearAlarmsCreate = (ClearAlarmsCreate) o;
-    return Objects.equals(this.alarmClearedTime, clearAlarmsCreate.alarmClearedTime) &&
-        Objects.equals(this.clearSystemId, clearAlarmsCreate.clearSystemId) &&
-        Objects.equals(this.clearUserId, clearAlarmsCreate.clearUserId) &&
-        Objects.equals(this.state, clearAlarmsCreate.state) &&
-        Objects.equals(this.alarmPattern, clearAlarmsCreate.alarmPattern) &&
-        Objects.equals(this.clearedAlarm, clearAlarmsCreate.clearedAlarm) &&
-        Objects.equals(this.baseType, clearAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, clearAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, clearAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarmClearedTime, clearSystemId, clearUserId, state, alarmPattern, clearedAlarm, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClearAlarmsCreate {\n");
-    
-    sb.append("    alarmClearedTime: ").append(toIndentedString(alarmClearedTime)).append("\n");
-    sb.append("    clearSystemId: ").append(toIndentedString(clearSystemId)).append("\n");
-    sb.append("    clearUserId: ").append(toIndentedString(clearUserId)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-    sb.append("    clearedAlarm: ").append(toIndentedString(clearedAlarm)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEvent.java
deleted file mode 100644
index bc9c551a91c9f6be0c7565f8086ef3be37d35dca..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class ClearAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ClearAlarmsCreateEventPayload event = null;
-
-  public ClearAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ClearAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ClearAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ClearAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ClearAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ClearAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ClearAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ClearAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ClearAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ClearAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ClearAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ClearAlarmsCreateEvent event(ClearAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ClearAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ClearAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClearAlarmsCreateEvent clearAlarmsCreateEvent = (ClearAlarmsCreateEvent) o;
-    return Objects.equals(this.id, clearAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, clearAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, clearAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, clearAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, clearAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, clearAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, clearAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, clearAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, clearAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, clearAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, clearAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, clearAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClearAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEventPayload.java
deleted file mode 100644
index 30c045ce0996f06822177ff9b378d249c19071df..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class ClearAlarmsCreateEventPayload   {
-  @JsonProperty("clearAlarms")
-  private ClearAlarms clearAlarms = null;
-
-  public ClearAlarmsCreateEventPayload clearAlarms(ClearAlarms clearAlarms) {
-    this.clearAlarms = clearAlarms;
-    return this;
-  }
-
-  /**
-   * Get clearAlarms
-   * @return clearAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ClearAlarms getClearAlarms() {
-    return clearAlarms;
-  }
-
-  public void setClearAlarms(ClearAlarms clearAlarms) {
-    this.clearAlarms = clearAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClearAlarmsCreateEventPayload clearAlarmsCreateEventPayload = (ClearAlarmsCreateEventPayload) o;
-    return Objects.equals(this.clearAlarms, clearAlarmsCreateEventPayload.clearAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(clearAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClearAlarmsCreateEventPayload {\n");
-    
-    sb.append("    clearAlarms: ").append(toIndentedString(clearAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEvent.java
deleted file mode 100644
index 2ae572cd4378fd60bf43f52ae9e94927569dba64..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class ClearAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ClearAlarmsStateChangeEventPayload event = null;
-
-  public ClearAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ClearAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ClearAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ClearAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ClearAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ClearAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ClearAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ClearAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ClearAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ClearAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ClearAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ClearAlarmsStateChangeEvent event(ClearAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ClearAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ClearAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClearAlarmsStateChangeEvent clearAlarmsStateChangeEvent = (ClearAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, clearAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, clearAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, clearAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, clearAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, clearAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, clearAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, clearAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, clearAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, clearAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, clearAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, clearAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, clearAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClearAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEventPayload.java
deleted file mode 100644
index 49be5be16408ed7293789058bbea246ad032e03f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ClearAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class ClearAlarmsStateChangeEventPayload   {
-  @JsonProperty("clearAlarms")
-  private ClearAlarms clearAlarms = null;
-
-  public ClearAlarmsStateChangeEventPayload clearAlarms(ClearAlarms clearAlarms) {
-    this.clearAlarms = clearAlarms;
-    return this;
-  }
-
-  /**
-   * Get clearAlarms
-   * @return clearAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ClearAlarms getClearAlarms() {
-    return clearAlarms;
-  }
-
-  public void setClearAlarms(ClearAlarms clearAlarms) {
-    this.clearAlarms = clearAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClearAlarmsStateChangeEventPayload clearAlarmsStateChangeEventPayload = (ClearAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.clearAlarms, clearAlarmsStateChangeEventPayload.clearAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(clearAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClearAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    clearAlarms: ").append(toIndentedString(clearAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/Comment.java b/src/main/java/org/etsi/osl/tmf/am642/model/Comment.java
deleted file mode 100644
index d8ad40ae3cf367b94ef6a306ce58c6fe3768d213..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/Comment.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Indicates the comments entered on the alarm.
- */
-@Schema(description = "Indicates the comments entered on the alarm.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMcomment")
-@Table(name = "AMcomment")
-public class Comment extends BaseRootEntity {
-	@JsonProperty("comment")
-	@Lob
-	@Column(name = "LCOMMENT", columnDefinition = "LONGTEXT")
-	private String comment = null;
-
-	@JsonProperty("systemId")
-	private String systemId = null;
-
-	private OffsetDateTime time = null;
-
-	@JsonProperty("userId")
-	private String userId = null;
-
-	public Comment comment(String comment) {
-		this.comment = comment;
-		return this;
-	}
-
-	/**
-	 * Indicates the text of the comment.
-	 * 
-	 * @return comment
-	 **/
-	@Schema(description = "Indicates the text of the comment.")
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
-	public Comment systemId(String systemId) {
-		this.systemId = systemId;
-		return this;
-	}
-
-	/**
-	 * Indicates the system identifier on which the client set the comment.
-	 * 
-	 * @return systemId
-	 **/
-	@Schema(description = "Indicates the system identifier on which the client set the comment.")
-
-	public String getSystemId() {
-		return systemId;
-	}
-
-	public void setSystemId(String systemId) {
-		this.systemId = systemId;
-	}
-
-	public Comment time(OffsetDateTime time) {
-		this.time = time;
-		return this;
-	}
-
-	/**
-	 * Indicates the time commenting the alarm
-	 * 
-	 * @return time
-	 **/
-	@Schema(description = "Indicates the time commenting the alarm")
-
-	@Valid
-	public OffsetDateTime getTime() {
-		return time;
-	}
-
-	public void setTime(OffsetDateTime time) {
-		this.time = time;
-	}
-
-	@JsonProperty("time")
-	public String getTimeStr() {
-		if (this.time != null) {
-			return this.time.toString();
-		} else {
-			return null;
-		}
-	}
-	
-
-	public void setTime(String time) {
-		if ( time != null) {
-			this.time = OffsetDateTime.parse( time );
-			
-		}
-	}
-
-	public Comment userId(String userId) {
-		this.userId = userId;
-		return this;
-	}
-
-	/**
-	 * Indicates the user commenting the alarm.
-	 * 
-	 * @return userId
-	 **/
-	@Schema(description = "Indicates the user commenting the alarm.")
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Comment comment = (Comment) o;
-		return Objects.equals(this.comment, comment.comment) && Objects.equals(this.systemId, comment.systemId)
-				&& Objects.equals(this.time, comment.time) && Objects.equals(this.userId, comment.userId)
-				&& Objects.equals(this.baseType, comment.baseType)
-				&& Objects.equals(this.schemaLocation, comment.schemaLocation)
-				&& Objects.equals(this.type, comment.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(comment, systemId, time, userId, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Comment {\n");
-
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    systemId: ").append(toIndentedString(systemId)).append("\n");
-		sb.append("    time: ").append(toIndentedString(time)).append("\n");
-		sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarms.java
deleted file mode 100644
index a1be3aeef37299e5ec899e92aa1aa44a51577d82..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarms.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for comment alarms operation
- */
-@Schema(description = "Task resource for comment alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMCommentAlarms")
-@Table(name = "AMCommentAlarms")
-public class CommentAlarms extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("alarmPattern")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Alarm> alarmPattern = new HashSet<>();
-
-	@JsonProperty("comment")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Comment comment = null;
-
-	@JsonProperty("commentedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> commentedAlarm = new HashSet<>();
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public CommentAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public CommentAlarms alarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-		return this;
-	}
-
-	public CommentAlarms addAlarmPatternItem(Alarm alarmPatternItem) {
-		if (this.alarmPattern == null) {
-			this.alarmPattern = new HashSet<>();
-		}
-		this.alarmPattern.add(alarmPatternItem);
-		return this;
-	}
-
-	/**
-	 * Alarm patterns to match target alarms. An alarm will match if all of the
-	 * sttributes in any of the patterns compare equal to those attributes of the
-	 * alarm.
-	 * 
-	 * @return alarmPattern
-	 **/
-	@Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-	@Valid
-	public Set<Alarm> getAlarmPattern() {
-		return alarmPattern;
-	}
-
-	public void setAlarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-	}
-
-	public CommentAlarms comment(Comment comment) {
-		this.comment = comment;
-		return this;
-	}
-
-	/**
-	 * Get comment
-	 * 
-	 * @return comment
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Comment getComment() {
-		return comment;
-	}
-
-	public void setComment(Comment comment) {
-		this.comment = comment;
-	}
-
-	public CommentAlarms commentedAlarm(Set<AlarmRefOrValue> commentedAlarm) {
-		this.commentedAlarm = commentedAlarm;
-		return this;
-	}
-
-	public CommentAlarms addCommentedAlarmItem(AlarmRefOrValue commentedAlarmItem) {
-		if (this.commentedAlarm == null) {
-			this.commentedAlarm = new HashSet<>();
-		}
-		this.commentedAlarm.add(commentedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully commented alarms
-	 * 
-	 * @return commentedAlarm
-	 **/
-	@Schema(description = "The successfully commented alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getCommentedAlarm() {
-		return commentedAlarm;
-	}
-
-	public void setCommentedAlarm(Set<AlarmRefOrValue> commentedAlarm) {
-		this.commentedAlarm = commentedAlarm;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CommentAlarms commentAlarms = (CommentAlarms) o;
-		return Objects.equals(this.id, commentAlarms.id) && Objects.equals(this.href, commentAlarms.href)
-				&& Objects.equals(this.state, commentAlarms.state)
-				&& Objects.equals(this.alarmPattern, commentAlarms.alarmPattern)
-				&& Objects.equals(this.comment, commentAlarms.comment)
-				&& Objects.equals(this.commentedAlarm, commentAlarms.commentedAlarm)
-				&& Objects.equals(this.baseType, commentAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, commentAlarms.schemaLocation)
-				&& Objects.equals(this.type, commentAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, state, alarmPattern, comment, commentedAlarm, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CommentAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-		sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-		sb.append("    commentedAlarm: ").append(toIndentedString(commentedAlarm)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreate.java
deleted file mode 100644
index f7ab485277d0d24655f715fa9bad50b848468335..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreate.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for comment alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for comment alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class CommentAlarmsCreate   {
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("alarmPattern")
-  @Valid
-  private List<Alarm> alarmPattern = new ArrayList<>();
-
-  @JsonProperty("comment")
-  private Comment comment = null;
-
-  @JsonProperty("commentedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> commentedAlarm = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public CommentAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public CommentAlarmsCreate alarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-    return this;
-  }
-
-  public CommentAlarmsCreate addAlarmPatternItem(Alarm alarmPatternItem) {
-    this.alarmPattern.add(alarmPatternItem);
-    return this;
-  }
-
-  /**
-   * Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.
-   * @return alarmPattern
-  **/
-  @Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<Alarm> getAlarmPattern() {
-    return alarmPattern;
-  }
-
-  public void setAlarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-  }
-
-  public CommentAlarmsCreate comment(Comment comment) {
-    this.comment = comment;
-    return this;
-  }
-
-  /**
-   * Get comment
-   * @return comment
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public Comment getComment() {
-    return comment;
-  }
-
-  public void setComment(Comment comment) {
-    this.comment = comment;
-  }
-
-  public CommentAlarmsCreate commentedAlarm(List<AlarmRefOrValue> commentedAlarm) {
-    this.commentedAlarm = commentedAlarm;
-    return this;
-  }
-
-  public CommentAlarmsCreate addCommentedAlarmItem(AlarmRefOrValue commentedAlarmItem) {
-    if (this.commentedAlarm == null) {
-      this.commentedAlarm = new ArrayList<>();
-    }
-    this.commentedAlarm.add(commentedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully commented alarms
-   * @return commentedAlarm
-  **/
-  @Schema(description = "The successfully commented alarms")
-      @Valid
-    public List<AlarmRefOrValue> getCommentedAlarm() {
-    return commentedAlarm;
-  }
-
-  public void setCommentedAlarm(List<AlarmRefOrValue> commentedAlarm) {
-    this.commentedAlarm = commentedAlarm;
-  }
-
-  public CommentAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CommentAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CommentAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CommentAlarmsCreate commentAlarmsCreate = (CommentAlarmsCreate) o;
-    return Objects.equals(this.state, commentAlarmsCreate.state) &&
-        Objects.equals(this.alarmPattern, commentAlarmsCreate.alarmPattern) &&
-        Objects.equals(this.comment, commentAlarmsCreate.comment) &&
-        Objects.equals(this.commentedAlarm, commentAlarmsCreate.commentedAlarm) &&
-        Objects.equals(this.baseType, commentAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, commentAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, commentAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(state, alarmPattern, comment, commentedAlarm, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CommentAlarmsCreate {\n");
-    
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-    sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-    sb.append("    commentedAlarm: ").append(toIndentedString(commentedAlarm)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEvent.java
deleted file mode 100644
index 10878e603a0389bee6cfb3fb6a264dceaf45b23c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class CommentAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CommentAlarmsCreateEventPayload event = null;
-
-  public CommentAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CommentAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CommentAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CommentAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CommentAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CommentAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CommentAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CommentAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CommentAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CommentAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CommentAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CommentAlarmsCreateEvent event(CommentAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CommentAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CommentAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CommentAlarmsCreateEvent commentAlarmsCreateEvent = (CommentAlarmsCreateEvent) o;
-    return Objects.equals(this.id, commentAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, commentAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, commentAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, commentAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, commentAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, commentAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, commentAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, commentAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, commentAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, commentAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, commentAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, commentAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CommentAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEventPayload.java
deleted file mode 100644
index 9f5d465b797143ae4cb0ba40114db41e4d716cd3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class CommentAlarmsCreateEventPayload   {
-  @JsonProperty("commentAlarms")
-  private CommentAlarms commentAlarms = null;
-
-  public CommentAlarmsCreateEventPayload commentAlarms(CommentAlarms commentAlarms) {
-    this.commentAlarms = commentAlarms;
-    return this;
-  }
-
-  /**
-   * Get commentAlarms
-   * @return commentAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CommentAlarms getCommentAlarms() {
-    return commentAlarms;
-  }
-
-  public void setCommentAlarms(CommentAlarms commentAlarms) {
-    this.commentAlarms = commentAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CommentAlarmsCreateEventPayload commentAlarmsCreateEventPayload = (CommentAlarmsCreateEventPayload) o;
-    return Objects.equals(this.commentAlarms, commentAlarmsCreateEventPayload.commentAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commentAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CommentAlarmsCreateEventPayload {\n");
-    
-    sb.append("    commentAlarms: ").append(toIndentedString(commentAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEvent.java
deleted file mode 100644
index f668f83a0cb5371c752663a121168ab87cdb80cf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class CommentAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CommentAlarmsStateChangeEventPayload event = null;
-
-  public CommentAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CommentAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CommentAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CommentAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CommentAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CommentAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CommentAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CommentAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CommentAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CommentAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CommentAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CommentAlarmsStateChangeEvent event(CommentAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CommentAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CommentAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CommentAlarmsStateChangeEvent commentAlarmsStateChangeEvent = (CommentAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, commentAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, commentAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, commentAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, commentAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, commentAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, commentAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, commentAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, commentAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, commentAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, commentAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, commentAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, commentAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CommentAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEventPayload.java
deleted file mode 100644
index 3e6005eb854d19bb3cfe84172c6ff0ae4c03bd6e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CommentAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class CommentAlarmsStateChangeEventPayload   {
-  @JsonProperty("commentAlarms")
-  private CommentAlarms commentAlarms = null;
-
-  public CommentAlarmsStateChangeEventPayload commentAlarms(CommentAlarms commentAlarms) {
-    this.commentAlarms = commentAlarms;
-    return this;
-  }
-
-  /**
-   * Get commentAlarms
-   * @return commentAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CommentAlarms getCommentAlarms() {
-    return commentAlarms;
-  }
-
-  public void setCommentAlarms(CommentAlarms commentAlarms) {
-    this.commentAlarms = commentAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CommentAlarmsStateChangeEventPayload commentAlarmsStateChangeEventPayload = (CommentAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.commentAlarms, commentAlarmsStateChangeEventPayload.commentAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(commentAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CommentAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    commentAlarms: ").append(toIndentedString(commentAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/CrossedThresholdInformation.java b/src/main/java/org/etsi/osl/tmf/am642/model/CrossedThresholdInformation.java
deleted file mode 100644
index f1e51bf83a49f8f71e2c3ec902a603cdee12b97c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/CrossedThresholdInformation.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Identifies the details of the threshold that has been crossed.
- */
-@Schema(description = "Identifies the details of the threshold that has been crossed.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMCrossedThreshInfo")
-@Table(name = "AMCrossedThreshInfo")
-public class CrossedThresholdInformation extends BaseRootEntity {
-	@JsonProperty("direction")
-	private String direction = null;
-
-	@JsonProperty("granularity")
-	private String granularity = null;
-
-	@JsonProperty("indicatorName")
-	private String indicatorName = null;
-
-	@JsonProperty("indicatorUnit")
-	private String indicatorUnit = null;
-
-	@JsonProperty("observedValue")
-	private String observedValue = null;
-
-	@JsonProperty("thresholdCrossingDescription")
-	private String thresholdCrossingDescription = null;
-
-	@JsonProperty("threshold")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private ThresholdRef threshold = null;
-
-	public CrossedThresholdInformation direction(String direction) {
-		this.direction = direction;
-		return this;
-	}
-
-	/**
-	 * Indicates the threshold crossing direction: up or down.
-	 * 
-	 * @return direction
-	 **/
-	@Schema(description = "Indicates the threshold crossing direction: up or down.")
-
-	public String getDirection() {
-		return direction;
-	}
-
-	public void setDirection(String direction) {
-		this.direction = direction;
-	}
-
-	public CrossedThresholdInformation granularity(String granularity) {
-		this.granularity = granularity;
-		return this;
-	}
-
-	/**
-	 * Indicates the granularity at which the indicator is evaluated for threshold
-	 * crossing
-	 * 
-	 * @return granularity
-	 **/
-	@Schema(description = "Indicates the granularity at which the indicator is evaluated for threshold crossing")
-
-	public String getGranularity() {
-		return granularity;
-	}
-
-	public void setGranularity(String granularity) {
-		this.granularity = granularity;
-	}
-
-	public CrossedThresholdInformation indicatorName(String indicatorName) {
-		this.indicatorName = indicatorName;
-		return this;
-	}
-
-	/**
-	 * Indicates the name of indicator which crossed the threshold.
-	 * 
-	 * @return indicatorName
-	 **/
-	@Schema(description = "Indicates the name of indicator which crossed the threshold.")
-
-	public String getIndicatorName() {
-		return indicatorName;
-	}
-
-	public void setIndicatorName(String indicatorName) {
-		this.indicatorName = indicatorName;
-	}
-
-	public CrossedThresholdInformation indicatorUnit(String indicatorUnit) {
-		this.indicatorUnit = indicatorUnit;
-		return this;
-	}
-
-	/**
-	 * Indicates the unit of the measurement of the indicator corresponding to the
-	 * threshold that has been crossed.
-	 * 
-	 * @return indicatorUnit
-	 **/
-	@Schema(description = "Indicates the unit of the measurement of the indicator corresponding to the threshold that has been crossed.")
-
-	public String getIndicatorUnit() {
-		return indicatorUnit;
-	}
-
-	public void setIndicatorUnit(String indicatorUnit) {
-		this.indicatorUnit = indicatorUnit;
-	}
-
-	public CrossedThresholdInformation observedValue(String observedValue) {
-		this.observedValue = observedValue;
-		return this;
-	}
-
-	/**
-	 * Indicates the value of the indicator which crossed the threshold.
-	 * 
-	 * @return observedValue
-	 **/
-	@Schema(description = "Indicates the value of the indicator which crossed the threshold.")
-
-	public String getObservedValue() {
-		return observedValue;
-	}
-
-	public void setObservedValue(String observedValue) {
-		this.observedValue = observedValue;
-	}
-
-	public CrossedThresholdInformation thresholdCrossingDescription(String thresholdCrossingDescription) {
-		this.thresholdCrossingDescription = thresholdCrossingDescription;
-		return this;
-	}
-
-	/**
-	 * Indicates further information on the threshold crossing alarm.
-	 * 
-	 * @return thresholdCrossingDescription
-	 **/
-	@Schema(description = "Indicates further information on the threshold crossing alarm.")
-
-	public String getThresholdCrossingDescription() {
-		return thresholdCrossingDescription;
-	}
-
-	public void setThresholdCrossingDescription(String thresholdCrossingDescription) {
-		this.thresholdCrossingDescription = thresholdCrossingDescription;
-	}
-
-	public CrossedThresholdInformation threshold(ThresholdRef threshold) {
-		this.threshold = threshold;
-		return this;
-	}
-
-	/**
-	 * Get threshold
-	 * 
-	 * @return threshold
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ThresholdRef getThreshold() {
-		return threshold;
-	}
-
-	public void setThreshold(ThresholdRef threshold) {
-		this.threshold = threshold;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CrossedThresholdInformation crossedThresholdInformation = (CrossedThresholdInformation) o;
-		return Objects.equals(this.direction, crossedThresholdInformation.direction)
-				&& Objects.equals(this.granularity, crossedThresholdInformation.granularity)
-				&& Objects.equals(this.indicatorName, crossedThresholdInformation.indicatorName)
-				&& Objects.equals(this.indicatorUnit, crossedThresholdInformation.indicatorUnit)
-				&& Objects.equals(this.observedValue, crossedThresholdInformation.observedValue)
-				&& Objects.equals(this.thresholdCrossingDescription,
-						crossedThresholdInformation.thresholdCrossingDescription)
-				&& Objects.equals(this.threshold, crossedThresholdInformation.threshold)
-				&& Objects.equals(this.baseType, crossedThresholdInformation.baseType)
-				&& Objects.equals(this.schemaLocation, crossedThresholdInformation.schemaLocation)
-				&& Objects.equals(this.type, crossedThresholdInformation.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(direction, granularity, indicatorName, indicatorUnit, observedValue, thresholdCrossingDescription, threshold, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CrossedThresholdInformation {\n");
-
-		sb.append("    direction: ").append(toIndentedString(direction)).append("\n");
-		sb.append("    granularity: ").append(toIndentedString(granularity)).append("\n");
-		sb.append("    indicatorName: ").append(toIndentedString(indicatorName)).append("\n");
-		sb.append("    indicatorUnit: ").append(toIndentedString(indicatorUnit)).append("\n");
-		sb.append("    observedValue: ").append(toIndentedString(observedValue)).append("\n");
-		sb.append("    thresholdCrossingDescription: ").append(toIndentedString(thresholdCrossingDescription))
-				.append("\n");
-		sb.append("    threshold: ").append(toIndentedString(threshold)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/am642/model/EntityRef.java
deleted file mode 100644
index 021709a0fb15cc0d3d569a7969415d23984573e6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/EntityRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this._atReferredType, entityRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/Error.java b/src/main/java/org/etsi/osl/tmf/am642/model/Error.java
deleted file mode 100644
index 5489f488a8605ab0863cca941d5da13d35a1c107..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/Error.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscription.java
deleted file mode 100644
index a0831c27812cf3d66c70fda312f16dc541dab40a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscription.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscriptionInput.java
deleted file mode 100644
index db7a12bad6e85e32a73fc5dc51bd4e9c28e84e03..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarms.java
deleted file mode 100644
index 6cafa82c101272e5c2ac568060707b2a561bf18a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarms.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for group alarms operation
- */
-@Schema(description = "Task resource for group alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMGroupAlarms")
-@Table(name = "AMGroupAlarms")
-public class GroupAlarms  extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-
-	private OffsetDateTime alarmChangedTime = null;
-
-	@JsonProperty("sourceSystemId")
-	private String sourceSystemId = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("correlatedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> correlatedAlarm  =  new HashSet<>();
-
-	@JsonProperty("groupedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> groupedAlarm =   new HashSet<>();
-
-	@JsonProperty("parentAlarm")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private AlarmRefOrValue parentAlarm = null;
-
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-	
-	
-
-	public GroupAlarms alarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-		return this;
-	}
-
-	/**
-	 * Time of the correlation
-	 * 
-	 * @return alarmChangedTime
-	 **/
-	@Schema(description = "Time of the correlation")
-
-	@Valid
-	public OffsetDateTime getAlarmChangedTime() {
-		return alarmChangedTime;
-	}
-
-	public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-	}
-
-	@JsonProperty("alarmChangedTime")
-	public String getAlarmChangedTimeStr() {
-		if (this.alarmChangedTime != null) {
-			return this.alarmChangedTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public GroupAlarms sourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-		return this;
-	}
-
-	/**
-	 * Source system identifier
-	 * 
-	 * @return sourceSystemId
-	 **/
-	@Schema(description = "Source system identifier")
-
-	public String getSourceSystemId() {
-		return sourceSystemId;
-	}
-
-	public void setSourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-	}
-
-	public GroupAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public GroupAlarms correlatedAlarm(Set<AlarmRefOrValue> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-		return this;
-	}
-
-	public GroupAlarms addCorrelatedAlarmItem(AlarmRefOrValue correlatedAlarmItem) {
-		if (this.correlatedAlarm == null) {
-			this.correlatedAlarm = new HashSet<>();
-		}
-		this.correlatedAlarm.add(correlatedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Correlated alarms
-	 * 
-	 * @return correlatedAlarm
-	 **/
-	@Schema(description = "Correlated alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getCorrelatedAlarm() {
-		return correlatedAlarm;
-	}
-
-	public void setCorrelatedAlarm(Set<AlarmRefOrValue> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-	}
-
-	public GroupAlarms groupedAlarm(Set<AlarmRefOrValue> groupedAlarm) {
-		this.groupedAlarm = groupedAlarm;
-		return this;
-	}
-
-	public GroupAlarms addGroupedAlarmItem(AlarmRefOrValue groupedAlarmItem) {
-		if (this.groupedAlarm == null) {
-			this.groupedAlarm = new HashSet<>();
-		}
-		this.groupedAlarm.add(groupedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully correlated alarms
-	 * 
-	 * @return groupedAlarm
-	 **/
-	@Schema(description = "The successfully correlated alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getGroupedAlarm() {
-		return groupedAlarm;
-	}
-
-	public void setGroupedAlarm(Set<AlarmRefOrValue> groupedAlarm) {
-		this.groupedAlarm = groupedAlarm;
-	}
-
-	public GroupAlarms parentAlarm(AlarmRefOrValue parentAlarm) {
-		this.parentAlarm = parentAlarm;
-		return this;
-	}
-
-	/**
-	 * Get parentAlarm
-	 * 
-	 * @return parentAlarm
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AlarmRefOrValue getParentAlarm() {
-		return parentAlarm;
-	}
-
-	public void setParentAlarm(AlarmRefOrValue parentAlarm) {
-		this.parentAlarm = parentAlarm;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		GroupAlarms groupAlarms = (GroupAlarms) o;
-		return Objects.equals(this.id, groupAlarms.id) && Objects.equals(this.href, groupAlarms.href)
-				&& Objects.equals(this.alarmChangedTime, groupAlarms.alarmChangedTime)
-				&& Objects.equals(this.sourceSystemId, groupAlarms.sourceSystemId)
-				&& Objects.equals(this.state, groupAlarms.state)
-				&& Objects.equals(this.correlatedAlarm, groupAlarms.correlatedAlarm)
-				&& Objects.equals(this.groupedAlarm, groupAlarms.groupedAlarm)
-				&& Objects.equals(this.parentAlarm, groupAlarms.parentAlarm)
-				&& Objects.equals(this.baseType, groupAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, groupAlarms.schemaLocation)
-				&& Objects.equals(this.type, groupAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, alarmChangedTime, sourceSystemId, state, correlatedAlarm, groupedAlarm,
-				parentAlarm, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class GroupAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    groupedAlarm: ").append(toIndentedString(groupedAlarm)).append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreate.java
deleted file mode 100644
index 2bf1a62485152b6bfd0f66d4fb8c928aafff72f1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreate.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for group alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for group alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class GroupAlarmsCreate   {
-  @JsonProperty("alarmChangedTime")
-  private OffsetDateTime alarmChangedTime = null;
-
-  @JsonProperty("sourceSystemId")
-  private String sourceSystemId = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("correlatedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> correlatedAlarm = new ArrayList<>();
-
-  @JsonProperty("groupedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> groupedAlarm = null;
-
-  @JsonProperty("parentAlarm")
-  private AlarmRefOrValue parentAlarm = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public GroupAlarmsCreate alarmChangedTime(OffsetDateTime alarmChangedTime) {
-    this.alarmChangedTime = alarmChangedTime;
-    return this;
-  }
-
-  /**
-   * Time of the correlation
-   * @return alarmChangedTime
-  **/
-  @Schema(description = "Time of the correlation")
-      @NotNull
-
-    @Valid
-    public OffsetDateTime getAlarmChangedTime() {
-    return alarmChangedTime;
-  }
-
-  public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-    this.alarmChangedTime = alarmChangedTime;
-  }
-
-  public GroupAlarmsCreate sourceSystemId(String sourceSystemId) {
-    this.sourceSystemId = sourceSystemId;
-    return this;
-  }
-
-  /**
-   * Source system identifier
-   * @return sourceSystemId
-  **/
-  @Schema(description = "Source system identifier")
-      @NotNull
-
-    public String getSourceSystemId() {
-    return sourceSystemId;
-  }
-
-  public void setSourceSystemId(String sourceSystemId) {
-    this.sourceSystemId = sourceSystemId;
-  }
-
-  public GroupAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public GroupAlarmsCreate correlatedAlarm(List<AlarmRefOrValue> correlatedAlarm) {
-    this.correlatedAlarm = correlatedAlarm;
-    return this;
-  }
-
-  public GroupAlarmsCreate addCorrelatedAlarmItem(AlarmRefOrValue correlatedAlarmItem) {
-    this.correlatedAlarm.add(correlatedAlarmItem);
-    return this;
-  }
-
-  /**
-   * Correlated alarms
-   * @return correlatedAlarm
-  **/
-  @Schema(description = "Correlated alarms")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<AlarmRefOrValue> getCorrelatedAlarm() {
-    return correlatedAlarm;
-  }
-
-  public void setCorrelatedAlarm(List<AlarmRefOrValue> correlatedAlarm) {
-    this.correlatedAlarm = correlatedAlarm;
-  }
-
-  public GroupAlarmsCreate groupedAlarm(List<AlarmRefOrValue> groupedAlarm) {
-    this.groupedAlarm = groupedAlarm;
-    return this;
-  }
-
-  public GroupAlarmsCreate addGroupedAlarmItem(AlarmRefOrValue groupedAlarmItem) {
-    if (this.groupedAlarm == null) {
-      this.groupedAlarm = new ArrayList<>();
-    }
-    this.groupedAlarm.add(groupedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully correlated alarms
-   * @return groupedAlarm
-  **/
-  @Schema(description = "The successfully correlated alarms")
-      @Valid
-    public List<AlarmRefOrValue> getGroupedAlarm() {
-    return groupedAlarm;
-  }
-
-  public void setGroupedAlarm(List<AlarmRefOrValue> groupedAlarm) {
-    this.groupedAlarm = groupedAlarm;
-  }
-
-  public GroupAlarmsCreate parentAlarm(AlarmRefOrValue parentAlarm) {
-    this.parentAlarm = parentAlarm;
-    return this;
-  }
-
-  /**
-   * Get parentAlarm
-   * @return parentAlarm
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public AlarmRefOrValue getParentAlarm() {
-    return parentAlarm;
-  }
-
-  public void setParentAlarm(AlarmRefOrValue parentAlarm) {
-    this.parentAlarm = parentAlarm;
-  }
-
-  public GroupAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public GroupAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public GroupAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GroupAlarmsCreate groupAlarmsCreate = (GroupAlarmsCreate) o;
-    return Objects.equals(this.alarmChangedTime, groupAlarmsCreate.alarmChangedTime) &&
-        Objects.equals(this.sourceSystemId, groupAlarmsCreate.sourceSystemId) &&
-        Objects.equals(this.state, groupAlarmsCreate.state) &&
-        Objects.equals(this.correlatedAlarm, groupAlarmsCreate.correlatedAlarm) &&
-        Objects.equals(this.groupedAlarm, groupAlarmsCreate.groupedAlarm) &&
-        Objects.equals(this.parentAlarm, groupAlarmsCreate.parentAlarm) &&
-        Objects.equals(this.baseType, groupAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, groupAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, groupAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarmChangedTime, sourceSystemId, state, correlatedAlarm, groupedAlarm, parentAlarm, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GroupAlarmsCreate {\n");
-    
-    sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-    sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-    sb.append("    groupedAlarm: ").append(toIndentedString(groupedAlarm)).append("\n");
-    sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEvent.java
deleted file mode 100644
index 254c1d23c813bf64ecaa63c268c90be8826a1050..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class GroupAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private GroupAlarmsCreateEventPayload event = null;
-
-  public GroupAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public GroupAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public GroupAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public GroupAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public GroupAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public GroupAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public GroupAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public GroupAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public GroupAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public GroupAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public GroupAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public GroupAlarmsCreateEvent event(GroupAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public GroupAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(GroupAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GroupAlarmsCreateEvent groupAlarmsCreateEvent = (GroupAlarmsCreateEvent) o;
-    return Objects.equals(this.id, groupAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, groupAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, groupAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, groupAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, groupAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, groupAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, groupAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, groupAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, groupAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, groupAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, groupAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, groupAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GroupAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEventPayload.java
deleted file mode 100644
index d8675982c271a140013747684aa3f3377c430ef2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class GroupAlarmsCreateEventPayload   {
-  @JsonProperty("groupAlarms")
-  private GroupAlarms groupAlarms = null;
-
-  public GroupAlarmsCreateEventPayload groupAlarms(GroupAlarms groupAlarms) {
-    this.groupAlarms = groupAlarms;
-    return this;
-  }
-
-  /**
-   * Get groupAlarms
-   * @return groupAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public GroupAlarms getGroupAlarms() {
-    return groupAlarms;
-  }
-
-  public void setGroupAlarms(GroupAlarms groupAlarms) {
-    this.groupAlarms = groupAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GroupAlarmsCreateEventPayload groupAlarmsCreateEventPayload = (GroupAlarmsCreateEventPayload) o;
-    return Objects.equals(this.groupAlarms, groupAlarmsCreateEventPayload.groupAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(groupAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GroupAlarmsCreateEventPayload {\n");
-    
-    sb.append("    groupAlarms: ").append(toIndentedString(groupAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEvent.java
deleted file mode 100644
index bb94460559faaef3ff7aba27f2a586ed4f41ab52..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class GroupAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private GroupAlarmsStateChangeEventPayload event = null;
-
-  public GroupAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public GroupAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public GroupAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public GroupAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public GroupAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public GroupAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public GroupAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public GroupAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public GroupAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public GroupAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public GroupAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public GroupAlarmsStateChangeEvent event(GroupAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public GroupAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(GroupAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GroupAlarmsStateChangeEvent groupAlarmsStateChangeEvent = (GroupAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, groupAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, groupAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, groupAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, groupAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, groupAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, groupAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, groupAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, groupAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, groupAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, groupAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, groupAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, groupAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GroupAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEventPayload.java
deleted file mode 100644
index a53e42eebca19e9ee235335f79b955856c2e7566..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/GroupAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class GroupAlarmsStateChangeEventPayload   {
-  @JsonProperty("groupAlarms")
-  private GroupAlarms groupAlarms = null;
-
-  public GroupAlarmsStateChangeEventPayload groupAlarms(GroupAlarms groupAlarms) {
-    this.groupAlarms = groupAlarms;
-    return this;
-  }
-
-  /**
-   * Get groupAlarms
-   * @return groupAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public GroupAlarms getGroupAlarms() {
-    return groupAlarms;
-  }
-
-  public void setGroupAlarms(GroupAlarms groupAlarms) {
-    this.groupAlarms = groupAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GroupAlarmsStateChangeEventPayload groupAlarmsStateChangeEventPayload = (GroupAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.groupAlarms, groupAlarmsStateChangeEventPayload.groupAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(groupAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GroupAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    groupAlarms: ").append(toIndentedString(groupAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/PerceivedSeverityType.java b/src/main/java/org/etsi/osl/tmf/am642/model/PerceivedSeverityType.java
deleted file mode 100644
index f3d1dcbc5f1521b83ae126c5f91e3bebcd3d2699..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/PerceivedSeverityType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-public enum PerceivedSeverityType {
-	
-	critical,
-	major,
-	minor,
-	warning,
-	indeterminate,
-	cleared;
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/Place.java b/src/main/java/org/etsi/osl/tmf/am642/model/Place.java
deleted file mode 100644
index 70688c1d6448a3d17e22462f380cf468ac4c767e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/Place.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Place reference. Place defines the places where the products are sold or delivered.
- */
-@Schema(description = "Place reference. Place defines the places where the products are sold or delivered.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class Place   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Place id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Place href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the place
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the place")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Place name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]
-   * @return name
-  **/
-  @Schema(description = "A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Place baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Place schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Place type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Place place = (Place) o;
-    return Objects.equals(this.id, place.id) &&
-        Objects.equals(this.href, place.href) &&
-        Objects.equals(this.name, place.name) &&
-        Objects.equals(this.baseType, place.baseType) &&
-        Objects.equals(this.schemaLocation, place.schemaLocation) &&
-        Objects.equals(this.type, place.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Place {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ProbableCauseType.java b/src/main/java/org/etsi/osl/tmf/am642/model/ProbableCauseType.java
deleted file mode 100644
index 8cdf8b073acf343b6d676dbc535686373e15f8b9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ProbableCauseType.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-public enum ProbableCauseType {
-	abisBtsInterfaceFailure,
-	abisTrxInterfaceFailure,
-	adapterError,
-	airCompressorFailure,
-	airConditioningFailure,
-	airDryerFailure,
-	ais,
-	antennaFailure,
-	applicationSubsystemFailure,
-	authenticationFailure,
-	backplaneFailure,
-	bandwidthReduced,
-	batteryBreakdown,
-	batteryChargingFailure,
-	batteryDischarging,
-	batteryFailure,
-	breachOfConfidentiality,
-	broadcastChannelFailure,
-	cableTamper,
-	callEstablishmentError,
-	callSetUpFailure,
-	clockSynchronizationProblem,
-	combinerProblem,
-	commercialPowerFailure,
-	communicationsProtocolError,
-	communicationsSubsystemFailure,
-	configurationOrCustomizationError,
-	congestion,
-	connectionEstablishmentError,
-	coolingFanFailure,
-	coolingSystemFailure,
-	corruptData,
-	cpuCyclesLimitExceeded,
-	dataSetOrModemError,
-	databaseInconsistency,
-	degradedSignal,
-	delayedInformation,
-	demodulationFailure,
-	denialOfService,
-	diskFailure,
-	duplicateInformation,
-	enclosureDoorOpen,
-	engineFailure,
-	equipmentFailure,
-	equipmentIdentifierDuplication,
-	excessiveBitErrorRate,
-	excessiveReceiverTemperature,
-	excessiveResponseTime,
-	excessiveRetransmissionRate,
-	excessiveTransmitterOutputPower,
-	excessiveTransmitterTemperature,
-	excessiveVibration,
-	explosiveGas,
-	externalEquipmentFailure,
-	externalIfDeviceProblem,
-	externalPointFailure,
-	externalPowerSupplyFailure,
-	externalTransmissionDeviceFailure,
-	farEndReceiverFailure,
-	fileError,
-	fileSystemCallUnsuccessful,
-	fire,
-	fireDetectorFailure,
-	flood,
-	framingError,
-	frequencyHoppingDegraded,
-	frequencyHoppingFailure,
-	frequencyRedefinitionFailed,
-	fuseFailure,
-	generatorFailure,
-	heatingVentCoolingSystemProblem,
-	highHumidity,
-	highTemperature,
-	highWind,
-	humidityUnacceptable,
-	iceBuildUp,
-	informationMissing,
-	informationModificationDetected,
-	informationOutOfSequence,
-	inputDeviceError,
-	inputOutputDeviceError,
-	inputParameterOutOfRange,
-	intrusionDetection,
-	invalidMessageReceived,
-	invalidParameter,
-	invalidPointer,
-	ioDeviceError,
-	keyExpired,
-	lanError,
-	lapdLinkProtocolFailure,
-	leakDetected,
-	lineCardProblem,
-	lineInterfaceFailure,
-	linkFailure,
-	localAlarmIndication,
-	localNodeTransmissionError,
-	lossOfFrame,
-	lossOfMultiFrame,
-	lossOfPointer,
-	lossOfRealTime,
-	lossOfRedundancy,
-	lossOfSignal,
-	lossOfSynchronisation,
-	lowBatteryThreshold,
-	lowCablePressure,
-	lowFuel,
-	lowHumidity,
-	lowTemperatue,
-	lowWater,
-	mainsBreakdownWithBatteryBackUp,
-	mainsBreakdownWithoutBatteryBackUp,
-	materialSupplyExhausted,
-	memoryMismatch,
-	messageNotExpected,
-	messageNotInitialized,
-	messageOutOfSequence,
-	modulationFailure,
-	multiplexerProblem,
-	neIdentifierDuplication,
-	nonRepudiationFailure,
-	other,
-	ouputDeviceError,
-	outOfCpuCycles,
-	outOfHoursActivity,
-	outOfMemory,
-	outOfService,
-	pathTraceMismatch,
-	payloadTypeMismatch,
-	performanceDegraded,
-	powerProblems,
-	powerSupplyFailure,
-	pressureUnacceptable,
-	proceduralError,
-	processorProblem,
-	protectingResourceFailure,
-	protectionMechanismFailure,
-	protectionPathFailure,
-	pumpFailure,
-	queueSizeExceeded,
-	realTimeClockFailure,
-	receiveFailure,
-	receiverAntennaFault,
-	receiverFailure,
-	receiverMulticouplerFailure,
-	rectifierFailure,
-	rectifierHighVoltage,
-	rectifierLowVoltage,
-	reducedAlarmReporting,
-	reducedEventReporting,
-	reducedLoggingCapability,
-	reducedTransmitterOutputPower,
-	reinitialized,
-	remoteAlarmIndication,
-	remoteAlarmInterface,
-	remoteNodeTransmissionError,
-	replaceableUnitMissing,
-	replaceableUnitProblem,
-	replaceableUnitTypeMismatch,
-	resourceAtOrNearingCapacity,
-	responseTimeExecessive,
-	retransmissionRateExcessive,
-	routingFailure,
-	signalLabelMismatch,
-	signalQualityEvaluationFailure,
-	smoke,
-	softwareDownloadFailure,
-	softwareEnvironmentProblem,
-	softwareError,
-	softwareProgramAbnormallyTerminated,
-	softwareProgramError,
-	ss7ProtocolFailure,
-	storageCapacityProblem,
-	synchronizationSourceMismatch,
-	systemCallUnsuccessful,
-	systemResourcesOverload,
-	temperatureUnacceptable,
-	terminalProblem,
-	thresholdCrossed,
-	timeoutExpired,
-	timeslotHardwareFailure,
-	timingProblem,
-	toxicGas,
-	toxicLeakDetected,
-	transceiverFailure,
-	transcoderOrRateAdapterProblem,
-	transcoderProblem,
-	transmissionError,
-	transmitFailure,
-	transmiterFailure,
-	transmitterAntennaFailure,
-	transmitterAntennaNotAdjusted,
-	transmitterFailure,
-	transmitterLowVoltageOrCurrent,
-	transmitterOffFrequency,
-	trunkCardProblem,
-	unauthorizedAccessAttempt,
-	unavailable,
-	underlyingResourceUnavailable,
-	unexpectedInformation,
-	variableOutOfRange,
-	ventilationsSystemFailure,
-	versionMismatch,
-	watchdogTimerExpired
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/RelatedPlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/am642/model/RelatedPlaceRefOrValue.java
deleted file mode 100644
index 5ff3ac4d9dd4cad3dfcf96a3dda05919f540d3c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/RelatedPlaceRefOrValue.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Related Entity reference. A related place defines a place described by
- * reference or by value linked to a specific entity. The polymorphic
- * attributes @type, @schemaLocation &amp; @referredType are related to the
- * place entity and not the RelatedPlaceRefOrValue class itself
- */
-@Schema(description = "Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation & @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMRelPlaceRefOrVal")
-@Table(name = "AMRelPlaceRefOrVal")
-public class RelatedPlaceRefOrValue extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-
-	@JsonProperty("role")
-	private String role = null;
-
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public RelatedPlaceRefOrValue href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	
-
-	public RelatedPlaceRefOrValue role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * Get role
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "")
-	@NotNull
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-
-
-	public RelatedPlaceRefOrValue _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		RelatedPlaceRefOrValue relatedPlaceRefOrValue = (RelatedPlaceRefOrValue) o;
-		return Objects.equals(this.id, relatedPlaceRefOrValue.id)
-				&& Objects.equals(this.href, relatedPlaceRefOrValue.href)
-				&& Objects.equals(this.name, relatedPlaceRefOrValue.name)
-				&& Objects.equals(this.role, relatedPlaceRefOrValue.role)
-				&& Objects.equals(this.baseType, relatedPlaceRefOrValue.baseType)
-				&& Objects.equals(this.schemaLocation, relatedPlaceRefOrValue.schemaLocation)
-				&& Objects.equals(this.type, relatedPlaceRefOrValue.type)
-				&& Objects.equals(this._atReferredType, relatedPlaceRefOrValue._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, role, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class RelatedPlaceRefOrValue {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/ThresholdRef.java b/src/main/java/org/etsi/osl/tmf/am642/model/ThresholdRef.java
deleted file mode 100644
index 49cd7050ab13d61200a8acfdb4f48285f6ae26a1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/ThresholdRef.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * ThresholdRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMThresholdRef")
-@Table(name = "AMThresholdRef")
-public class ThresholdRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	
-
-	public ThresholdRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ThresholdRef thresholdRef = (ThresholdRef) o;
-		return Objects.equals(this.id, thresholdRef.id) && Objects.equals(this.href, thresholdRef.href)
-				&& Objects.equals(this.name, thresholdRef.name)
-				&& Objects.equals(this.baseType, thresholdRef.baseType)
-				&& Objects.equals(this.schemaLocation, thresholdRef.schemaLocation)
-				&& Objects.equals(this.type, thresholdRef.type)
-				&& Objects.equals(this._atReferredType, thresholdRef._atReferredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ThresholdRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarms.java
deleted file mode 100644
index e5c452dcd099f3d442aea7e39da51f2872f1ad59..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarms.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for unacknowledge alarms operation
- */
-@Schema(description = "Task resource for unacknowledge alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMUnAckAlarms")
-@Table(name = "AMUnAckAlarms")
-public class UnAckAlarms extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("ackSystemId")
-	private String ackSystemId = null;
-
-	private OffsetDateTime ackTime = null;
-
-	@JsonProperty("ackUserId")
-	private String ackUserId = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("alarmPattern")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Alarm> alarmPattern = new HashSet<>();
-
-	@JsonProperty("unAckedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> unAckedAlarm = new HashSet<>();
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public UnAckAlarms href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A reference to the task
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A reference to the task")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public UnAckAlarms ackSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-		return this;
-	}
-
-	/**
-	 * Name of the unacknowledging system
-	 * 
-	 * @return ackSystemId
-	 **/
-	@Schema(description = "Name of the unacknowledging system")
-
-	public String getAckSystemId() {
-		return ackSystemId;
-	}
-
-	public void setAckSystemId(String ackSystemId) {
-		this.ackSystemId = ackSystemId;
-	}
-
-	public UnAckAlarms ackTime(OffsetDateTime ackTime) {
-		this.ackTime = ackTime;
-		return this;
-	}
-
-	/**
-	 * Time of the unacknowledgement
-	 * 
-	 * @return ackTime
-	 **/
-	@Schema(description = "Time of the unacknowledgement")
-
-	@Valid
-	public OffsetDateTime getAckTime() {
-		return ackTime;
-	}
-
-	public void setAckTime(OffsetDateTime ackTime) {
-		this.ackTime = ackTime;
-	}
-
-	@JsonProperty("ackTime")
-	public String getAckTimeStr() {
-		if (this.ackTime != null) {
-			return this.ackTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public UnAckAlarms ackUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-		return this;
-	}
-
-	/**
-	 * Name of the unacknowledging user
-	 * 
-	 * @return ackUserId
-	 **/
-	@Schema(description = "Name of the unacknowledging user")
-
-	public String getAckUserId() {
-		return ackUserId;
-	}
-
-	public void setAckUserId(String ackUserId) {
-		this.ackUserId = ackUserId;
-	}
-
-	public UnAckAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public UnAckAlarms alarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-		return this;
-	}
-
-	public UnAckAlarms addAlarmPatternItem(Alarm alarmPatternItem) {
-		if (this.alarmPattern == null) {
-			this.alarmPattern = new HashSet<>();
-		}
-		this.alarmPattern.add(alarmPatternItem);
-		return this;
-	}
-
-	/**
-	 * Alarm patterns to match target alarms. An alarm will match if all of the
-	 * sttributes in any of the patterns compare equal to those attributes of the
-	 * alarm.
-	 * 
-	 * @return alarmPattern
-	 **/
-	@Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-	@Valid
-	public Set<Alarm> getAlarmPattern() {
-		return alarmPattern;
-	}
-
-	public void setAlarmPattern(Set<Alarm> alarmPattern) {
-		this.alarmPattern = alarmPattern;
-	}
-
-	public UnAckAlarms unAckedAlarm(Set<AlarmRefOrValue> unAckedAlarm) {
-		this.unAckedAlarm = unAckedAlarm;
-		return this;
-	}
-
-	public UnAckAlarms addUnAckedAlarmItem(AlarmRefOrValue unAckedAlarmItem) {
-		if (this.unAckedAlarm == null) {
-			this.unAckedAlarm = new HashSet<>();
-		}
-		this.unAckedAlarm.add(unAckedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully unacknowledged alarms
-	 * 
-	 * @return unAckedAlarm
-	 **/
-	@Schema(description = "The successfully unacknowledged alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getUnAckedAlarm() {
-		return unAckedAlarm;
-	}
-
-	public void setUnAckedAlarm(Set<AlarmRefOrValue> unAckedAlarm) {
-		this.unAckedAlarm = unAckedAlarm;
-	}
-
-	public UnAckAlarms baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public UnAckAlarms schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public UnAckAlarms type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		UnAckAlarms unAckAlarms = (UnAckAlarms) o;
-		return Objects.equals(this.id, unAckAlarms.id) && Objects.equals(this.href, unAckAlarms.href)
-				&& Objects.equals(this.ackSystemId, unAckAlarms.ackSystemId)
-				&& Objects.equals(this.ackTime, unAckAlarms.ackTime)
-				&& Objects.equals(this.ackUserId, unAckAlarms.ackUserId)
-				&& Objects.equals(this.state, unAckAlarms.state)
-				&& Objects.equals(this.alarmPattern, unAckAlarms.alarmPattern)
-				&& Objects.equals(this.unAckedAlarm, unAckAlarms.unAckedAlarm)
-				&& Objects.equals(this.baseType, unAckAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, unAckAlarms.schemaLocation)
-				&& Objects.equals(this.type, unAckAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, ackSystemId, ackTime, ackUserId, state, alarmPattern, unAckedAlarm, baseType,
-				schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class UnAckAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-		sb.append("    ackTime: ").append(toIndentedString(ackTime)).append("\n");
-		sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-		sb.append("    unAckedAlarm: ").append(toIndentedString(unAckedAlarm)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreate.java
deleted file mode 100644
index 22a89b76e6cbf0baeae0121ebf07605b289d9fdc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreate.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for unacknowledge alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for unacknowledge alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnAckAlarmsCreate   {
-  @JsonProperty("ackSystemId")
-  private String ackSystemId = null;
-
-  @JsonProperty("ackTime")
-  private OffsetDateTime ackTime = null;
-
-  @JsonProperty("ackUserId")
-  private String ackUserId = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("alarmPattern")
-  @Valid
-  private List<Alarm> alarmPattern = new ArrayList<>();
-
-  @JsonProperty("unAckedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> unAckedAlarm = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public UnAckAlarmsCreate ackSystemId(String ackSystemId) {
-    this.ackSystemId = ackSystemId;
-    return this;
-  }
-
-  /**
-   * Name of the unacknowledging system
-   * @return ackSystemId
-  **/
-  @Schema(description = "Name of the unacknowledging system")
-      @NotNull
-
-    public String getAckSystemId() {
-    return ackSystemId;
-  }
-
-  public void setAckSystemId(String ackSystemId) {
-    this.ackSystemId = ackSystemId;
-  }
-
-  public UnAckAlarmsCreate ackTime(OffsetDateTime ackTime) {
-    this.ackTime = ackTime;
-    return this;
-  }
-
-  /**
-   * Time of the unacknowledgement
-   * @return ackTime
-  **/
-  @Schema(description = "Time of the unacknowledgement")
-  
-    @Valid
-    public OffsetDateTime getAckTime() {
-    return ackTime;
-  }
-
-  public void setAckTime(OffsetDateTime ackTime) {
-    this.ackTime = ackTime;
-  }
-
-  public UnAckAlarmsCreate ackUserId(String ackUserId) {
-    this.ackUserId = ackUserId;
-    return this;
-  }
-
-  /**
-   * Name of the unacknowledging user
-   * @return ackUserId
-  **/
-  @Schema(description = "Name of the unacknowledging user")
-      @NotNull
-
-    public String getAckUserId() {
-    return ackUserId;
-  }
-
-  public void setAckUserId(String ackUserId) {
-    this.ackUserId = ackUserId;
-  }
-
-  public UnAckAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public UnAckAlarmsCreate alarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-    return this;
-  }
-
-  public UnAckAlarmsCreate addAlarmPatternItem(Alarm alarmPatternItem) {
-    this.alarmPattern.add(alarmPatternItem);
-    return this;
-  }
-
-  /**
-   * Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.
-   * @return alarmPattern
-  **/
-  @Schema(description = "Alarm patterns to match target alarms. An alarm will match if all of the sttributes in any of the patterns compare equal to those attributes of the alarm.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<Alarm> getAlarmPattern() {
-    return alarmPattern;
-  }
-
-  public void setAlarmPattern(List<Alarm> alarmPattern) {
-    this.alarmPattern = alarmPattern;
-  }
-
-  public UnAckAlarmsCreate unAckedAlarm(List<AlarmRefOrValue> unAckedAlarm) {
-    this.unAckedAlarm = unAckedAlarm;
-    return this;
-  }
-
-  public UnAckAlarmsCreate addUnAckedAlarmItem(AlarmRefOrValue unAckedAlarmItem) {
-    if (this.unAckedAlarm == null) {
-      this.unAckedAlarm = new ArrayList<>();
-    }
-    this.unAckedAlarm.add(unAckedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully unacknowledged alarms
-   * @return unAckedAlarm
-  **/
-  @Schema(description = "The successfully unacknowledged alarms")
-      @Valid
-    public List<AlarmRefOrValue> getUnAckedAlarm() {
-    return unAckedAlarm;
-  }
-
-  public void setUnAckedAlarm(List<AlarmRefOrValue> unAckedAlarm) {
-    this.unAckedAlarm = unAckedAlarm;
-  }
-
-  public UnAckAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public UnAckAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public UnAckAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnAckAlarmsCreate unAckAlarmsCreate = (UnAckAlarmsCreate) o;
-    return Objects.equals(this.ackSystemId, unAckAlarmsCreate.ackSystemId) &&
-        Objects.equals(this.ackTime, unAckAlarmsCreate.ackTime) &&
-        Objects.equals(this.ackUserId, unAckAlarmsCreate.ackUserId) &&
-        Objects.equals(this.state, unAckAlarmsCreate.state) &&
-        Objects.equals(this.alarmPattern, unAckAlarmsCreate.alarmPattern) &&
-        Objects.equals(this.unAckedAlarm, unAckAlarmsCreate.unAckedAlarm) &&
-        Objects.equals(this.baseType, unAckAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, unAckAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, unAckAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(ackSystemId, ackTime, ackUserId, state, alarmPattern, unAckedAlarm, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnAckAlarmsCreate {\n");
-    
-    sb.append("    ackSystemId: ").append(toIndentedString(ackSystemId)).append("\n");
-    sb.append("    ackTime: ").append(toIndentedString(ackTime)).append("\n");
-    sb.append("    ackUserId: ").append(toIndentedString(ackUserId)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    alarmPattern: ").append(toIndentedString(alarmPattern)).append("\n");
-    sb.append("    unAckedAlarm: ").append(toIndentedString(unAckedAlarm)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEvent.java
deleted file mode 100644
index 05f6f3a01217c442d4dfcf2661a56e9191992abe..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnAckAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private UnAckAlarmsCreateEventPayload event = null;
-
-  public UnAckAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public UnAckAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public UnAckAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public UnAckAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public UnAckAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public UnAckAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public UnAckAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public UnAckAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public UnAckAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public UnAckAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public UnAckAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public UnAckAlarmsCreateEvent event(UnAckAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnAckAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(UnAckAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnAckAlarmsCreateEvent unAckAlarmsCreateEvent = (UnAckAlarmsCreateEvent) o;
-    return Objects.equals(this.id, unAckAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, unAckAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, unAckAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, unAckAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, unAckAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, unAckAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, unAckAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, unAckAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, unAckAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, unAckAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, unAckAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, unAckAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnAckAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEventPayload.java
deleted file mode 100644
index 6bd2eab4ff59b6f564e3b31f2ef348eb3d5aa6ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnAckAlarmsCreateEventPayload   {
-  @JsonProperty("unAckAlarms")
-  private UnAckAlarms unAckAlarms = null;
-
-  public UnAckAlarmsCreateEventPayload unAckAlarms(UnAckAlarms unAckAlarms) {
-    this.unAckAlarms = unAckAlarms;
-    return this;
-  }
-
-  /**
-   * Get unAckAlarms
-   * @return unAckAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnAckAlarms getUnAckAlarms() {
-    return unAckAlarms;
-  }
-
-  public void setUnAckAlarms(UnAckAlarms unAckAlarms) {
-    this.unAckAlarms = unAckAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnAckAlarmsCreateEventPayload unAckAlarmsCreateEventPayload = (UnAckAlarmsCreateEventPayload) o;
-    return Objects.equals(this.unAckAlarms, unAckAlarmsCreateEventPayload.unAckAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unAckAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnAckAlarmsCreateEventPayload {\n");
-    
-    sb.append("    unAckAlarms: ").append(toIndentedString(unAckAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEvent.java
deleted file mode 100644
index 2b9a83b630359572909cd396ead54c1c63e304a2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnAckAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private UnAckAlarmsStateChangeEventPayload event = null;
-
-  public UnAckAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public UnAckAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public UnAckAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public UnAckAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public UnAckAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public UnAckAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public UnAckAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public UnAckAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public UnAckAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public UnAckAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public UnAckAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public UnAckAlarmsStateChangeEvent event(UnAckAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnAckAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(UnAckAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnAckAlarmsStateChangeEvent unAckAlarmsStateChangeEvent = (UnAckAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, unAckAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, unAckAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, unAckAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, unAckAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, unAckAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, unAckAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, unAckAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, unAckAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, unAckAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, unAckAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, unAckAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, unAckAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnAckAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEventPayload.java
deleted file mode 100644
index 13707f0cbe8e81b95de14bc42c9a7d7d10d61b1c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnAckAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnAckAlarmsStateChangeEventPayload   {
-  @JsonProperty("unAckAlarms")
-  private UnAckAlarms unAckAlarms = null;
-
-  public UnAckAlarmsStateChangeEventPayload unAckAlarms(UnAckAlarms unAckAlarms) {
-    this.unAckAlarms = unAckAlarms;
-    return this;
-  }
-
-  /**
-   * Get unAckAlarms
-   * @return unAckAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnAckAlarms getUnAckAlarms() {
-    return unAckAlarms;
-  }
-
-  public void setUnAckAlarms(UnAckAlarms unAckAlarms) {
-    this.unAckAlarms = unAckAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnAckAlarmsStateChangeEventPayload unAckAlarmsStateChangeEventPayload = (UnAckAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.unAckAlarms, unAckAlarmsStateChangeEventPayload.unAckAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unAckAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnAckAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    unAckAlarms: ").append(toIndentedString(unAckAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarms.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarms.java
deleted file mode 100644
index db69028d9de52e67eb841178c79e7fc784588eec..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarms.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Task resource for ungroup alarms operation
- */
-@Schema(description = "Task resource for ungroup alarms operation")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-@Entity(name = "AMUnGroupAlarms")
-@Table(name = "AMUnGroupAlarms")
-public class UnGroupAlarms extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("alarmChangedTime")
-	private OffsetDateTime alarmChangedTime = null;
-
-	@JsonProperty("sourceSystemId")
-	private String sourceSystemId = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("correlatedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> correlatedAlarm = null;
-
-	@JsonProperty("parentAlarm")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private AlarmRefOrValue parentAlarm = null;
-
-	@JsonProperty("unGroupedAlarm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AlarmRefOrValue> unGroupedAlarm = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public UnGroupAlarms href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A reference to the task
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A reference to the task")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public UnGroupAlarms alarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-		return this;
-	}
-
-	/**
-	 * Time of the uncorrelation
-	 * 
-	 * @return alarmChangedTime
-	 **/
-	@Schema(description = "Time of the uncorrelation")
-
-	@Valid
-	public OffsetDateTime getAlarmChangedTime() {
-		return alarmChangedTime;
-	}
-
-	public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-		this.alarmChangedTime = alarmChangedTime;
-	}
-
-	public UnGroupAlarms sourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-		return this;
-	}
-
-	/**
-	 * Source system identifier
-	 * 
-	 * @return sourceSystemId
-	 **/
-	@Schema(description = "Source system identifier")
-
-	public String getSourceSystemId() {
-		return sourceSystemId;
-	}
-
-	public void setSourceSystemId(String sourceSystemId) {
-		this.sourceSystemId = sourceSystemId;
-	}
-
-	public UnGroupAlarms state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * Current state of the operation task
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "Current state of the operation task")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public UnGroupAlarms correlatedAlarm(Set<AlarmRefOrValue> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-		return this;
-	}
-
-	public UnGroupAlarms addCorrelatedAlarmItem(AlarmRefOrValue correlatedAlarmItem) {
-		if (this.correlatedAlarm == null) {
-			this.correlatedAlarm = new HashSet<>();
-		}
-		this.correlatedAlarm.add(correlatedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * Correlated alarms
-	 * 
-	 * @return correlatedAlarm
-	 **/
-	@Schema(description = "Correlated alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getCorrelatedAlarm() {
-		return correlatedAlarm;
-	}
-
-	public void setCorrelatedAlarm(Set<AlarmRefOrValue> correlatedAlarm) {
-		this.correlatedAlarm = correlatedAlarm;
-	}
-
-	public UnGroupAlarms parentAlarm(AlarmRefOrValue parentAlarm) {
-		this.parentAlarm = parentAlarm;
-		return this;
-	}
-
-	/**
-	 * Get parentAlarm
-	 * 
-	 * @return parentAlarm
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AlarmRefOrValue getParentAlarm() {
-		return parentAlarm;
-	}
-
-	public void setParentAlarm(AlarmRefOrValue parentAlarm) {
-		this.parentAlarm = parentAlarm;
-	}
-
-	public UnGroupAlarms unGroupedAlarm(Set<AlarmRefOrValue> unGroupedAlarm) {
-		this.unGroupedAlarm = unGroupedAlarm;
-		return this;
-	}
-
-	public UnGroupAlarms addUnGroupedAlarmItem(AlarmRefOrValue unGroupedAlarmItem) {
-		if (this.unGroupedAlarm == null) {
-			this.unGroupedAlarm = new HashSet<>();
-		}
-		this.unGroupedAlarm.add(unGroupedAlarmItem);
-		return this;
-	}
-
-	/**
-	 * The successfully uncorrelated alarms
-	 * 
-	 * @return unGroupedAlarm
-	 **/
-	@Schema(description = "The successfully uncorrelated alarms")
-	@Valid
-	public Set<AlarmRefOrValue> getUnGroupedAlarm() {
-		return unGroupedAlarm;
-	}
-
-	public void setUnGroupedAlarm(Set<AlarmRefOrValue> unGroupedAlarm) {
-		this.unGroupedAlarm = unGroupedAlarm;
-	}
-
-	public UnGroupAlarms baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public UnGroupAlarms schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public UnGroupAlarms type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		UnGroupAlarms unGroupAlarms = (UnGroupAlarms) o;
-		return Objects.equals(this.id, unGroupAlarms.id) && Objects.equals(this.href, unGroupAlarms.href)
-				&& Objects.equals(this.alarmChangedTime, unGroupAlarms.alarmChangedTime)
-				&& Objects.equals(this.sourceSystemId, unGroupAlarms.sourceSystemId)
-				&& Objects.equals(this.state, unGroupAlarms.state)
-				&& Objects.equals(this.correlatedAlarm, unGroupAlarms.correlatedAlarm)
-				&& Objects.equals(this.parentAlarm, unGroupAlarms.parentAlarm)
-				&& Objects.equals(this.unGroupedAlarm, unGroupAlarms.unGroupedAlarm)
-				&& Objects.equals(this.baseType, unGroupAlarms.baseType)
-				&& Objects.equals(this.schemaLocation, unGroupAlarms.schemaLocation)
-				&& Objects.equals(this.type, unGroupAlarms.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, alarmChangedTime, sourceSystemId, state, correlatedAlarm, parentAlarm,
-				unGroupedAlarm, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class UnGroupAlarms {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-		sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-		sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-		sb.append("    unGroupedAlarm: ").append(toIndentedString(unGroupedAlarm)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreate.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreate.java
deleted file mode 100644
index 6415c7169d3717537b890c691edf38b1981f9804..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreate.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Task resource for ungroup alarms operation Skipped properties: id,href
- */
-@Schema(description = "Task resource for ungroup alarms operation Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnGroupAlarmsCreate   {
-  @JsonProperty("alarmChangedTime")
-  private OffsetDateTime alarmChangedTime = null;
-
-  @JsonProperty("sourceSystemId")
-  private String sourceSystemId = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("correlatedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> correlatedAlarm = new ArrayList<>();
-
-  @JsonProperty("parentAlarm")
-  private AlarmRefOrValue parentAlarm = null;
-
-  @JsonProperty("unGroupedAlarm")
-  @Valid
-  private List<AlarmRefOrValue> unGroupedAlarm = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public UnGroupAlarmsCreate alarmChangedTime(OffsetDateTime alarmChangedTime) {
-    this.alarmChangedTime = alarmChangedTime;
-    return this;
-  }
-
-  /**
-   * Time of the uncorrelation
-   * @return alarmChangedTime
-  **/
-  @Schema(description = "Time of the uncorrelation")
-      @NotNull
-
-    @Valid
-    public OffsetDateTime getAlarmChangedTime() {
-    return alarmChangedTime;
-  }
-
-  public void setAlarmChangedTime(OffsetDateTime alarmChangedTime) {
-    this.alarmChangedTime = alarmChangedTime;
-  }
-
-  public UnGroupAlarmsCreate sourceSystemId(String sourceSystemId) {
-    this.sourceSystemId = sourceSystemId;
-    return this;
-  }
-
-  /**
-   * Source system identifier
-   * @return sourceSystemId
-  **/
-  @Schema(description = "Source system identifier")
-      @NotNull
-
-    public String getSourceSystemId() {
-    return sourceSystemId;
-  }
-
-  public void setSourceSystemId(String sourceSystemId) {
-    this.sourceSystemId = sourceSystemId;
-  }
-
-  public UnGroupAlarmsCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current state of the operation task
-   * @return state
-  **/
-  @Schema(description = "Current state of the operation task")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public UnGroupAlarmsCreate correlatedAlarm(List<AlarmRefOrValue> correlatedAlarm) {
-    this.correlatedAlarm = correlatedAlarm;
-    return this;
-  }
-
-  public UnGroupAlarmsCreate addCorrelatedAlarmItem(AlarmRefOrValue correlatedAlarmItem) {
-    this.correlatedAlarm.add(correlatedAlarmItem);
-    return this;
-  }
-
-  /**
-   * Correlated alarms
-   * @return correlatedAlarm
-  **/
-  @Schema(description = "Correlated alarms")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<AlarmRefOrValue> getCorrelatedAlarm() {
-    return correlatedAlarm;
-  }
-
-  public void setCorrelatedAlarm(List<AlarmRefOrValue> correlatedAlarm) {
-    this.correlatedAlarm = correlatedAlarm;
-  }
-
-  public UnGroupAlarmsCreate parentAlarm(AlarmRefOrValue parentAlarm) {
-    this.parentAlarm = parentAlarm;
-    return this;
-  }
-
-  /**
-   * Get parentAlarm
-   * @return parentAlarm
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public AlarmRefOrValue getParentAlarm() {
-    return parentAlarm;
-  }
-
-  public void setParentAlarm(AlarmRefOrValue parentAlarm) {
-    this.parentAlarm = parentAlarm;
-  }
-
-  public UnGroupAlarmsCreate unGroupedAlarm(List<AlarmRefOrValue> unGroupedAlarm) {
-    this.unGroupedAlarm = unGroupedAlarm;
-    return this;
-  }
-
-  public UnGroupAlarmsCreate addUnGroupedAlarmItem(AlarmRefOrValue unGroupedAlarmItem) {
-    if (this.unGroupedAlarm == null) {
-      this.unGroupedAlarm = new ArrayList<>();
-    }
-    this.unGroupedAlarm.add(unGroupedAlarmItem);
-    return this;
-  }
-
-  /**
-   * The successfully uncorrelated alarms
-   * @return unGroupedAlarm
-  **/
-  @Schema(description = "The successfully uncorrelated alarms")
-      @Valid
-    public List<AlarmRefOrValue> getUnGroupedAlarm() {
-    return unGroupedAlarm;
-  }
-
-  public void setUnGroupedAlarm(List<AlarmRefOrValue> unGroupedAlarm) {
-    this.unGroupedAlarm = unGroupedAlarm;
-  }
-
-  public UnGroupAlarmsCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public UnGroupAlarmsCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public UnGroupAlarmsCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnGroupAlarmsCreate unGroupAlarmsCreate = (UnGroupAlarmsCreate) o;
-    return Objects.equals(this.alarmChangedTime, unGroupAlarmsCreate.alarmChangedTime) &&
-        Objects.equals(this.sourceSystemId, unGroupAlarmsCreate.sourceSystemId) &&
-        Objects.equals(this.state, unGroupAlarmsCreate.state) &&
-        Objects.equals(this.correlatedAlarm, unGroupAlarmsCreate.correlatedAlarm) &&
-        Objects.equals(this.parentAlarm, unGroupAlarmsCreate.parentAlarm) &&
-        Objects.equals(this.unGroupedAlarm, unGroupAlarmsCreate.unGroupedAlarm) &&
-        Objects.equals(this.baseType, unGroupAlarmsCreate.baseType) &&
-        Objects.equals(this.schemaLocation, unGroupAlarmsCreate.schemaLocation) &&
-        Objects.equals(this.type, unGroupAlarmsCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(alarmChangedTime, sourceSystemId, state, correlatedAlarm, parentAlarm, unGroupedAlarm, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnGroupAlarmsCreate {\n");
-    
-    sb.append("    alarmChangedTime: ").append(toIndentedString(alarmChangedTime)).append("\n");
-    sb.append("    sourceSystemId: ").append(toIndentedString(sourceSystemId)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    correlatedAlarm: ").append(toIndentedString(correlatedAlarm)).append("\n");
-    sb.append("    parentAlarm: ").append(toIndentedString(parentAlarm)).append("\n");
-    sb.append("    unGroupedAlarm: ").append(toIndentedString(unGroupedAlarm)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEvent.java
deleted file mode 100644
index 6326c234c5f43d5adabb6cd91da56e2260374065..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnGroupAlarmsCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private UnGroupAlarmsCreateEventPayload event = null;
-
-  public UnGroupAlarmsCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public UnGroupAlarmsCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public UnGroupAlarmsCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public UnGroupAlarmsCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public UnGroupAlarmsCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public UnGroupAlarmsCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public UnGroupAlarmsCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public UnGroupAlarmsCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public UnGroupAlarmsCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public UnGroupAlarmsCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public UnGroupAlarmsCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public UnGroupAlarmsCreateEvent event(UnGroupAlarmsCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnGroupAlarmsCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(UnGroupAlarmsCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnGroupAlarmsCreateEvent unGroupAlarmsCreateEvent = (UnGroupAlarmsCreateEvent) o;
-    return Objects.equals(this.id, unGroupAlarmsCreateEvent.id) &&
-        Objects.equals(this.href, unGroupAlarmsCreateEvent.href) &&
-        Objects.equals(this.eventId, unGroupAlarmsCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, unGroupAlarmsCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, unGroupAlarmsCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, unGroupAlarmsCreateEvent.correlationId) &&
-        Objects.equals(this.domain, unGroupAlarmsCreateEvent.domain) &&
-        Objects.equals(this.title, unGroupAlarmsCreateEvent.title) &&
-        Objects.equals(this.description, unGroupAlarmsCreateEvent.description) &&
-        Objects.equals(this.priority, unGroupAlarmsCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, unGroupAlarmsCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, unGroupAlarmsCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnGroupAlarmsCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEventPayload.java
deleted file mode 100644
index 6f217ba113e8feab928cfc2c13653efa4d744091..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnGroupAlarmsCreateEventPayload   {
-  @JsonProperty("unGroupAlarms")
-  private UnGroupAlarms unGroupAlarms = null;
-
-  public UnGroupAlarmsCreateEventPayload unGroupAlarms(UnGroupAlarms unGroupAlarms) {
-    this.unGroupAlarms = unGroupAlarms;
-    return this;
-  }
-
-  /**
-   * Get unGroupAlarms
-   * @return unGroupAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnGroupAlarms getUnGroupAlarms() {
-    return unGroupAlarms;
-  }
-
-  public void setUnGroupAlarms(UnGroupAlarms unGroupAlarms) {
-    this.unGroupAlarms = unGroupAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnGroupAlarmsCreateEventPayload unGroupAlarmsCreateEventPayload = (UnGroupAlarmsCreateEventPayload) o;
-    return Objects.equals(this.unGroupAlarms, unGroupAlarmsCreateEventPayload.unGroupAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unGroupAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnGroupAlarmsCreateEventPayload {\n");
-    
-    sb.append("    unGroupAlarms: ").append(toIndentedString(unGroupAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEvent.java
deleted file mode 100644
index a2039c989184224b5040433d2914f8f029f1b54f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnGroupAlarmsStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private UnGroupAlarmsStateChangeEventPayload event = null;
-
-  public UnGroupAlarmsStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public UnGroupAlarmsStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public UnGroupAlarmsStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public UnGroupAlarmsStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public UnGroupAlarmsStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public UnGroupAlarmsStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public UnGroupAlarmsStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public UnGroupAlarmsStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public UnGroupAlarmsStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public UnGroupAlarmsStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public UnGroupAlarmsStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public UnGroupAlarmsStateChangeEvent event(UnGroupAlarmsStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnGroupAlarmsStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(UnGroupAlarmsStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnGroupAlarmsStateChangeEvent unGroupAlarmsStateChangeEvent = (UnGroupAlarmsStateChangeEvent) o;
-    return Objects.equals(this.id, unGroupAlarmsStateChangeEvent.id) &&
-        Objects.equals(this.href, unGroupAlarmsStateChangeEvent.href) &&
-        Objects.equals(this.eventId, unGroupAlarmsStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, unGroupAlarmsStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, unGroupAlarmsStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, unGroupAlarmsStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, unGroupAlarmsStateChangeEvent.domain) &&
-        Objects.equals(this.title, unGroupAlarmsStateChangeEvent.title) &&
-        Objects.equals(this.description, unGroupAlarmsStateChangeEvent.description) &&
-        Objects.equals(this.priority, unGroupAlarmsStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, unGroupAlarmsStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, unGroupAlarmsStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnGroupAlarmsStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEventPayload.java
deleted file mode 100644
index e4d465d22ad70c4bb21cf934ad3f49f0f2762497..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am642/model/UnGroupAlarmsStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am642.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class UnGroupAlarmsStateChangeEventPayload   {
-  @JsonProperty("unGroupAlarms")
-  private UnGroupAlarms unGroupAlarms = null;
-
-  public UnGroupAlarmsStateChangeEventPayload unGroupAlarms(UnGroupAlarms unGroupAlarms) {
-    this.unGroupAlarms = unGroupAlarms;
-    return this;
-  }
-
-  /**
-   * Get unGroupAlarms
-   * @return unGroupAlarms
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public UnGroupAlarms getUnGroupAlarms() {
-    return unGroupAlarms;
-  }
-
-  public void setUnGroupAlarms(UnGroupAlarms unGroupAlarms) {
-    this.unGroupAlarms = unGroupAlarms;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    UnGroupAlarmsStateChangeEventPayload unGroupAlarmsStateChangeEventPayload = (UnGroupAlarmsStateChangeEventPayload) o;
-    return Objects.equals(this.unGroupAlarms, unGroupAlarmsStateChangeEventPayload.unGroupAlarms);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unGroupAlarms);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class UnGroupAlarmsStateChangeEventPayload {\n");
-    
-    sb.append("    unGroupAlarms: ").append(toIndentedString(unGroupAlarms)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/Agreement.java b/src/main/java/org/etsi/osl/tmf/am651/model/Agreement.java
deleted file mode 100644
index 9dd3e97092120a576b480efaa8957f9c4a42f9d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/Agreement.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.
- */
-@Schema(description = "An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class Agreement   {
-  @JsonProperty("agreementPeriod")
-  private TimePeriod agreementPeriod = null;
-
-  @JsonProperty("completionDate")
-  private TimePeriod completionDate = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("documentNumber")
-  private Integer documentNumber = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("initialDate")
-  private OffsetDateTime initialDate = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("statementOfIntent")
-  private String statementOfIntent = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("type")
-  private String typeAgreement = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("agreementSpecification")
-  private AgreementSpecificationRef agreementSpecification = null;
-
-  @JsonProperty("agreementItem")
-  @Valid
-  private List<AgreementItem> agreementItem = null;
-
-  @JsonProperty("engagedPartyRole")
-  @Valid
-  private List<PartyRoleRef> engagedPartyRole = null;
-
-  @JsonProperty("agreementAuthorization")
-  @Valid
-  private List<AgreementAuthorization> agreementAuthorization = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("associatedAgreement")
-  @Valid
-  private List<AgreementRef> associatedAgreement = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public Agreement agreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-    return this;
-  }
-
-  /**
-   * The time period during which the Agreement is in effect.
-   * @return agreementPeriod
-  **/
-  @Schema(description = "The time period during which the Agreement is in effect.")
-
-  @Valid
-
-  public TimePeriod getAgreementPeriod() {
-    return agreementPeriod;
-  }
-
-  public void setAgreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-  }
-
-  public Agreement completionDate(TimePeriod completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the agreement is completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the agreement is completed")
-
-  @Valid
-
-  public TimePeriod getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(TimePeriod completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public Agreement description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Narrative that explains the agreement and details about the it , such as why the agreement is taking place.
-   * @return description
-  **/
-  @Schema(description = "Narrative that explains the agreement and details about the it , such as why the agreement is taking place.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Agreement documentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-    return this;
-  }
-
-  /**
-   * A reference number assigned to an Agreement that follows a prescribed numbering system.
-   * @return documentNumber
-  **/
-  @Schema(description = "A reference number assigned to an Agreement that follows a prescribed numbering system.")
-
-
-  public Integer getDocumentNumber() {
-    return documentNumber;
-  }
-
-  public void setDocumentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-  }
-
-  public Agreement href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique url identifying the agreement as a resource
-   * @return href
-  **/
-  @Schema(description = "Unique url identifying the agreement as a resource")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Agreement id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier for the agreement
-   * @return id
-  **/
-  @Schema(description = "Unique identifier for the agreement")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Agreement initialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-    return this;
-  }
-
-  /**
-   * Date at which the agreement was initialized
-   * @return initialDate
-  **/
-  @Schema(description = "Date at which the agreement was initialized")
-
-  @Valid
-
-  public OffsetDateTime getInitialDate() {
-    return initialDate;
-  }
-
-  public void setInitialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-  }
-
-  public Agreement name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A human-readable name for the agreement
-   * @return name
-  **/
-  @Schema(description = "A human-readable name for the agreement")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Agreement statementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-    return this;
-  }
-
-  /**
-   * An overview and goals of the Agreement.
-   * @return statementOfIntent
-  **/
-  @Schema(description = "An overview and goals of the Agreement.")
-
-
-  public String getStatementOfIntent() {
-    return statementOfIntent;
-  }
-
-  public void setStatementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-  }
-
-  public Agreement status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * The current status of the agreement. Typical values are: in process, approved and rejected.
-   * @return status
-  **/
-  @Schema(description = "The current status of the agreement. Typical values are: in process, approved and rejected.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Agreement typeAgreement(String type) {
-    this.typeAgreement = type;
-    return this;
-  }
-
-  /**
-   * The type of the agreement. For example \"commercial\".
-   * @return type
-  **/
-  @Schema(description = "The type of the agreement. For example \"commercial\".")
-
-
-  public String getTypeAgreement() {
-    return typeAgreement;
-  }
-
-  public void setTypeAgreement(String type) {
-    this.typeAgreement = type;
-  }
-
-  public Agreement version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * A string identifying the version of the agreement.
-   * @return version
-  **/
-  @Schema(description = "A string identifying the version of the agreement.")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public Agreement agreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-    return this;
-  }
-
-  /**
-   * Get agreementSpecification
-   * @return agreementSpecification
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public AgreementSpecificationRef getAgreementSpecification() {
-    return agreementSpecification;
-  }
-
-  public void setAgreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-  }
-
-  public Agreement agreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-    return this;
-  }
-
-  public Agreement addAgreementItemItem(AgreementItem agreementItemItem) {
-    if (this.agreementItem == null) {
-      this.agreementItem = new ArrayList<>();
-    }
-    this.agreementItem.add(agreementItemItem);
-    return this;
-  }
-
-  /**
-   * Get agreementItem
-   * @return agreementItem
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementItem> getAgreementItem() {
-    return agreementItem;
-  }
-
-  public void setAgreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-  }
-
-  public Agreement engagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-    return this;
-  }
-
-  public Agreement addEngagedPartyRoleItem(PartyRoleRef engagedPartyRoleItem) {
-    if (this.engagedPartyRole == null) {
-      this.engagedPartyRole = new ArrayList<>();
-    }
-    this.engagedPartyRole.add(engagedPartyRoleItem);
-    return this;
-  }
-
-  /**
-   * Get engagedPartyRole
-   * @return engagedPartyRole
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PartyRoleRef> getEngagedPartyRole() {
-    return engagedPartyRole;
-  }
-
-  public void setEngagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-  }
-
-  public Agreement agreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-    return this;
-  }
-
-  public Agreement addAgreementAuthorizationItem(AgreementAuthorization agreementAuthorizationItem) {
-    if (this.agreementAuthorization == null) {
-      this.agreementAuthorization = new ArrayList<>();
-    }
-    this.agreementAuthorization.add(agreementAuthorizationItem);
-    return this;
-  }
-
-  /**
-   * Get agreementAuthorization
-   * @return agreementAuthorization
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementAuthorization> getAgreementAuthorization() {
-    return agreementAuthorization;
-  }
-
-  public void setAgreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-  }
-
-  public Agreement characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public Agreement addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Get characteristic
-   * @return characteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public Agreement associatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-    return this;
-  }
-
-  public Agreement addAssociatedAgreementItem(AgreementRef associatedAgreementItem) {
-    if (this.associatedAgreement == null) {
-      this.associatedAgreement = new ArrayList<>();
-    }
-    this.associatedAgreement.add(associatedAgreementItem);
-    return this;
-  }
-
-  /**
-   * Get associatedAgreement
-   * @return associatedAgreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAssociatedAgreement() {
-    return associatedAgreement;
-  }
-
-  public void setAssociatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-  }
-
-  public Agreement type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public Agreement schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Agreement baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Agreement agreement = (Agreement) o;
-    return Objects.equals(this.agreementPeriod, agreement.agreementPeriod) &&
-        Objects.equals(this.completionDate, agreement.completionDate) &&
-        Objects.equals(this.description, agreement.description) &&
-        Objects.equals(this.documentNumber, agreement.documentNumber) &&
-        Objects.equals(this.href, agreement.href) &&
-        Objects.equals(this.id, agreement.id) &&
-        Objects.equals(this.initialDate, agreement.initialDate) &&
-        Objects.equals(this.name, agreement.name) &&
-        Objects.equals(this.statementOfIntent, agreement.statementOfIntent) &&
-        Objects.equals(this.status, agreement.status) &&
-        Objects.equals(this.type, agreement.type) &&
-        Objects.equals(this.version, agreement.version) &&
-        Objects.equals(this.agreementSpecification, agreement.agreementSpecification) &&
-        Objects.equals(this.agreementItem, agreement.agreementItem) &&
-        Objects.equals(this.engagedPartyRole, agreement.engagedPartyRole) &&
-        Objects.equals(this.agreementAuthorization, agreement.agreementAuthorization) &&
-        Objects.equals(this.characteristic, agreement.characteristic) &&
-        Objects.equals(this.associatedAgreement, agreement.associatedAgreement) &&
-        Objects.equals(this.type, agreement.type) &&
-        Objects.equals(this.schemaLocation, agreement.schemaLocation) &&
-        Objects.equals(this.baseType, agreement.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(agreementPeriod, completionDate, description, documentNumber, href, id, initialDate, name, statementOfIntent, status, type, version, agreementSpecification, agreementItem, engagedPartyRole, agreementAuthorization, characteristic, associatedAgreement, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Agreement {\n");
-    
-    sb.append("    agreementPeriod: ").append(toIndentedString(agreementPeriod)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    documentNumber: ").append(toIndentedString(documentNumber)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    initialDate: ").append(toIndentedString(initialDate)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    statementOfIntent: ").append(toIndentedString(statementOfIntent)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    agreementSpecification: ").append(toIndentedString(agreementSpecification)).append("\n");
-    sb.append("    agreementItem: ").append(toIndentedString(agreementItem)).append("\n");
-    sb.append("    engagedPartyRole: ").append(toIndentedString(engagedPartyRole)).append("\n");
-    sb.append("    agreementAuthorization: ").append(toIndentedString(agreementAuthorization)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    associatedAgreement: ").append(toIndentedString(associatedAgreement)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAttachment.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAttachment.java
deleted file mode 100644
index fbff9a22e8cda0c213272fe5ad6adc71fc0f05b0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAttachment.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Represents a complementary piece of information to describe the agreement. Could be a document, picture, a video or any kind of multimedia content.
- */
-@Schema(description = "Represents a complementary piece of information to describe the agreement. Could be a document, picture, a video or any kind of multimedia content.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementAttachment   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("type")
-  private String typeAgreementAttachment = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementAttachment href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the attachment
-   * @return href
-  **/
-  @Schema(description = "Reference of the attachment")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementAttachment id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the attachment
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the attachment")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementAttachment typeAgreementAttachment(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Attachment type such as video, picture
-   * @return type
-  **/
-  @Schema(description = "Attachment type such as video, picture")
-
-
-  public String getTypeAgreementAttachment() {
-    return typeAgreementAttachment;
-  }
-
-  public void setTypeAgreementAttachment(String type) {
-    this.typeAgreementAttachment = type;
-  }
-
-  public AgreementAttachment url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * Uniform Resource Locator, is a web page address (a subset of URI)
-   * @return url
-  **/
-  @Schema(description = "Uniform Resource Locator, is a web page address (a subset of URI)")
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public AgreementAttachment type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementAttachment agreementAttachment = (AgreementAttachment) o;
-    return Objects.equals(this.href, agreementAttachment.href) &&
-        Objects.equals(this.id, agreementAttachment.id) &&
-        Objects.equals(this.type, agreementAttachment.type) &&
-        Objects.equals(this.url, agreementAttachment.url) &&
-        Objects.equals(this.type, agreementAttachment.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, type, url, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementAttachment {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAuthorization.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAuthorization.java
deleted file mode 100644
index 23fe3df44f0ddb2af58e925be7347e3e89f3e011..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementAuthorization.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A business participant that is responsible for approving the agreement.
- */
-@Schema(description = "A business participant that is responsible for approving the agreement.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementAuthorization   {
-  @JsonProperty("date")
-  private OffsetDateTime date = null;
-
-  @JsonProperty("signatureRepresentation")
-  private String signatureRepresentation = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementAuthorization date(OffsetDateTime date) {
-    this.date = date;
-    return this;
-  }
-
-  /**
-   * The date associated with the authorization state.
-   * @return date
-  **/
-  @Schema(description = "The date associated with the authorization state.")
-
-  @Valid
-
-  public OffsetDateTime getDate() {
-    return date;
-  }
-
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
-  }
-
-  public AgreementAuthorization signatureRepresentation(String signatureRepresentation) {
-    this.signatureRepresentation = signatureRepresentation;
-    return this;
-  }
-
-  /**
-   * Indication that represents whether the signature is a physical paper signature or a digital signature.
-   * @return signatureRepresentation
-  **/
-  @Schema(description = "Indication that represents whether the signature is a physical paper signature or a digital signature.")
-
-
-  public String getSignatureRepresentation() {
-    return signatureRepresentation;
-  }
-
-  public void setSignatureRepresentation(String signatureRepresentation) {
-    this.signatureRepresentation = signatureRepresentation;
-  }
-
-  public AgreementAuthorization state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Current status of the authorization, for example in process, approved, rejected.
-   * @return state
-  **/
-  @Schema(description = "Current status of the authorization, for example in process, approved, rejected.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public AgreementAuthorization type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementAuthorization agreementAuthorization = (AgreementAuthorization) o;
-    return Objects.equals(this.date, agreementAuthorization.date) &&
-        Objects.equals(this.signatureRepresentation, agreementAuthorization.signatureRepresentation) &&
-        Objects.equals(this.state, agreementAuthorization.state) &&
-        Objects.equals(this.type, agreementAuthorization.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(date, signatureRepresentation, state, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementAuthorization {\n");
-    
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    signatureRepresentation: ").append(toIndentedString(signatureRepresentation)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementCreate.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementCreate.java
deleted file mode 100644
index 841688a9cf84e16e3c7756af5644b1dfbfe28c3c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementCreate.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications. Skipped properties: id,href
- */
-@Schema(description = "An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementCreate   {
-  @JsonProperty("agreementPeriod")
-  private TimePeriod agreementPeriod = null;
-
-  @JsonProperty("completionDate")
-  private TimePeriod completionDate = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("documentNumber")
-  private Integer documentNumber = null;
-
-  @JsonProperty("initialDate")
-  private OffsetDateTime initialDate = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("statementOfIntent")
-  private String statementOfIntent = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("type")
-  private String typeAgreementCreate = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("agreementSpecification")
-  private AgreementSpecificationRef agreementSpecification = null;
-
-  @JsonProperty("agreementItem")
-  @Valid
-  private List<AgreementItem> agreementItem = new ArrayList<>();
-
-  @JsonProperty("engagedPartyRole")
-  @Valid
-  private List<PartyRoleRef> engagedPartyRole = new ArrayList<>();
-
-  @JsonProperty("agreementAuthorization")
-  @Valid
-  private List<AgreementAuthorization> agreementAuthorization = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("associatedAgreement")
-  @Valid
-  private List<AgreementRef> associatedAgreement = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public AgreementCreate agreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-    return this;
-  }
-
-  /**
-   * The time period during which the Agreement is in effect.
-   * @return agreementPeriod
-  **/
-  @Schema(description = "The time period during which the Agreement is in effect.")
-
-  @Valid
-
-  public TimePeriod getAgreementPeriod() {
-    return agreementPeriod;
-  }
-
-  public void setAgreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-  }
-
-  public AgreementCreate completionDate(TimePeriod completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the agreement is completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the agreement is completed")
-
-  @Valid
-
-  public TimePeriod getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(TimePeriod completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public AgreementCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Narrative that explains the agreement and details about the it , such as why the agreement is taking place.
-   * @return description
-  **/
-  @Schema(description = "Narrative that explains the agreement and details about the it , such as why the agreement is taking place.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementCreate documentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-    return this;
-  }
-
-  /**
-   * A reference number assigned to an Agreement that follows a prescribed numbering system.
-   * @return documentNumber
-  **/
-  @Schema(description = "A reference number assigned to an Agreement that follows a prescribed numbering system.")
-
-
-  public Integer getDocumentNumber() {
-    return documentNumber;
-  }
-
-  public void setDocumentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-  }
-
-  public AgreementCreate initialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-    return this;
-  }
-
-  /**
-   * Date at which the agreement was initialized
-   * @return initialDate
-  **/
-  @Schema(description = "Date at which the agreement was initialized")
-
-  @Valid
-
-  public OffsetDateTime getInitialDate() {
-    return initialDate;
-  }
-
-  public void setInitialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-  }
-
-  public AgreementCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A human-readable name for the agreement
-   * @return name
-  **/
-  @Schema(description = "A human-readable name for the agreement")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementCreate statementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-    return this;
-  }
-
-  /**
-   * An overview and goals of the Agreement.
-   * @return statementOfIntent
-  **/
-  @Schema(description = "An overview and goals of the Agreement.")
-
-
-  public String getStatementOfIntent() {
-    return statementOfIntent;
-  }
-
-  public void setStatementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-  }
-
-  public AgreementCreate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * The current status of the agreement. Typical values are: in process, approved and rejected.
-   * @return status
-  **/
-  @Schema(description = "The current status of the agreement. Typical values are: in process, approved and rejected.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public AgreementCreate typeAgreementCreate(String type) {
-    this.typeAgreementCreate = type;
-    return this;
-  }
-
-  /**
-   * The type of the agreement. For example \"commercial\".
-   * @return type
-  **/
-  @Schema(description = "The type of the agreement. For example \"commercial\".")
-  @NotNull
-
-
-  public String getTypeAgreementCreate() {
-    return typeAgreementCreate;
-  }
-
-  public void setTypeAgreementCreate(String type) {
-    this.typeAgreementCreate = type;
-  }
-
-  public AgreementCreate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * A string identifying the version of the agreement.
-   * @return version
-  **/
-  @Schema(description = "A string identifying the version of the agreement.")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public AgreementCreate agreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-    return this;
-  }
-
-  /**
-   * Get agreementSpecification
-   * @return agreementSpecification
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public AgreementSpecificationRef getAgreementSpecification() {
-    return agreementSpecification;
-  }
-
-  public void setAgreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-  }
-
-  public AgreementCreate agreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-    return this;
-  }
-
-  public AgreementCreate addAgreementItemItem(AgreementItem agreementItemItem) {
-    this.agreementItem.add(agreementItemItem);
-    return this;
-  }
-
-  /**
-   * Get agreementItem
-   * @return agreementItem
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public List<AgreementItem> getAgreementItem() {
-    return agreementItem;
-  }
-
-  public void setAgreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-  }
-
-  public AgreementCreate engagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-    return this;
-  }
-
-  public AgreementCreate addEngagedPartyRoleItem(PartyRoleRef engagedPartyRoleItem) {
-    this.engagedPartyRole.add(engagedPartyRoleItem);
-    return this;
-  }
-
-  /**
-   * Get engagedPartyRole
-   * @return engagedPartyRole
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public List<PartyRoleRef> getEngagedPartyRole() {
-    return engagedPartyRole;
-  }
-
-  public void setEngagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-  }
-
-  public AgreementCreate agreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-    return this;
-  }
-
-  public AgreementCreate addAgreementAuthorizationItem(AgreementAuthorization agreementAuthorizationItem) {
-    if (this.agreementAuthorization == null) {
-      this.agreementAuthorization = new ArrayList<>();
-    }
-    this.agreementAuthorization.add(agreementAuthorizationItem);
-    return this;
-  }
-
-  /**
-   * Get agreementAuthorization
-   * @return agreementAuthorization
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementAuthorization> getAgreementAuthorization() {
-    return agreementAuthorization;
-  }
-
-  public void setAgreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-  }
-
-  public AgreementCreate characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public AgreementCreate addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Get characteristic
-   * @return characteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public AgreementCreate associatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-    return this;
-  }
-
-  public AgreementCreate addAssociatedAgreementItem(AgreementRef associatedAgreementItem) {
-    if (this.associatedAgreement == null) {
-      this.associatedAgreement = new ArrayList<>();
-    }
-    this.associatedAgreement.add(associatedAgreementItem);
-    return this;
-  }
-
-  /**
-   * Get associatedAgreement
-   * @return associatedAgreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAssociatedAgreement() {
-    return associatedAgreement;
-  }
-
-  public void setAssociatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-  }
-
-  public AgreementCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementCreate agreementCreate = (AgreementCreate) o;
-    return Objects.equals(this.agreementPeriod, agreementCreate.agreementPeriod) &&
-        Objects.equals(this.completionDate, agreementCreate.completionDate) &&
-        Objects.equals(this.description, agreementCreate.description) &&
-        Objects.equals(this.documentNumber, agreementCreate.documentNumber) &&
-        Objects.equals(this.initialDate, agreementCreate.initialDate) &&
-        Objects.equals(this.name, agreementCreate.name) &&
-        Objects.equals(this.statementOfIntent, agreementCreate.statementOfIntent) &&
-        Objects.equals(this.status, agreementCreate.status) &&
-        Objects.equals(this.type, agreementCreate.type) &&
-        Objects.equals(this.version, agreementCreate.version) &&
-        Objects.equals(this.agreementSpecification, agreementCreate.agreementSpecification) &&
-        Objects.equals(this.agreementItem, agreementCreate.agreementItem) &&
-        Objects.equals(this.engagedPartyRole, agreementCreate.engagedPartyRole) &&
-        Objects.equals(this.agreementAuthorization, agreementCreate.agreementAuthorization) &&
-        Objects.equals(this.characteristic, agreementCreate.characteristic) &&
-        Objects.equals(this.associatedAgreement, agreementCreate.associatedAgreement) &&
-        Objects.equals(this.type, agreementCreate.type) &&
-        Objects.equals(this.schemaLocation, agreementCreate.schemaLocation) &&
-        Objects.equals(this.baseType, agreementCreate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(agreementPeriod, completionDate, description, documentNumber, initialDate, name, statementOfIntent, status, type, version, agreementSpecification, agreementItem, engagedPartyRole, agreementAuthorization, characteristic, associatedAgreement, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementCreate {\n");
-    
-    sb.append("    agreementPeriod: ").append(toIndentedString(agreementPeriod)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    documentNumber: ").append(toIndentedString(documentNumber)).append("\n");
-    sb.append("    initialDate: ").append(toIndentedString(initialDate)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    statementOfIntent: ").append(toIndentedString(statementOfIntent)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    agreementSpecification: ").append(toIndentedString(agreementSpecification)).append("\n");
-    sb.append("    agreementItem: ").append(toIndentedString(agreementItem)).append("\n");
-    sb.append("    engagedPartyRole: ").append(toIndentedString(engagedPartyRole)).append("\n");
-    sb.append("    agreementAuthorization: ").append(toIndentedString(agreementAuthorization)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    associatedAgreement: ").append(toIndentedString(associatedAgreement)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementItem.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementItem.java
deleted file mode 100644
index a07440a16ef1a71e1628f7fc55ad6674544411e9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementItem.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A part of the agreement expressed in terms of a product offering and possibly including specific terms and conditions.
- */
-@Schema(description = "A part of the agreement expressed in terms of a product offering and possibly including specific terms and conditions.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementItem   {
-  @JsonProperty("productOffering")
-  @Valid
-  private List<ProductOfferingRef> productOffering = null;
-
-  @JsonProperty("termOrCondition")
-  @Valid
-  private List<AgreementTermOrCondition> termOrCondition = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementItem productOffering(List<ProductOfferingRef> productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  public AgreementItem addProductOfferingItem(ProductOfferingRef productOfferingItem) {
-    if (this.productOffering == null) {
-      this.productOffering = new ArrayList<>();
-    }
-    this.productOffering.add(productOfferingItem);
-    return this;
-  }
-
-  /**
-   * Get productOffering
-   * @return productOffering
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ProductOfferingRef> getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(List<ProductOfferingRef> productOffering) {
-    this.productOffering = productOffering;
-  }
-
-  public AgreementItem termOrCondition(List<AgreementTermOrCondition> termOrCondition) {
-    this.termOrCondition = termOrCondition;
-    return this;
-  }
-
-  public AgreementItem addTermOrConditionItem(AgreementTermOrCondition termOrConditionItem) {
-    if (this.termOrCondition == null) {
-      this.termOrCondition = new ArrayList<>();
-    }
-    this.termOrCondition.add(termOrConditionItem);
-    return this;
-  }
-
-  /**
-   * Get termOrCondition
-   * @return termOrCondition
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementTermOrCondition> getTermOrCondition() {
-    return termOrCondition;
-  }
-
-  public void setTermOrCondition(List<AgreementTermOrCondition> termOrCondition) {
-    this.termOrCondition = termOrCondition;
-  }
-
-  public AgreementItem type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementItem agreementItem = (AgreementItem) o;
-    return Objects.equals(this.productOffering, agreementItem.productOffering) &&
-        Objects.equals(this.termOrCondition, agreementItem.termOrCondition) &&
-        Objects.equals(this.type, agreementItem.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOffering, termOrCondition, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementItem {\n");
-    
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    termOrCondition: ").append(toIndentedString(termOrCondition)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementRef.java
deleted file mode 100644
index 98aa30272e18867c51d9b201d45074ca643db486..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementRef.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.
- */
-@Schema(description = "Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-@Entity(name = "AgreementRef")
-public class AgreementRef extends BaseRootNamedEntity{
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-
-  public AgreementRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the agreement
-   * @return id
-  **/
-  @Schema(description = "Identifier of the agreement")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementRef agreementRef = (AgreementRef) o;
-    return Objects.equals(this.href, agreementRef.href) &&
-        Objects.equals(this.id, agreementRef.id) &&
-        Objects.equals(this.name, agreementRef.name) &&
-        Objects.equals(this.referredType, agreementRef.referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristic.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristic.java
deleted file mode 100644
index 1ae0e42ba56fe0b462b645b1b1285f33ea191c1f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristic.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A characteristic quality or distinctive feature of an agreement.
- */
-@Schema(description = "A characteristic quality or distinctive feature of an agreement.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecCharacteristic   {
-  @JsonProperty("configurable")
-  private Boolean configurable = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("specCharacteristicValue")
-  @Valid
-  private List<AgreementSpecCharacteristicValue> specCharacteristicValue = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  public AgreementSpecCharacteristic configurable(Boolean configurable) {
-    this.configurable = configurable;
-    return this;
-  }
-
-  /**
-   * If true, the Boolean indicates that the characteristic is configurable
-   * @return configurable
-  **/
-  @Schema(description = "If true, the Boolean indicates that the characteristic is configurable")
-
-
-  public Boolean isConfigurable() {
-    return configurable;
-  }
-
-  public void setConfigurable(Boolean configurable) {
-    this.configurable = configurable;
-  }
-
-  public AgreementSpecCharacteristic description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the characteristic is
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the characteristic is")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementSpecCharacteristic name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the characteristic being specified.
-   * @return name
-  **/
-  @Schema(description = "Name of the characteristic being specified.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementSpecCharacteristic validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the specification characteristic is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the specification characteristic is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecCharacteristic valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * A kind of value that the characteristic can take on, such as numeric, text and so forth
-   * @return valueType
-  **/
-  @Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-
-  public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public AgreementSpecCharacteristic specCharacteristicValue(List<AgreementSpecCharacteristicValue> specCharacteristicValue) {
-    this.specCharacteristicValue = specCharacteristicValue;
-    return this;
-  }
-
-  public AgreementSpecCharacteristic addSpecCharacteristicValueItem(AgreementSpecCharacteristicValue specCharacteristicValueItem) {
-    if (this.specCharacteristicValue == null) {
-      this.specCharacteristicValue = new ArrayList<>();
-    }
-    this.specCharacteristicValue.add(specCharacteristicValueItem);
-    return this;
-  }
-
-  /**
-   * Get specCharacteristicValue
-   * @return specCharacteristicValue
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecCharacteristicValue> getSpecCharacteristicValue() {
-    return specCharacteristicValue;
-  }
-
-  public void setSpecCharacteristicValue(List<AgreementSpecCharacteristicValue> specCharacteristicValue) {
-    this.specCharacteristicValue = specCharacteristicValue;
-  }
-
-  public AgreementSpecCharacteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementSpecCharacteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecCharacteristic agreementSpecCharacteristic = (AgreementSpecCharacteristic) o;
-    return Objects.equals(this.configurable, agreementSpecCharacteristic.configurable) &&
-        Objects.equals(this.description, agreementSpecCharacteristic.description) &&
-        Objects.equals(this.name, agreementSpecCharacteristic.name) &&
-        Objects.equals(this.validFor, agreementSpecCharacteristic.validFor) &&
-        Objects.equals(this.valueType, agreementSpecCharacteristic.valueType) &&
-        Objects.equals(this.specCharacteristicValue, agreementSpecCharacteristic.specCharacteristicValue) &&
-        Objects.equals(this.type, agreementSpecCharacteristic.type) &&
-        Objects.equals(this.schemaLocation, agreementSpecCharacteristic.schemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(configurable, description, name, validFor, valueType, specCharacteristicValue, type, schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecCharacteristic {\n");
-    
-    sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    specCharacteristicValue: ").append(toIndentedString(specCharacteristicValue)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristicValue.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristicValue.java
deleted file mode 100644
index 1e3c66153267ce978e7fa5cff1ff4a75380d22d4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecCharacteristicValue.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A number or text that can be assigned to an agreement specification characteristic.
- */
-@Schema(description = "A number or text that can be assigned to an agreement specification characteristic.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecCharacteristicValue   {
-  @JsonProperty("default")
-  private Boolean _default = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("value")
-  private String value = null;
-
-  @JsonProperty("valueFrom")
-  private String valueFrom = null;
-
-  @JsonProperty("valueTo")
-  private String valueTo = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementSpecCharacteristicValue _default(Boolean _default) {
-    this._default = _default;
-    return this;
-  }
-
-  /**
-   * Indicates if the value is the default value for a characteristic
-   * @return _default
-  **/
-  @Schema(description = "Indicates if the value is the default value for a characteristic")
-
-
-  public Boolean isDefault() {
-    return _default;
-  }
-
-  public void setDefault(Boolean _default) {
-    this._default = _default;
-  }
-
-  public AgreementSpecCharacteristicValue unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * Unit of measure for the characteristic, such as minutes, gigabytes (GB) and so on.
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "Unit of measure for the characteristic, such as minutes, gigabytes (GB) and so on.")
-
-
-  public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public AgreementSpecCharacteristicValue validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period of time for which a value is applicable
-   * @return validFor
-  **/
-  @Schema(description = "The period of time for which a value is applicable")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecCharacteristicValue value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * A discrete value that the characteristic can take on
-   * @return value
-  **/
-  @Schema(description = "A discrete value that the characteristic can take on")
-
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-  public AgreementSpecCharacteristicValue valueFrom(String valueFrom) {
-    this.valueFrom = valueFrom;
-    return this;
-  }
-
-  /**
-   * The low range value that a characteristic can take on
-   * @return valueFrom
-  **/
-  @Schema(description = "The low range value that a characteristic can take on")
-
-
-  public String getValueFrom() {
-    return valueFrom;
-  }
-
-  public void setValueFrom(String valueFrom) {
-    this.valueFrom = valueFrom;
-  }
-
-  public AgreementSpecCharacteristicValue valueTo(String valueTo) {
-    this.valueTo = valueTo;
-    return this;
-  }
-
-  /**
-   * The upper range value that a characteristic can take on
-   * @return valueTo
-  **/
-  @Schema(description = "The upper range value that a characteristic can take on")
-
-
-  public String getValueTo() {
-    return valueTo;
-  }
-
-  public void setValueTo(String valueTo) {
-    this.valueTo = valueTo;
-  }
-
-  public AgreementSpecCharacteristicValue valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * A kind of value that the characteristic can take on, such as numeric, text, and so forth
-   * @return valueType
-  **/
-  @Schema(description = "A kind of value that the characteristic can take on, such as numeric, text, and so forth")
-
-
-  public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public AgreementSpecCharacteristicValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecCharacteristicValue agreementSpecCharacteristicValue = (AgreementSpecCharacteristicValue) o;
-    return Objects.equals(this._default, agreementSpecCharacteristicValue._default) &&
-        Objects.equals(this.unitOfMeasure, agreementSpecCharacteristicValue.unitOfMeasure) &&
-        Objects.equals(this.validFor, agreementSpecCharacteristicValue.validFor) &&
-        Objects.equals(this.value, agreementSpecCharacteristicValue.value) &&
-        Objects.equals(this.valueFrom, agreementSpecCharacteristicValue.valueFrom) &&
-        Objects.equals(this.valueTo, agreementSpecCharacteristicValue.valueTo) &&
-        Objects.equals(this.valueType, agreementSpecCharacteristicValue.valueType) &&
-        Objects.equals(this.type, agreementSpecCharacteristicValue.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_default, unitOfMeasure, validFor, value, valueFrom, valueTo, valueType, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecCharacteristicValue {\n");
-    
-    sb.append("    _default: ").append(toIndentedString(_default)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-    sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecification.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecification.java
deleted file mode 100644
index 86b99c1e006c81314ffdf1592aff553558e7e797..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecification.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A template of an agreement that can be used when establishing partnerships.
- */
-@Schema(description = "A template of an agreement that can be used when establishing partnerships.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecification   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("isBundle")
-  private Boolean isBundle = null;
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-  @JsonProperty("lifecycleStatus")
-  private String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("serviceCategory")
-  private CategoryRef serviceCategory = null;
-
-  @JsonProperty("specCharacteristic")
-  @Valid
-  private List<AgreementSpecCharacteristic> specCharacteristic = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedPartyRef> relatedParty = null;
-
-  @JsonProperty("attachment")
-  @Valid
-  private List<AgreementAttachment> attachment = null;
-
-  @JsonProperty("specificationRelationship")
-  @Valid
-  private List<AgreementSpecificationRelationship> specificationRelationship = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public AgreementSpecification description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the agreement specification is about.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the agreement specification is about.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementSpecification href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the agreement specification
-   * @return href
-  **/
-  @Schema(description = "Reference of the agreement specification")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementSpecification id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the agreement specification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the agreement specification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementSpecification isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.
-   * @return isBundle
-  **/
-  @Schema(description = "Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public AgreementSpecification lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  public AgreementSpecification lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Indicates the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Indicates the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public AgreementSpecification name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the agreement specification
-   * @return name
-  **/
-  @Schema(description = "Name of the agreement specification")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementSpecification validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the agreement specification is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the agreement specification is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecification version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Agreement specification version
-   * @return version
-  **/
-  @Schema(description = "Agreement specification version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public AgreementSpecification serviceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * Get serviceCategory
-   * @return serviceCategory
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public CategoryRef getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-  public AgreementSpecification specCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-    return this;
-  }
-
-  public AgreementSpecification addSpecCharacteristicItem(AgreementSpecCharacteristic specCharacteristicItem) {
-    if (this.specCharacteristic == null) {
-      this.specCharacteristic = new ArrayList<>();
-    }
-    this.specCharacteristic.add(specCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get specCharacteristic
-   * @return specCharacteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecCharacteristic> getSpecCharacteristic() {
-    return specCharacteristic;
-  }
-
-  public void setSpecCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-  }
-
-  public AgreementSpecification relatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public AgreementSpecification addRelatedPartyItem(RelatedPartyRef relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedPartyRef> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public AgreementSpecification attachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-    return this;
-  }
-
-  public AgreementSpecification addAttachmentItem(AgreementAttachment attachmentItem) {
-    if (this.attachment == null) {
-      this.attachment = new ArrayList<>();
-    }
-    this.attachment.add(attachmentItem);
-    return this;
-  }
-
-  /**
-   * Get attachment
-   * @return attachment
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementAttachment> getAttachment() {
-    return attachment;
-  }
-
-  public void setAttachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-  }
-
-  public AgreementSpecification specificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-    return this;
-  }
-
-  public AgreementSpecification addSpecificationRelationshipItem(AgreementSpecificationRelationship specificationRelationshipItem) {
-    if (this.specificationRelationship == null) {
-      this.specificationRelationship = new ArrayList<>();
-    }
-    this.specificationRelationship.add(specificationRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get specificationRelationship
-   * @return specificationRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecificationRelationship> getSpecificationRelationship() {
-    return specificationRelationship;
-  }
-
-  public void setSpecificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-  }
-
-  public AgreementSpecification type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementSpecification schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementSpecification baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecification agreementSpecification = (AgreementSpecification) o;
-    return Objects.equals(this.description, agreementSpecification.description) &&
-        Objects.equals(this.href, agreementSpecification.href) &&
-        Objects.equals(this.id, agreementSpecification.id) &&
-        Objects.equals(this.isBundle, agreementSpecification.isBundle) &&
-        Objects.equals(this.lastUpdate, agreementSpecification.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, agreementSpecification.lifecycleStatus) &&
-        Objects.equals(this.name, agreementSpecification.name) &&
-        Objects.equals(this.validFor, agreementSpecification.validFor) &&
-        Objects.equals(this.version, agreementSpecification.version) &&
-        Objects.equals(this.serviceCategory, agreementSpecification.serviceCategory) &&
-        Objects.equals(this.specCharacteristic, agreementSpecification.specCharacteristic) &&
-        Objects.equals(this.relatedParty, agreementSpecification.relatedParty) &&
-        Objects.equals(this.attachment, agreementSpecification.attachment) &&
-        Objects.equals(this.specificationRelationship, agreementSpecification.specificationRelationship) &&
-        Objects.equals(this.type, agreementSpecification.type) &&
-        Objects.equals(this.schemaLocation, agreementSpecification.schemaLocation) &&
-        Objects.equals(this.baseType, agreementSpecification.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, href, id, isBundle, lastUpdate, lifecycleStatus, name, validFor, version, serviceCategory, specCharacteristic, relatedParty, attachment, specificationRelationship, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecification {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    specificationRelationship: ").append(toIndentedString(specificationRelationship)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationCreate.java
deleted file mode 100644
index b68894c0514ac65b9ebdd17e9abd46559bc93a22..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationCreate.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A template of an agreement that can be used when establishing partnerships. Skipped properties: id,href
- */
-@Schema(description = "A template of an agreement that can be used when establishing partnerships. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecificationCreate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("isBundle")
-  private Boolean isBundle = null;
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-  @JsonProperty("lifecycleStatus")
-  private String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("serviceCategory")
-  private CategoryRef serviceCategory = null;
-
-  @JsonProperty("specCharacteristic")
-  @Valid
-  private List<AgreementSpecCharacteristic> specCharacteristic = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedPartyRef> relatedParty = null;
-
-  @JsonProperty("attachment")
-  @Valid
-  private List<AgreementAttachment> attachment = new ArrayList<>();
-
-  @JsonProperty("specificationRelationship")
-  @Valid
-  private List<AgreementSpecificationRelationship> specificationRelationship = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public AgreementSpecificationCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the agreement specification is about.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the agreement specification is about.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementSpecificationCreate isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.
-   * @return isBundle
-  **/
-  @Schema(description = "Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public AgreementSpecificationCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  public AgreementSpecificationCreate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Indicates the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Indicates the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public AgreementSpecificationCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the agreement specification
-   * @return name
-  **/
-  @Schema(description = "Name of the agreement specification")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementSpecificationCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the agreement specification is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the agreement specification is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecificationCreate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Agreement specification version
-   * @return version
-  **/
-  @Schema(description = "Agreement specification version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public AgreementSpecificationCreate serviceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * Get serviceCategory
-   * @return serviceCategory
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public CategoryRef getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-  public AgreementSpecificationCreate specCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-    return this;
-  }
-
-  public AgreementSpecificationCreate addSpecCharacteristicItem(AgreementSpecCharacteristic specCharacteristicItem) {
-    if (this.specCharacteristic == null) {
-      this.specCharacteristic = new ArrayList<>();
-    }
-    this.specCharacteristic.add(specCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get specCharacteristic
-   * @return specCharacteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecCharacteristic> getSpecCharacteristic() {
-    return specCharacteristic;
-  }
-
-  public void setSpecCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-  }
-
-  public AgreementSpecificationCreate relatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public AgreementSpecificationCreate addRelatedPartyItem(RelatedPartyRef relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedPartyRef> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public AgreementSpecificationCreate attachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-    return this;
-  }
-
-  public AgreementSpecificationCreate addAttachmentItem(AgreementAttachment attachmentItem) {
-    this.attachment.add(attachmentItem);
-    return this;
-  }
-
-  /**
-   * Get attachment
-   * @return attachment
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public List<AgreementAttachment> getAttachment() {
-    return attachment;
-  }
-
-  public void setAttachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-  }
-
-  public AgreementSpecificationCreate specificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-    return this;
-  }
-
-  public AgreementSpecificationCreate addSpecificationRelationshipItem(AgreementSpecificationRelationship specificationRelationshipItem) {
-    if (this.specificationRelationship == null) {
-      this.specificationRelationship = new ArrayList<>();
-    }
-    this.specificationRelationship.add(specificationRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get specificationRelationship
-   * @return specificationRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecificationRelationship> getSpecificationRelationship() {
-    return specificationRelationship;
-  }
-
-  public void setSpecificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-  }
-
-  public AgreementSpecificationCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementSpecificationCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementSpecificationCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecificationCreate agreementSpecificationCreate = (AgreementSpecificationCreate) o;
-    return Objects.equals(this.description, agreementSpecificationCreate.description) &&
-        Objects.equals(this.isBundle, agreementSpecificationCreate.isBundle) &&
-        Objects.equals(this.lastUpdate, agreementSpecificationCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, agreementSpecificationCreate.lifecycleStatus) &&
-        Objects.equals(this.name, agreementSpecificationCreate.name) &&
-        Objects.equals(this.validFor, agreementSpecificationCreate.validFor) &&
-        Objects.equals(this.version, agreementSpecificationCreate.version) &&
-        Objects.equals(this.serviceCategory, agreementSpecificationCreate.serviceCategory) &&
-        Objects.equals(this.specCharacteristic, agreementSpecificationCreate.specCharacteristic) &&
-        Objects.equals(this.relatedParty, agreementSpecificationCreate.relatedParty) &&
-        Objects.equals(this.attachment, agreementSpecificationCreate.attachment) &&
-        Objects.equals(this.specificationRelationship, agreementSpecificationCreate.specificationRelationship) &&
-        Objects.equals(this.type, agreementSpecificationCreate.type) &&
-        Objects.equals(this.schemaLocation, agreementSpecificationCreate.schemaLocation) &&
-        Objects.equals(this.baseType, agreementSpecificationCreate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, validFor, version, serviceCategory, specCharacteristic, relatedParty, attachment, specificationRelationship, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecificationCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    specificationRelationship: ").append(toIndentedString(specificationRelationship)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRef.java
deleted file mode 100644
index 58150aa920b9f53401035b1bffc713a0a24581a7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRef.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * AgreementSpecification reference. An AgreementSpecification represents a template of an agreement that can be used when establishing partnerships.
- */
-@Schema(description = "AgreementSpecification reference. An AgreementSpecification represents a template of an agreement that can be used when establishing partnerships.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecificationRef   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public AgreementSpecificationRef description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the agreement specification is about.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the agreement specification is about.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementSpecificationRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference URL of the agreement specification
-   * @return href
-  **/
-  @Schema(description = "Reference URL of the agreement specification")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementSpecificationRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the agreement specification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the agreement specification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementSpecificationRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the agreement specification
-   * @return name
-  **/
-  @Schema(description = "Name of the agreement specification")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementSpecificationRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecificationRef agreementSpecificationRef = (AgreementSpecificationRef) o;
-    return Objects.equals(this.description, agreementSpecificationRef.description) &&
-        Objects.equals(this.href, agreementSpecificationRef.href) &&
-        Objects.equals(this.id, agreementSpecificationRef.id) &&
-        Objects.equals(this.name, agreementSpecificationRef.name) &&
-        Objects.equals(this.referredType, agreementSpecificationRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, href, id, name, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecificationRef {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRelationship.java
deleted file mode 100644
index afba9f93f1c8ff9ade4911589234f9d16f8aa863..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationRelationship.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A relationship between agreement specifications. Typical relationships are substitution and dependency.
- */
-@Schema(description = "A relationship between agreement specifications. Typical relationships are substitution and dependency.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecificationRelationship   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("type")
-  private String typeAgreementSpecificationRelationship = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementSpecificationRelationship href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of an agreement specification.
-   * @return href
-  **/
-  @Schema(description = "Reference of an agreement specification.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementSpecificationRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the related agreement specification.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the related agreement specification.")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementSpecificationRelationship typeAgreementSpecificationRelationship(String type) {
-    this.typeAgreementSpecificationRelationship = type;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as, substitution or dependency.
-   * @return type
-  **/
-  @Schema(description = "Type of relationship such as, substitution or dependency.")
-
-
-  public String getTypeAgreementSpecificationRelationship() {
-    return typeAgreementSpecificationRelationship;
-  }
-
-  public void setTypeAgreementSpecificationRelationship(String type) {
-    this.typeAgreementSpecificationRelationship = type;
-  }
-
-  public AgreementSpecificationRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the relationship is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the relationship is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecificationRelationship type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecificationRelationship agreementSpecificationRelationship = (AgreementSpecificationRelationship) o;
-    return Objects.equals(this.href, agreementSpecificationRelationship.href) &&
-        Objects.equals(this.id, agreementSpecificationRelationship.id) &&
-        Objects.equals(this.type, agreementSpecificationRelationship.type) &&
-        Objects.equals(this.validFor, agreementSpecificationRelationship.validFor) &&
-        Objects.equals(this.type, agreementSpecificationRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, type, validFor, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecificationRelationship {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationUpdate.java
deleted file mode 100644
index f9a0476c636edc279a814fa84963dd975d47b988..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementSpecificationUpdate.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A template of an agreement that can be used when establishing partnerships. Skipped properties: id,href,id,href
- */
-@Schema(description = "A template of an agreement that can be used when establishing partnerships. Skipped properties: id,href,id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementSpecificationUpdate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("isBundle")
-  private Boolean isBundle = null;
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-  @JsonProperty("lifecycleStatus")
-  private String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("serviceCategory")
-  private CategoryRef serviceCategory = null;
-
-  @JsonProperty("specCharacteristic")
-  @Valid
-  private List<AgreementSpecCharacteristic> specCharacteristic = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedPartyRef> relatedParty = null;
-
-  @JsonProperty("attachment")
-  @Valid
-  private List<AgreementAttachment> attachment = null;
-
-  @JsonProperty("specificationRelationship")
-  @Valid
-  private List<AgreementSpecificationRelationship> specificationRelationship = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public AgreementSpecificationUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the agreement specification is about.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the agreement specification is about.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementSpecificationUpdate isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.
-   * @return isBundle
-  **/
-  @Schema(description = "Indicates that this agreement specification is a grouping of other agreement specifications. The list of bundled agreement specifications is provided via the specificationRelationship property.")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public AgreementSpecificationUpdate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  public AgreementSpecificationUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Indicates the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Indicates the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public AgreementSpecificationUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the agreement specification
-   * @return name
-  **/
-  @Schema(description = "Name of the agreement specification")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementSpecificationUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the agreement specification is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the agreement specification is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementSpecificationUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Agreement specification version
-   * @return version
-  **/
-  @Schema(description = "Agreement specification version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public AgreementSpecificationUpdate serviceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * Get serviceCategory
-   * @return serviceCategory
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public CategoryRef getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(CategoryRef serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-  public AgreementSpecificationUpdate specCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-    return this;
-  }
-
-  public AgreementSpecificationUpdate addSpecCharacteristicItem(AgreementSpecCharacteristic specCharacteristicItem) {
-    if (this.specCharacteristic == null) {
-      this.specCharacteristic = new ArrayList<>();
-    }
-    this.specCharacteristic.add(specCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get specCharacteristic
-   * @return specCharacteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecCharacteristic> getSpecCharacteristic() {
-    return specCharacteristic;
-  }
-
-  public void setSpecCharacteristic(List<AgreementSpecCharacteristic> specCharacteristic) {
-    this.specCharacteristic = specCharacteristic;
-  }
-
-  public AgreementSpecificationUpdate relatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public AgreementSpecificationUpdate addRelatedPartyItem(RelatedPartyRef relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedPartyRef> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedPartyRef> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public AgreementSpecificationUpdate attachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-    return this;
-  }
-
-  public AgreementSpecificationUpdate addAttachmentItem(AgreementAttachment attachmentItem) {
-    if (this.attachment == null) {
-      this.attachment = new ArrayList<>();
-    }
-    this.attachment.add(attachmentItem);
-    return this;
-  }
-
-  /**
-   * Get attachment
-   * @return attachment
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementAttachment> getAttachment() {
-    return attachment;
-  }
-
-  public void setAttachment(List<AgreementAttachment> attachment) {
-    this.attachment = attachment;
-  }
-
-  public AgreementSpecificationUpdate specificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-    return this;
-  }
-
-  public AgreementSpecificationUpdate addSpecificationRelationshipItem(AgreementSpecificationRelationship specificationRelationshipItem) {
-    if (this.specificationRelationship == null) {
-      this.specificationRelationship = new ArrayList<>();
-    }
-    this.specificationRelationship.add(specificationRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get specificationRelationship
-   * @return specificationRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementSpecificationRelationship> getSpecificationRelationship() {
-    return specificationRelationship;
-  }
-
-  public void setSpecificationRelationship(List<AgreementSpecificationRelationship> specificationRelationship) {
-    this.specificationRelationship = specificationRelationship;
-  }
-
-  public AgreementSpecificationUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementSpecificationUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementSpecificationUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementSpecificationUpdate agreementSpecificationUpdate = (AgreementSpecificationUpdate) o;
-    return Objects.equals(this.description, agreementSpecificationUpdate.description) &&
-        Objects.equals(this.isBundle, agreementSpecificationUpdate.isBundle) &&
-        Objects.equals(this.lastUpdate, agreementSpecificationUpdate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, agreementSpecificationUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, agreementSpecificationUpdate.name) &&
-        Objects.equals(this.validFor, agreementSpecificationUpdate.validFor) &&
-        Objects.equals(this.version, agreementSpecificationUpdate.version) &&
-        Objects.equals(this.serviceCategory, agreementSpecificationUpdate.serviceCategory) &&
-        Objects.equals(this.specCharacteristic, agreementSpecificationUpdate.specCharacteristic) &&
-        Objects.equals(this.relatedParty, agreementSpecificationUpdate.relatedParty) &&
-        Objects.equals(this.attachment, agreementSpecificationUpdate.attachment) &&
-        Objects.equals(this.specificationRelationship, agreementSpecificationUpdate.specificationRelationship) &&
-        Objects.equals(this.type, agreementSpecificationUpdate.type) &&
-        Objects.equals(this.schemaLocation, agreementSpecificationUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, agreementSpecificationUpdate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, validFor, version, serviceCategory, specCharacteristic, relatedParty, attachment, specificationRelationship, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementSpecificationUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    specificationRelationship: ").append(toIndentedString(specificationRelationship)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementTermOrCondition.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementTermOrCondition.java
deleted file mode 100644
index 838e9dbd449de1f4868e12d13d3c55f9a427f3e9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementTermOrCondition.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Aspects of the agreement not formally specified elsewhere in the agreement and that cannot be captured elsewhere in a formal notation, or automatically monitored and require a more human level of management.
- */
-@Schema(description = "Aspects of the agreement not formally specified elsewhere in the agreement and that cannot be captured elsewhere in a formal notation, or automatically monitored and require a more human level of management.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementTermOrCondition   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AgreementTermOrCondition description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Text that explains the term or condition of the agreement.
-   * @return description
-  **/
-  @Schema(description = "Text that explains the term or condition of the agreement.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementTermOrCondition id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique number assigned for reference.
-   * @return id
-  **/
-  @Schema(description = "Unique number assigned for reference.")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementTermOrCondition validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period of time during which the term or condition of the agreement applies.
-   * @return validFor
-  **/
-  @Schema(description = "The period of time during which the term or condition of the agreement applies.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AgreementTermOrCondition type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementTermOrCondition agreementTermOrCondition = (AgreementTermOrCondition) o;
-    return Objects.equals(this.description, agreementTermOrCondition.description) &&
-        Objects.equals(this.id, agreementTermOrCondition.id) &&
-        Objects.equals(this.validFor, agreementTermOrCondition.validFor) &&
-        Objects.equals(this.type, agreementTermOrCondition.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, id, validFor, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementTermOrCondition {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementUpdate.java b/src/main/java/org/etsi/osl/tmf/am651/model/AgreementUpdate.java
deleted file mode 100644
index b98ce9b6f5106c869a2bf53c4ecd93fdb5a0f813..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/AgreementUpdate.java
+++ /dev/null
@@ -1,581 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications. Skipped properties: id,href,id,href,completionDate
- */
-@Schema(description = "An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications. Skipped properties: id,href,id,href,completionDate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class AgreementUpdate   {
-  @JsonProperty("agreementPeriod")
-  private TimePeriod agreementPeriod = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("documentNumber")
-  private Integer documentNumber = null;
-
-  @JsonProperty("initialDate")
-  private OffsetDateTime initialDate = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("statementOfIntent")
-  private String statementOfIntent = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("type")
-  private String typeAgreementUpdate = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("agreementSpecification")
-  private AgreementSpecificationRef agreementSpecification = null;
-
-  @JsonProperty("agreementItem")
-  @Valid
-  private List<AgreementItem> agreementItem = null;
-
-  @JsonProperty("engagedPartyRole")
-  @Valid
-  private List<PartyRoleRef> engagedPartyRole = null;
-
-  @JsonProperty("agreementAuthorization")
-  @Valid
-  private List<AgreementAuthorization> agreementAuthorization = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("associatedAgreement")
-  @Valid
-  private List<AgreementRef> associatedAgreement = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public AgreementUpdate agreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-    return this;
-  }
-
-  /**
-   * The time period during which the Agreement is in effect.
-   * @return agreementPeriod
-  **/
-  @Schema(description = "The time period during which the Agreement is in effect.")
-
-  @Valid
-
-  public TimePeriod getAgreementPeriod() {
-    return agreementPeriod;
-  }
-
-  public void setAgreementPeriod(TimePeriod agreementPeriod) {
-    this.agreementPeriod = agreementPeriod;
-  }
-
-  public AgreementUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Narrative that explains the agreement and details about the it , such as why the agreement is taking place.
-   * @return description
-  **/
-  @Schema(description = "Narrative that explains the agreement and details about the it , such as why the agreement is taking place.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AgreementUpdate documentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-    return this;
-  }
-
-  /**
-   * A reference number assigned to an Agreement that follows a prescribed numbering system.
-   * @return documentNumber
-  **/
-  @Schema(description = "A reference number assigned to an Agreement that follows a prescribed numbering system.")
-
-
-  public Integer getDocumentNumber() {
-    return documentNumber;
-  }
-
-  public void setDocumentNumber(Integer documentNumber) {
-    this.documentNumber = documentNumber;
-  }
-
-  public AgreementUpdate initialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-    return this;
-  }
-
-  /**
-   * Date at which the agreement was initialized
-   * @return initialDate
-  **/
-  @Schema(description = "Date at which the agreement was initialized")
-
-  @Valid
-
-  public OffsetDateTime getInitialDate() {
-    return initialDate;
-  }
-
-  public void setInitialDate(OffsetDateTime initialDate) {
-    this.initialDate = initialDate;
-  }
-
-  public AgreementUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A human-readable name for the agreement
-   * @return name
-  **/
-  @Schema(description = "A human-readable name for the agreement")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementUpdate statementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-    return this;
-  }
-
-  /**
-   * An overview and goals of the Agreement.
-   * @return statementOfIntent
-  **/
-  @Schema(description = "An overview and goals of the Agreement.")
-
-
-  public String getStatementOfIntent() {
-    return statementOfIntent;
-  }
-
-  public void setStatementOfIntent(String statementOfIntent) {
-    this.statementOfIntent = statementOfIntent;
-  }
-
-  public AgreementUpdate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * The current status of the agreement. Typical values are: in process, approved and rejected.
-   * @return status
-  **/
-  @Schema(description = "The current status of the agreement. Typical values are: in process, approved and rejected.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public AgreementUpdate typeAgreementUpdate(String type) {
-    this.typeAgreementUpdate = type;
-    return this;
-  }
-
-  /**
-   * The type of the agreement. For example \"commercial\".
-   * @return type
-  **/
-  @Schema(description = "The type of the agreement. For example \"commercial\".")
-
-
-  public String getTypeAgreementUpdate() {
-    return typeAgreementUpdate;
-  }
-
-  public void setTypeAgreementUpdate(String type) {
-    this.typeAgreementUpdate = type;
-  }
-
-  public AgreementUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * A string identifying the version of the agreement.
-   * @return version
-  **/
-  @Schema(description = "A string identifying the version of the agreement.")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public AgreementUpdate agreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-    return this;
-  }
-
-  /**
-   * Get agreementSpecification
-   * @return agreementSpecification
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public AgreementSpecificationRef getAgreementSpecification() {
-    return agreementSpecification;
-  }
-
-  public void setAgreementSpecification(AgreementSpecificationRef agreementSpecification) {
-    this.agreementSpecification = agreementSpecification;
-  }
-
-  public AgreementUpdate agreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-    return this;
-  }
-
-  public AgreementUpdate addAgreementItemItem(AgreementItem agreementItemItem) {
-    if (this.agreementItem == null) {
-      this.agreementItem = new ArrayList<>();
-    }
-    this.agreementItem.add(agreementItemItem);
-    return this;
-  }
-
-  /**
-   * Get agreementItem
-   * @return agreementItem
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementItem> getAgreementItem() {
-    return agreementItem;
-  }
-
-  public void setAgreementItem(List<AgreementItem> agreementItem) {
-    this.agreementItem = agreementItem;
-  }
-
-  public AgreementUpdate engagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-    return this;
-  }
-
-  public AgreementUpdate addEngagedPartyRoleItem(PartyRoleRef engagedPartyRoleItem) {
-    if (this.engagedPartyRole == null) {
-      this.engagedPartyRole = new ArrayList<>();
-    }
-    this.engagedPartyRole.add(engagedPartyRoleItem);
-    return this;
-  }
-
-  /**
-   * Get engagedPartyRole
-   * @return engagedPartyRole
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PartyRoleRef> getEngagedPartyRole() {
-    return engagedPartyRole;
-  }
-
-  public void setEngagedPartyRole(List<PartyRoleRef> engagedPartyRole) {
-    this.engagedPartyRole = engagedPartyRole;
-  }
-
-  public AgreementUpdate agreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-    return this;
-  }
-
-  public AgreementUpdate addAgreementAuthorizationItem(AgreementAuthorization agreementAuthorizationItem) {
-    if (this.agreementAuthorization == null) {
-      this.agreementAuthorization = new ArrayList<>();
-    }
-    this.agreementAuthorization.add(agreementAuthorizationItem);
-    return this;
-  }
-
-  /**
-   * Get agreementAuthorization
-   * @return agreementAuthorization
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementAuthorization> getAgreementAuthorization() {
-    return agreementAuthorization;
-  }
-
-  public void setAgreementAuthorization(List<AgreementAuthorization> agreementAuthorization) {
-    this.agreementAuthorization = agreementAuthorization;
-  }
-
-  public AgreementUpdate characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public AgreementUpdate addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Get characteristic
-   * @return characteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public AgreementUpdate associatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-    return this;
-  }
-
-  public AgreementUpdate addAssociatedAgreementItem(AgreementRef associatedAgreementItem) {
-    if (this.associatedAgreement == null) {
-      this.associatedAgreement = new ArrayList<>();
-    }
-    this.associatedAgreement.add(associatedAgreementItem);
-    return this;
-  }
-
-  /**
-   * Get associatedAgreement
-   * @return associatedAgreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAssociatedAgreement() {
-    return associatedAgreement;
-  }
-
-  public void setAssociatedAgreement(List<AgreementRef> associatedAgreement) {
-    this.associatedAgreement = associatedAgreement;
-  }
-
-  public AgreementUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public AgreementUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementUpdate agreementUpdate = (AgreementUpdate) o;
-    return Objects.equals(this.agreementPeriod, agreementUpdate.agreementPeriod) &&
-        Objects.equals(this.description, agreementUpdate.description) &&
-        Objects.equals(this.documentNumber, agreementUpdate.documentNumber) &&
-        Objects.equals(this.initialDate, agreementUpdate.initialDate) &&
-        Objects.equals(this.name, agreementUpdate.name) &&
-        Objects.equals(this.statementOfIntent, agreementUpdate.statementOfIntent) &&
-        Objects.equals(this.status, agreementUpdate.status) &&
-        Objects.equals(this.type, agreementUpdate.type) &&
-        Objects.equals(this.version, agreementUpdate.version) &&
-        Objects.equals(this.agreementSpecification, agreementUpdate.agreementSpecification) &&
-        Objects.equals(this.agreementItem, agreementUpdate.agreementItem) &&
-        Objects.equals(this.engagedPartyRole, agreementUpdate.engagedPartyRole) &&
-        Objects.equals(this.agreementAuthorization, agreementUpdate.agreementAuthorization) &&
-        Objects.equals(this.characteristic, agreementUpdate.characteristic) &&
-        Objects.equals(this.associatedAgreement, agreementUpdate.associatedAgreement) &&
-        Objects.equals(this.type, agreementUpdate.type) &&
-        Objects.equals(this.schemaLocation, agreementUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, agreementUpdate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(agreementPeriod, description, documentNumber, initialDate, name, statementOfIntent, status, type, version, agreementSpecification, agreementItem, engagedPartyRole, agreementAuthorization, characteristic, associatedAgreement, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementUpdate {\n");
-    
-    sb.append("    agreementPeriod: ").append(toIndentedString(agreementPeriod)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    documentNumber: ").append(toIndentedString(documentNumber)).append("\n");
-    sb.append("    initialDate: ").append(toIndentedString(initialDate)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    statementOfIntent: ").append(toIndentedString(statementOfIntent)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    agreementSpecification: ").append(toIndentedString(agreementSpecification)).append("\n");
-    sb.append("    agreementItem: ").append(toIndentedString(agreementItem)).append("\n");
-    sb.append("    engagedPartyRole: ").append(toIndentedString(engagedPartyRole)).append("\n");
-    sb.append("    agreementAuthorization: ").append(toIndentedString(agreementAuthorization)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    associatedAgreement: ").append(toIndentedString(associatedAgreement)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/CategoryRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/CategoryRef.java
deleted file mode 100644
index 8b20afb12fafc7e36a0bb464697c10b2444680a4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/CategoryRef.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * The category for grouping recommendations
- */
-@Schema(description = "The category for grouping recommendations")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class CategoryRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public CategoryRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hypertext Reference of the category
-   * @return href
-  **/
-  @Schema(description = "Hypertext Reference of the category")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CategoryRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of category
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of category")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CategoryRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the category.
-   * @return name
-  **/
-  @Schema(description = "Name of the category.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public CategoryRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryRef categoryRef = (CategoryRef) o;
-    return Objects.equals(this.href, categoryRef.href) &&
-        Objects.equals(this.id, categoryRef.id) &&
-        Objects.equals(this.name, categoryRef.name) &&
-        Objects.equals(this.referredType, categoryRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/am651/model/Characteristic.java
deleted file mode 100644
index b00b36d00f59c54925af803122ee4bf98a09f6ff..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/Characteristic.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class Characteristic   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("value")
-  private String value = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  public Characteristic name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the characteristic
-   * @return name
-  **/
-  @Schema(description = "Name of the characteristic")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Characteristic value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * Value of the characteristic
-   * @return value
-  **/
-  @Schema(description = "Value of the characteristic")
-
-
-  public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-  public Characteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public Characteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Characteristic characteristic = (Characteristic) o;
-    return Objects.equals(this.name, characteristic.name) &&
-        Objects.equals(this.value, characteristic.value) &&
-        Objects.equals(this.type, characteristic.type) &&
-        Objects.equals(this.schemaLocation, characteristic.schemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, value, type, schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Characteristic {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/Error.java b/src/main/java/org/etsi/osl/tmf/am651/model/Error.java
deleted file mode 100644
index e042876bf3dbfbbb5a4b28e31c9cd38a97bc2327..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/Error.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Error
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private Integer reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application related code.
-   * @return code
-  **/
-  @Schema(description = "Application related code.")
-  @NotNull
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(Integer reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Text that explains the reason for error.
-   * @return reason
-  **/
-  @Schema(description = "Text that explains the reason for error.")
-  @NotNull
-
-
-  public Integer getReason() {
-    return reason;
-  }
-
-  public void setReason(Integer reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * (optional) Text that provide more details and corrective actions related to the error.
-   * @return message
-  **/
-  @Schema(description = "(optional) Text that provide more details and corrective actions related to the error.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * (optional) http error code extension like 400-2
-   * @return status
-  **/
-  @Schema(description = "(optional) http error code extension like 400-2")
-
-
-  public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * (optional) A URL to online documentation that provides more information about the error.
-   * @return referenceError
-  **/
-  @Schema(description = "(optional) A URL to online documentation that provides more information about the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * (optional) The class type of a REST resource.
-   * @return type
-  **/
-  @Schema(description = "(optional) The class type of a REST resource.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * (optional) A link to the schema describing a REST resource.
-   * @return schemaLocation
-  **/
-  @Schema(description = "(optional) A link to the schema describing a REST resource.")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.type, error.type) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, type, schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscription.java
deleted file mode 100644
index 88709518341b08b1a9f8bdb24eea862a32404a48..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscription.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscription
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscriptionInput.java
deleted file mode 100644
index cd4755bb9f37f68298d95bbb1253bb69dff556cb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscriptionInput
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/PartyRoleRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/PartyRoleRef.java
deleted file mode 100644
index eb84f917500e155c19d83a8ff8691aa589315437..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/PartyRoleRef.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Party role reference. A party role represents the part played by a party in a given context.
- */
-@Schema(description = "Party role reference. A party role represents the part played by a party in a given context.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class PartyRoleRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("partyId")
-  private String partyId = null;
-
-  @JsonProperty("partyName")
-  private String partyName = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public PartyRoleRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the product
-   * @return href
-  **/
-  @Schema(description = "Reference of the product")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyRoleRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the product
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the product")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyRoleRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of the referred party role.
-   * @return name
-  **/
-  @Schema(description = "The name of the referred party role.")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyRoleRef partyId(String partyId) {
-    this.partyId = partyId;
-    return this;
-  }
-
-  /**
-   * The identifier of the engaged party that is linked to the PartyRole object.
-   * @return partyId
-  **/
-  @Schema(description = "The identifier of the engaged party that is linked to the PartyRole object.")
-
-
-  public String getPartyId() {
-    return partyId;
-  }
-
-  public void setPartyId(String partyId) {
-    this.partyId = partyId;
-  }
-
-  public PartyRoleRef partyName(String partyName) {
-    this.partyName = partyName;
-    return this;
-  }
-
-  /**
-   * The name of the engaged party that is linked to the PartyRole object.
-   * @return partyName
-  **/
-  @Schema(description = "The name of the engaged party that is linked to the PartyRole object.")
-
-
-  public String getPartyName() {
-    return partyName;
-  }
-
-  public void setPartyName(String partyName) {
-    this.partyName = partyName;
-  }
-
-  public PartyRoleRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleRef partyRoleRef = (PartyRoleRef) o;
-    return Objects.equals(this.href, partyRoleRef.href) &&
-        Objects.equals(this.id, partyRoleRef.id) &&
-        Objects.equals(this.name, partyRoleRef.name) &&
-        Objects.equals(this.partyId, partyRoleRef.partyId) &&
-        Objects.equals(this.partyName, partyRoleRef.partyName) &&
-        Objects.equals(this.referredType, partyRoleRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, partyId, partyName, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    partyId: ").append(toIndentedString(partyId)).append("\n");
-    sb.append("    partyName: ").append(toIndentedString(partyName)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/ProductOfferingRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/ProductOfferingRef.java
deleted file mode 100644
index 07b20c4d6cf69676c23c1c73aefcbaccb6f11d62..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/ProductOfferingRef.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.
- */
-@Schema(description = "ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class ProductOfferingRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ProductOfferingRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the product offering
-   * @return href
-  **/
-  @Schema(description = "Reference of the product offering")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the product offering
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the product offering")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the product offering
-   * @return name
-  **/
-  @Schema(description = "Name of the product offering")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingRef productOfferingRef = (ProductOfferingRef) o;
-    return Objects.equals(this.href, productOfferingRef.href) &&
-        Objects.equals(this.id, productOfferingRef.id) &&
-        Objects.equals(this.name, productOfferingRef.name) &&
-        Objects.equals(this.referredType, productOfferingRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am651/model/RelatedPartyRef.java b/src/main/java/org/etsi/osl/tmf/am651/model/RelatedPartyRef.java
deleted file mode 100644
index 76fb45b1af8b2afc8e4a5f9b8fc59922105ed18f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am651/model/RelatedPartyRef.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am651.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * RelatedParty reference. A related party defines party or party role linked to a specific entity.
- */
-@Schema(description = "RelatedParty reference. A related party defines party or party role linked to a specific entity.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:51:58.660+03:00")
-
-public class RelatedPartyRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public RelatedPartyRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related party, could be a party reference or a party role reference
-   * @return href
-  **/
-  @Schema(description = "Reference of the related party, could be a party reference or a party role reference")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public RelatedPartyRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related party
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related party")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public RelatedPartyRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related party
-   * @return name
-  **/
-  @Schema(description = "Name of the related party")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public RelatedPartyRef role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Role of the related party.
-   * @return role
-  **/
-  @Schema(description = "Role of the related party.")
-
-
-  public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedPartyRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedPartyRef relatedPartyRef = (RelatedPartyRef) o;
-    return Objects.equals(this.href, relatedPartyRef.href) &&
-        Objects.equals(this.id, relatedPartyRef.id) &&
-        Objects.equals(this.name, relatedPartyRef.name) &&
-        Objects.equals(this.role, relatedPartyRef.role) &&
-        Objects.equals(this.referredType, relatedPartyRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, role, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedPartyRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/Account.java b/src/main/java/org/etsi/osl/tmf/am666/model/Account.java
deleted file mode 100644
index 5cea66170add5dc8d549737e064357b55b23d419..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/Account.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Generic Account structure used to define commonalities between sub concepts of PartyAccount and Financial Account.
- */
-@Schema(description = "Generic Account structure used to define commonalities between sub concepts of PartyAccount and Financial Account.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class Account   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Account id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Account href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Account accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public Account description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Account lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public Account name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Account state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public Account accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public Account addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public Account accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public Account addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public Account contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public Account addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public Account creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public Account relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public Account addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public Account taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public Account addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public Account baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Account schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Account type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Account account = (Account) o;
-    return Objects.equals(this.id, account.id) &&
-        Objects.equals(this.href, account.href) &&
-        Objects.equals(this.accountType, account.accountType) &&
-        Objects.equals(this.description, account.description) &&
-        Objects.equals(this.lastModified, account.lastModified) &&
-        Objects.equals(this.name, account.name) &&
-        Objects.equals(this.state, account.state) &&
-        Objects.equals(this.accountBalance, account.accountBalance) &&
-        Objects.equals(this.accountRelationship, account.accountRelationship) &&
-        Objects.equals(this.contact, account.contact) &&
-        Objects.equals(this.creditLimit, account.creditLimit) &&
-        Objects.equals(this.relatedParty, account.relatedParty) &&
-        Objects.equals(this.taxExemption, account.taxExemption) &&
-        Objects.equals(this.baseType, account.baseType) &&
-        Objects.equals(this.schemaLocation, account.schemaLocation) &&
-        Objects.equals(this.type, account.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, accountType, description, lastModified, name, state, accountBalance, accountRelationship, contact, creditLimit, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Account {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/AccountBalance.java b/src/main/java/org/etsi/osl/tmf/am666/model/AccountBalance.java
deleted file mode 100644
index ac484298748b8569928e2979c6bf3405aae864d8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/AccountBalance.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Balances linked to the account
- */
-@Schema(description = "Balances linked to the account")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class AccountBalance   {
-  @JsonProperty("balanceType")
-  private String balanceType = null;
-
-  @JsonProperty("amount")
-  private Money amount = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AccountBalance balanceType(String balanceType) {
-    this.balanceType = balanceType;
-    return this;
-  }
-
-  /**
-   * Type of the balance : deposit balance, disputed balance, loyalty balance, receivable balance...
-   * @return balanceType
-  **/
-  @Schema(description = "Type of the balance : deposit balance, disputed balance, loyalty balance, receivable balance...")
-  @NotNull
-
-
-  public String getBalanceType() {
-    return balanceType;
-  }
-
-  public void setBalanceType(String balanceType) {
-    this.balanceType = balanceType;
-  }
-
-  public AccountBalance amount(Money amount) {
-    this.amount = amount;
-    return this;
-  }
-
-  /**
-   * Balance amount
-   * @return amount
-  **/
-  @Schema(description = "Balance amount")
-  @NotNull
-
-  @Valid
-
-  public Money getAmount() {
-    return amount;
-  }
-
-  public void setAmount(Money amount) {
-    this.amount = amount;
-  }
-
-  public AccountBalance validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Balance validity period
-   * @return validFor
-  **/
-  @Schema(description = "Balance validity period")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AccountBalance baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AccountBalance schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AccountBalance type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AccountBalance accountBalance = (AccountBalance) o;
-    return Objects.equals(this.balanceType, accountBalance.balanceType) &&
-        Objects.equals(this.amount, accountBalance.amount) &&
-        Objects.equals(this.validFor, accountBalance.validFor) &&
-        Objects.equals(this.baseType, accountBalance.baseType) &&
-        Objects.equals(this.schemaLocation, accountBalance.schemaLocation) &&
-        Objects.equals(this.type, accountBalance.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(balanceType, amount, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AccountBalance {\n");
-    
-    sb.append("    balanceType: ").append(toIndentedString(balanceType)).append("\n");
-    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/AccountRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/AccountRef.java
deleted file mode 100644
index 309cd49d899c0d6879662060d7a67f8f960bf48a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/AccountRef.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Account reference. A account may be a party account or a financial account.
- */
-@Schema(description = "Account reference. A account may be a party account or a financial account.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-@Entity(name = "AccountRef")
-public class AccountRef  extends  BaseRootNamedEntity{
-  @JsonProperty("id")
-  private String id = null;
-
-  
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public AccountRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
- 
-
-  /**
-   * Detailed description of the account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  
-  public AccountRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AccountRef accountRef = (AccountRef) o;
-    return Objects.equals(this.id, accountRef.id) &&
-        Objects.equals(this.href, accountRef.href) &&
-        Objects.equals(this.description, accountRef.description) &&
-        Objects.equals(this.name, accountRef.name) &&
-        Objects.equals(this.baseType, accountRef.baseType) &&
-        Objects.equals(this.schemaLocation, accountRef.schemaLocation) &&
-        Objects.equals(this.type, accountRef.type) &&
-        Objects.equals(this.referredType, accountRef.referredType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AccountRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/AccountRelationship.java b/src/main/java/org/etsi/osl/tmf/am666/model/AccountRelationship.java
deleted file mode 100644
index 085da7fb8b00c9031897fcbe7eafdc7e06d5a164..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/AccountRelationship.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Significant connection between accounts. For instance an aggregating account for a list of shop branches each having its own billing account.
- */
-@Schema(description = "Significant connection between accounts. For instance an aggregating account for a list of shop branches each having its own billing account.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class AccountRelationship   {
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("account")
-  private AccountRef account = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AccountRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship")
-  @NotNull
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public AccountRelationship account(AccountRef account) {
-    this.account = account;
-    return this;
-  }
-
-  /**
-   * Get account
-   * @return account
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public AccountRef getAccount() {
-    return account;
-  }
-
-  public void setAccount(AccountRef account) {
-    this.account = account;
-  }
-
-  public AccountRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Validity period of that relationship
-   * @return validFor
-  **/
-  @Schema(description = "Validity period of that relationship")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AccountRelationship baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AccountRelationship schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AccountRelationship type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AccountRelationship accountRelationship = (AccountRelationship) o;
-    return Objects.equals(this.relationshipType, accountRelationship.relationshipType) &&
-        Objects.equals(this.account, accountRelationship.account) &&
-        Objects.equals(this.validFor, accountRelationship.validFor) &&
-        Objects.equals(this.baseType, accountRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, accountRelationship.schemaLocation) &&
-        Objects.equals(this.type, accountRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(relationshipType, account, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AccountRelationship {\n");
-    
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/AccountTaxExemption.java b/src/main/java/org/etsi/osl/tmf/am666/model/AccountTaxExemption.java
deleted file mode 100644
index bd46b70b79e0874cc3559dce1148202ba6094ee3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/AccountTaxExemption.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Proof of freedom from taxes imposed by a taxing jurisdiction
- */
-@Schema(description = "Proof of freedom from taxes imposed by a taxing jurisdiction")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class AccountTaxExemption   {
-  @JsonProperty("certificateNumber")
-  private String certificateNumber = null;
-
-  @JsonProperty("issuingJurisdiction")
-  private String issuingJurisdiction = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public AccountTaxExemption certificateNumber(String certificateNumber) {
-    this.certificateNumber = certificateNumber;
-    return this;
-  }
-
-  /**
-   * Identifier of a document that shows proof of exemption from taxes for the taxing jurisdiction
-   * @return certificateNumber
-  **/
-  @Schema(description = "Identifier of a document that shows proof of exemption from taxes for the taxing jurisdiction")
-
-
-  public String getCertificateNumber() {
-    return certificateNumber;
-  }
-
-  public void setCertificateNumber(String certificateNumber) {
-    this.certificateNumber = certificateNumber;
-  }
-
-  public AccountTaxExemption issuingJurisdiction(String issuingJurisdiction) {
-    this.issuingJurisdiction = issuingJurisdiction;
-    return this;
-  }
-
-  /**
-   * Name of the taxing jurisdiction for which taxes are exempt
-   * @return issuingJurisdiction
-  **/
-  @Schema(description = "Name of the taxing jurisdiction for which taxes are exempt")
-  @NotNull
-
-
-  public String getIssuingJurisdiction() {
-    return issuingJurisdiction;
-  }
-
-  public void setIssuingJurisdiction(String issuingJurisdiction) {
-    this.issuingJurisdiction = issuingJurisdiction;
-  }
-
-  public AccountTaxExemption reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Reason of the tax exemption
-   * @return reason
-  **/
-  @Schema(description = "Reason of the tax exemption")
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public AccountTaxExemption validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Period for which the exemption is valid
-   * @return validFor
-  **/
-  @Schema(description = "Period for which the exemption is valid")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public AccountTaxExemption baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AccountTaxExemption schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AccountTaxExemption type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AccountTaxExemption accountTaxExemption = (AccountTaxExemption) o;
-    return Objects.equals(this.certificateNumber, accountTaxExemption.certificateNumber) &&
-        Objects.equals(this.issuingJurisdiction, accountTaxExemption.issuingJurisdiction) &&
-        Objects.equals(this.reason, accountTaxExemption.reason) &&
-        Objects.equals(this.validFor, accountTaxExemption.validFor) &&
-        Objects.equals(this.baseType, accountTaxExemption.baseType) &&
-        Objects.equals(this.schemaLocation, accountTaxExemption.schemaLocation) &&
-        Objects.equals(this.type, accountTaxExemption.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(certificateNumber, issuingJurisdiction, reason, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AccountTaxExemption {\n");
-    
-    sb.append("    certificateNumber: ").append(toIndentedString(certificateNumber)).append("\n");
-    sb.append("    issuingJurisdiction: ").append(toIndentedString(issuingJurisdiction)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormat.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillFormat.java
deleted file mode 100644
index 04970239b2fa9abe7d8ff9b8b6fa2e14419aacb5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormat.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of the way in which a bill is presented.
- */
-@Schema(description = "A detailed description of the way in which a bill is presented.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillFormat   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillFormat id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill format
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill format")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillFormat href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill format
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill format")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillFormat description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text for this bill format
-   * @return description
-  **/
-  @Schema(description = "An explanatory text for this bill format")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillFormat name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillFormat baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillFormat schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillFormat type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillFormat billFormat = (BillFormat) o;
-    return Objects.equals(this.id, billFormat.id) &&
-        Objects.equals(this.href, billFormat.href) &&
-        Objects.equals(this.description, billFormat.description) &&
-        Objects.equals(this.name, billFormat.name) &&
-        Objects.equals(this.baseType, billFormat.baseType) &&
-        Objects.equals(this.schemaLocation, billFormat.schemaLocation) &&
-        Objects.equals(this.type, billFormat.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillFormat {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatCreate.java
deleted file mode 100644
index 6e0e6a9e42ec98379145d1b3923789d02479dfb8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatCreate.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of the way in which a bill is presented. Skipped properties: id,href
- */
-@Schema(description = "A detailed description of the way in which a bill is presented. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillFormatCreate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillFormatCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text for this bill format
-   * @return description
-  **/
-  @Schema(description = "An explanatory text for this bill format")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillFormatCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillFormatCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillFormatCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillFormatCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillFormatCreate billFormatCreate = (BillFormatCreate) o;
-    return Objects.equals(this.description, billFormatCreate.description) &&
-        Objects.equals(this.name, billFormatCreate.name) &&
-        Objects.equals(this.baseType, billFormatCreate.baseType) &&
-        Objects.equals(this.schemaLocation, billFormatCreate.schemaLocation) &&
-        Objects.equals(this.type, billFormatCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillFormatCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRef.java
deleted file mode 100644
index f1438a995abde01f423fc85fce416de5134f00ee..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * BillFormat reference. A bill format is a description of the way in which a bill is presented.
- */
-@Schema(description = "BillFormat reference. A bill format is a description of the way in which a bill is presented.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillFormatRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillFormatRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill format
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill format")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillFormatRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill format
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill format")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillFormatRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillFormatRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillFormatRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillFormatRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillFormatRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillFormatRef billFormatRef = (BillFormatRef) o;
-    return Objects.equals(this.id, billFormatRef.id) &&
-        Objects.equals(this.href, billFormatRef.href) &&
-        Objects.equals(this.name, billFormatRef.name) &&
-        Objects.equals(this.baseType, billFormatRef.baseType) &&
-        Objects.equals(this.schemaLocation, billFormatRef.schemaLocation) &&
-        Objects.equals(this.type, billFormatRef.type) &&
-        Objects.equals(this.referredType, billFormatRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillFormatRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRefOrValue.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRefOrValue.java
deleted file mode 100644
index af948ee498593e03f1ee1046e275853a07e38cef..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatRefOrValue.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An attachment by value or by reference.
- */
-@Schema(description = "An attachment by value or by reference.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillFormatRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillFormatRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill format
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill format")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillFormatRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill format
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill format")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillFormatRefOrValue description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text for this bill format
-   * @return description
-  **/
-  @Schema(description = "An explanatory text for this bill format")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillFormatRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillFormatRefOrValue baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillFormatRefOrValue schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillFormatRefOrValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillFormatRefOrValue referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillFormatRefOrValue billFormatRefOrValue = (BillFormatRefOrValue) o;
-    return Objects.equals(this.id, billFormatRefOrValue.id) &&
-        Objects.equals(this.href, billFormatRefOrValue.href) &&
-        Objects.equals(this.description, billFormatRefOrValue.description) &&
-        Objects.equals(this.name, billFormatRefOrValue.name) &&
-        Objects.equals(this.baseType, billFormatRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, billFormatRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, billFormatRefOrValue.type) &&
-        Objects.equals(this.referredType, billFormatRefOrValue.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillFormatRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatUpdate.java
deleted file mode 100644
index fce0c24030cf8bc016fdfb79b133443aed798094..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillFormatUpdate.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of the way in which a bill is presented. Skipped properties: id,href
- */
-@Schema(description = "A detailed description of the way in which a bill is presented. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillFormatUpdate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillFormatUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text for this bill format
-   * @return description
-  **/
-  @Schema(description = "An explanatory text for this bill format")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillFormatUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillFormatUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillFormatUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillFormatUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillFormatUpdate billFormatUpdate = (BillFormatUpdate) o;
-    return Objects.equals(this.description, billFormatUpdate.description) &&
-        Objects.equals(this.name, billFormatUpdate.name) &&
-        Objects.equals(this.baseType, billFormatUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, billFormatUpdate.schemaLocation) &&
-        Objects.equals(this.type, billFormatUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillFormatUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMedia.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMedia.java
deleted file mode 100644
index 58c2faaccaa87fcce8a360b48c78c79ff1a545c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMedia.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page.
- */
-@Schema(description = "A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillPresentationMedia   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillPresentationMedia id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill presentation media
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill presentation media")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillPresentationMedia href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill presentation media
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill presentation media")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillPresentationMedia description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text describing this bill presentation media
-   * @return description
-  **/
-  @Schema(description = "An explanatory text describing this bill presentation media")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillPresentationMedia name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillPresentationMedia baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillPresentationMedia schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillPresentationMedia type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillPresentationMedia billPresentationMedia = (BillPresentationMedia) o;
-    return Objects.equals(this.id, billPresentationMedia.id) &&
-        Objects.equals(this.href, billPresentationMedia.href) &&
-        Objects.equals(this.description, billPresentationMedia.description) &&
-        Objects.equals(this.name, billPresentationMedia.name) &&
-        Objects.equals(this.baseType, billPresentationMedia.baseType) &&
-        Objects.equals(this.schemaLocation, billPresentationMedia.schemaLocation) &&
-        Objects.equals(this.type, billPresentationMedia.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillPresentationMedia {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaCreate.java
deleted file mode 100644
index 3f291976a40ec6eaa6265bf3df7ff93f4dbe8ec6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaCreate.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page. Skipped properties: id,href
- */
-@Schema(description = "A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillPresentationMediaCreate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillPresentationMediaCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text describing this bill presentation media
-   * @return description
-  **/
-  @Schema(description = "An explanatory text describing this bill presentation media")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillPresentationMediaCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillPresentationMediaCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillPresentationMediaCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillPresentationMediaCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillPresentationMediaCreate billPresentationMediaCreate = (BillPresentationMediaCreate) o;
-    return Objects.equals(this.description, billPresentationMediaCreate.description) &&
-        Objects.equals(this.name, billPresentationMediaCreate.name) &&
-        Objects.equals(this.baseType, billPresentationMediaCreate.baseType) &&
-        Objects.equals(this.schemaLocation, billPresentationMediaCreate.schemaLocation) &&
-        Objects.equals(this.type, billPresentationMediaCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillPresentationMediaCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRef.java
deleted file mode 100644
index edfa2865e7f5ecb6c1ee62f7d26034f448806480..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * PresentationMedia reference. A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page.
- */
-@Schema(description = "PresentationMedia reference. A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillPresentationMediaRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillPresentationMediaRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill presentation media
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill presentation media")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillPresentationMediaRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill presentation media
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill presentation media")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillPresentationMediaRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillPresentationMediaRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillPresentationMediaRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillPresentationMediaRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillPresentationMediaRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillPresentationMediaRef billPresentationMediaRef = (BillPresentationMediaRef) o;
-    return Objects.equals(this.id, billPresentationMediaRef.id) &&
-        Objects.equals(this.href, billPresentationMediaRef.href) &&
-        Objects.equals(this.name, billPresentationMediaRef.name) &&
-        Objects.equals(this.baseType, billPresentationMediaRef.baseType) &&
-        Objects.equals(this.schemaLocation, billPresentationMediaRef.schemaLocation) &&
-        Objects.equals(this.type, billPresentationMediaRef.type) &&
-        Objects.equals(this.referredType, billPresentationMediaRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillPresentationMediaRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRefOrValue.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRefOrValue.java
deleted file mode 100644
index fbeb8deaa6f7b1bccdc04c95d6e98ef2a262d896..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaRefOrValue.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An attachment by value or by reference.
- */
-@Schema(description = "An attachment by value or by reference.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillPresentationMediaRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillPresentationMediaRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bill presentation media
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bill presentation media")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillPresentationMediaRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the bill presentation media
-   * @return href
-  **/
-  @Schema(description = "Reference of the bill presentation media")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillPresentationMediaRefOrValue description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text describing this bill presentation media
-   * @return description
-  **/
-  @Schema(description = "An explanatory text describing this bill presentation media")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillPresentationMediaRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillPresentationMediaRefOrValue baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillPresentationMediaRefOrValue schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillPresentationMediaRefOrValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillPresentationMediaRefOrValue referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillPresentationMediaRefOrValue billPresentationMediaRefOrValue = (BillPresentationMediaRefOrValue) o;
-    return Objects.equals(this.id, billPresentationMediaRefOrValue.id) &&
-        Objects.equals(this.href, billPresentationMediaRefOrValue.href) &&
-        Objects.equals(this.description, billPresentationMediaRefOrValue.description) &&
-        Objects.equals(this.name, billPresentationMediaRefOrValue.name) &&
-        Objects.equals(this.baseType, billPresentationMediaRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, billPresentationMediaRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, billPresentationMediaRefOrValue.type) &&
-        Objects.equals(this.referredType, billPresentationMediaRefOrValue.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillPresentationMediaRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaUpdate.java
deleted file mode 100644
index b14060ace340cdc449196064c4276199b388676e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillPresentationMediaUpdate.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page. Skipped properties: id,href
- */
-@Schema(description = "A mean of communicating a bill, supported by the associated bill format. For example, post mail, email, web page. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillPresentationMediaUpdate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillPresentationMediaUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text describing this bill presentation media
-   * @return description
-  **/
-  @Schema(description = "An explanatory text describing this bill presentation media")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillPresentationMediaUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillPresentationMediaUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillPresentationMediaUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillPresentationMediaUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillPresentationMediaUpdate billPresentationMediaUpdate = (BillPresentationMediaUpdate) o;
-    return Objects.equals(this.description, billPresentationMediaUpdate.description) &&
-        Objects.equals(this.name, billPresentationMediaUpdate.name) &&
-        Objects.equals(this.baseType, billPresentationMediaUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, billPresentationMediaUpdate.schemaLocation) &&
-        Objects.equals(this.type, billPresentationMediaUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillPresentationMediaUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillStructure.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillStructure.java
deleted file mode 100644
index 3d3c9eb4a4169e2bce2dccb6e22ce1f1841f90c7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillStructure.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The structure of the bill for party accounts (billing or settlement).
- */
-@Schema(description = "The structure of the bill for party accounts (billing or settlement).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillStructure   {
-  @JsonProperty("cycleSpecification")
-  private BillingCycleSpecificationRefOrValue cycleSpecification = null;
-
-  @JsonProperty("format")
-  private BillFormatRefOrValue format = null;
-
-  @JsonProperty("presentationMedia")
-  @Valid
-  private List<BillPresentationMediaRefOrValue> presentationMedia = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillStructure cycleSpecification(BillingCycleSpecificationRefOrValue cycleSpecification) {
-    this.cycleSpecification = cycleSpecification;
-    return this;
-  }
-
-  /**
-   * Get cycleSpecification
-   * @return cycleSpecification
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillingCycleSpecificationRefOrValue getCycleSpecification() {
-    return cycleSpecification;
-  }
-
-  public void setCycleSpecification(BillingCycleSpecificationRefOrValue cycleSpecification) {
-    this.cycleSpecification = cycleSpecification;
-  }
-
-  public BillStructure format(BillFormatRefOrValue format) {
-    this.format = format;
-    return this;
-  }
-
-  /**
-   * Get format
-   * @return format
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillFormatRefOrValue getFormat() {
-    return format;
-  }
-
-  public void setFormat(BillFormatRefOrValue format) {
-    this.format = format;
-  }
-
-  public BillStructure presentationMedia(List<BillPresentationMediaRefOrValue> presentationMedia) {
-    this.presentationMedia = presentationMedia;
-    return this;
-  }
-
-  public BillStructure addPresentationMediaItem(BillPresentationMediaRefOrValue presentationMediaItem) {
-    if (this.presentationMedia == null) {
-      this.presentationMedia = new ArrayList<>();
-    }
-    this.presentationMedia.add(presentationMediaItem);
-    return this;
-  }
-
-  /**
-   * Get presentationMedia
-   * @return presentationMedia
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<BillPresentationMediaRefOrValue> getPresentationMedia() {
-    return presentationMedia;
-  }
-
-  public void setPresentationMedia(List<BillPresentationMediaRefOrValue> presentationMedia) {
-    this.presentationMedia = presentationMedia;
-  }
-
-  public BillStructure baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillStructure schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillStructure type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillStructure billStructure = (BillStructure) o;
-    return Objects.equals(this.cycleSpecification, billStructure.cycleSpecification) &&
-        Objects.equals(this.format, billStructure.format) &&
-        Objects.equals(this.presentationMedia, billStructure.presentationMedia) &&
-        Objects.equals(this.baseType, billStructure.baseType) &&
-        Objects.equals(this.schemaLocation, billStructure.schemaLocation) &&
-        Objects.equals(this.type, billStructure.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cycleSpecification, format, presentationMedia, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillStructure {\n");
-    
-    sb.append("    cycleSpecification: ").append(toIndentedString(cycleSpecification)).append("\n");
-    sb.append("    format: ").append(toIndentedString(format)).append("\n");
-    sb.append("    presentationMedia: ").append(toIndentedString(presentationMedia)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccount.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccount.java
deleted file mode 100644
index 82e1afeb07e5923742a47391da5c235756450343..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccount.java
+++ /dev/null
@@ -1,694 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount.
- */
-@Schema(description = "A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccount   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("ratingType")
-  private String ratingType = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingAccount id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingAccount href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingAccount accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public BillingAccount description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingAccount lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public BillingAccount name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingAccount paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public BillingAccount ratingType(String ratingType) {
-    this.ratingType = ratingType;
-    return this;
-  }
-
-  /**
-   * Indicates whether the account follows a specific payment option such as prepaid or postpaid
-   * @return ratingType
-  **/
-  @Schema(description = "Indicates whether the account follows a specific payment option such as prepaid or postpaid")
-
-
-  public String getRatingType() {
-    return ratingType;
-  }
-
-  public void setRatingType(String ratingType) {
-    this.ratingType = ratingType;
-  }
-
-  public BillingAccount state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public BillingAccount accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public BillingAccount addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public BillingAccount accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public BillingAccount addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public BillingAccount billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public BillingAccount contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public BillingAccount addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public BillingAccount creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public BillingAccount defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public BillingAccount financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public BillingAccount paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public BillingAccount addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public BillingAccount relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public BillingAccount addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public BillingAccount taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public BillingAccount addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public BillingAccount baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingAccount schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingAccount type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccount billingAccount = (BillingAccount) o;
-    return Objects.equals(this.id, billingAccount.id) &&
-        Objects.equals(this.href, billingAccount.href) &&
-        Objects.equals(this.accountType, billingAccount.accountType) &&
-        Objects.equals(this.description, billingAccount.description) &&
-        Objects.equals(this.lastModified, billingAccount.lastModified) &&
-        Objects.equals(this.name, billingAccount.name) &&
-        Objects.equals(this.paymentStatus, billingAccount.paymentStatus) &&
-        Objects.equals(this.ratingType, billingAccount.ratingType) &&
-        Objects.equals(this.state, billingAccount.state) &&
-        Objects.equals(this.accountBalance, billingAccount.accountBalance) &&
-        Objects.equals(this.accountRelationship, billingAccount.accountRelationship) &&
-        Objects.equals(this.billStructure, billingAccount.billStructure) &&
-        Objects.equals(this.contact, billingAccount.contact) &&
-        Objects.equals(this.creditLimit, billingAccount.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, billingAccount.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, billingAccount.financialAccount) &&
-        Objects.equals(this.paymentPlan, billingAccount.paymentPlan) &&
-        Objects.equals(this.relatedParty, billingAccount.relatedParty) &&
-        Objects.equals(this.taxExemption, billingAccount.taxExemption) &&
-        Objects.equals(this.baseType, billingAccount.baseType) &&
-        Objects.equals(this.schemaLocation, billingAccount.schemaLocation) &&
-        Objects.equals(this.type, billingAccount.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, accountType, description, lastModified, name, paymentStatus, ratingType, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccount {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    ratingType: ").append(toIndentedString(ratingType)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEvent.java
deleted file mode 100644
index fe9956d35d79dfbef6cda43ed8a289c3f1cd08b7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private BillingAccountAttributeValueChangeEventPayload event = null;
-
-  public BillingAccountAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public BillingAccountAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public BillingAccountAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public BillingAccountAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public BillingAccountAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public BillingAccountAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public BillingAccountAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingAccountAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public BillingAccountAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public BillingAccountAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public BillingAccountAttributeValueChangeEvent event(BillingAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public BillingAccountAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(BillingAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountAttributeValueChangeEvent billingAccountAttributeValueChangeEvent = (BillingAccountAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, billingAccountAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, billingAccountAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, billingAccountAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, billingAccountAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, billingAccountAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, billingAccountAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, billingAccountAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, billingAccountAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, billingAccountAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, billingAccountAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, billingAccountAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEventPayload.java
deleted file mode 100644
index 8be470d8b6773ccb18fe2f045ad8e7ac900391e2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountAttributeValueChangeEventPayload   {
-  @JsonProperty("billingAccount")
-  private BillingAccount billingAccount = null;
-
-  public BillingAccountAttributeValueChangeEventPayload billingAccount(BillingAccount billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return billingAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public BillingAccount getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccount billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountAttributeValueChangeEventPayload billingAccountAttributeValueChangeEventPayload = (BillingAccountAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.billingAccount, billingAccountAttributeValueChangeEventPayload.billingAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(billingAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountCreate.java
deleted file mode 100644
index 0c707ba3ff0d2e50fd46fa6671b22babc189c89d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountCreate.java
+++ /dev/null
@@ -1,644 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href
- */
-@Schema(description = "A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountCreate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("ratingType")
-  private String ratingType = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingAccountCreate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public BillingAccountCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingAccountCreate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public BillingAccountCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingAccountCreate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public BillingAccountCreate ratingType(String ratingType) {
-    this.ratingType = ratingType;
-    return this;
-  }
-
-  /**
-   * Indicates whether the account follows a specific payment option such as prepaid or postpaid
-   * @return ratingType
-  **/
-  @Schema(description = "Indicates whether the account follows a specific payment option such as prepaid or postpaid")
-
-
-  public String getRatingType() {
-    return ratingType;
-  }
-
-  public void setRatingType(String ratingType) {
-    this.ratingType = ratingType;
-  }
-
-  public BillingAccountCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public BillingAccountCreate accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public BillingAccountCreate addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public BillingAccountCreate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public BillingAccountCreate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public BillingAccountCreate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public BillingAccountCreate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public BillingAccountCreate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public BillingAccountCreate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public BillingAccountCreate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public BillingAccountCreate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public BillingAccountCreate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public BillingAccountCreate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public BillingAccountCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public BillingAccountCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public BillingAccountCreate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public BillingAccountCreate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public BillingAccountCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingAccountCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingAccountCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountCreate billingAccountCreate = (BillingAccountCreate) o;
-    return Objects.equals(this.accountType, billingAccountCreate.accountType) &&
-        Objects.equals(this.description, billingAccountCreate.description) &&
-        Objects.equals(this.lastModified, billingAccountCreate.lastModified) &&
-        Objects.equals(this.name, billingAccountCreate.name) &&
-        Objects.equals(this.paymentStatus, billingAccountCreate.paymentStatus) &&
-        Objects.equals(this.ratingType, billingAccountCreate.ratingType) &&
-        Objects.equals(this.state, billingAccountCreate.state) &&
-        Objects.equals(this.accountBalance, billingAccountCreate.accountBalance) &&
-        Objects.equals(this.accountRelationship, billingAccountCreate.accountRelationship) &&
-        Objects.equals(this.billStructure, billingAccountCreate.billStructure) &&
-        Objects.equals(this.contact, billingAccountCreate.contact) &&
-        Objects.equals(this.creditLimit, billingAccountCreate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, billingAccountCreate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, billingAccountCreate.financialAccount) &&
-        Objects.equals(this.paymentPlan, billingAccountCreate.paymentPlan) &&
-        Objects.equals(this.relatedParty, billingAccountCreate.relatedParty) &&
-        Objects.equals(this.taxExemption, billingAccountCreate.taxExemption) &&
-        Objects.equals(this.baseType, billingAccountCreate.baseType) &&
-        Objects.equals(this.schemaLocation, billingAccountCreate.schemaLocation) &&
-        Objects.equals(this.type, billingAccountCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, ratingType, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountCreate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    ratingType: ").append(toIndentedString(ratingType)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEvent.java
deleted file mode 100644
index 234985695fcf577fe7f1ece2b20e19a8c95381ac..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private BillingAccountStateChangeEventPayload event = null;
-
-  public BillingAccountStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingAccountStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingAccountStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public BillingAccountStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public BillingAccountStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public BillingAccountStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public BillingAccountStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public BillingAccountStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public BillingAccountStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingAccountStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public BillingAccountStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public BillingAccountStateChangeEvent event(BillingAccountStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public BillingAccountStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(BillingAccountStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountStateChangeEvent billingAccountStateChangeEvent = (BillingAccountStateChangeEvent) o;
-    return Objects.equals(this.id, billingAccountStateChangeEvent.id) &&
-        Objects.equals(this.href, billingAccountStateChangeEvent.href) &&
-        Objects.equals(this.eventId, billingAccountStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, billingAccountStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, billingAccountStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, billingAccountStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, billingAccountStateChangeEvent.domain) &&
-        Objects.equals(this.title, billingAccountStateChangeEvent.title) &&
-        Objects.equals(this.description, billingAccountStateChangeEvent.description) &&
-        Objects.equals(this.priority, billingAccountStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, billingAccountStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, billingAccountStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEventPayload.java
deleted file mode 100644
index 006cb7593b19763526eaab84bff277d933edd76e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountStateChangeEventPayload   {
-  @JsonProperty("billingAccount")
-  private BillingAccount billingAccount = null;
-
-  public BillingAccountStateChangeEventPayload billingAccount(BillingAccount billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return billingAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public BillingAccount getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccount billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountStateChangeEventPayload billingAccountStateChangeEventPayload = (BillingAccountStateChangeEventPayload) o;
-    return Objects.equals(this.billingAccount, billingAccountStateChangeEventPayload.billingAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(billingAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountStateChangeEventPayload {\n");
-    
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountUpdate.java
deleted file mode 100644
index 0549e9bf44ca5b436abd1be0c18bfee3cd20b3a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingAccountUpdate.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href,accountBalance
- */
-@Schema(description = "A party account used for billing purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href,accountBalance")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingAccountUpdate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("ratingType")
-  private String ratingType = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingAccountUpdate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public BillingAccountUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingAccountUpdate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public BillingAccountUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingAccountUpdate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public BillingAccountUpdate ratingType(String ratingType) {
-    this.ratingType = ratingType;
-    return this;
-  }
-
-  /**
-   * Indicates whether the account follows a specific payment option such as prepaid or postpaid
-   * @return ratingType
-  **/
-  @Schema(description = "Indicates whether the account follows a specific payment option such as prepaid or postpaid")
-
-
-  public String getRatingType() {
-    return ratingType;
-  }
-
-  public void setRatingType(String ratingType) {
-    this.ratingType = ratingType;
-  }
-
-  public BillingAccountUpdate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public BillingAccountUpdate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public BillingAccountUpdate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public BillingAccountUpdate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public BillingAccountUpdate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public BillingAccountUpdate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public BillingAccountUpdate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public BillingAccountUpdate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public BillingAccountUpdate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public BillingAccountUpdate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public BillingAccountUpdate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public BillingAccountUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public BillingAccountUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public BillingAccountUpdate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public BillingAccountUpdate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public BillingAccountUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingAccountUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingAccountUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountUpdate billingAccountUpdate = (BillingAccountUpdate) o;
-    return Objects.equals(this.accountType, billingAccountUpdate.accountType) &&
-        Objects.equals(this.description, billingAccountUpdate.description) &&
-        Objects.equals(this.lastModified, billingAccountUpdate.lastModified) &&
-        Objects.equals(this.name, billingAccountUpdate.name) &&
-        Objects.equals(this.paymentStatus, billingAccountUpdate.paymentStatus) &&
-        Objects.equals(this.ratingType, billingAccountUpdate.ratingType) &&
-        Objects.equals(this.state, billingAccountUpdate.state) &&
-        Objects.equals(this.accountRelationship, billingAccountUpdate.accountRelationship) &&
-        Objects.equals(this.billStructure, billingAccountUpdate.billStructure) &&
-        Objects.equals(this.contact, billingAccountUpdate.contact) &&
-        Objects.equals(this.creditLimit, billingAccountUpdate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, billingAccountUpdate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, billingAccountUpdate.financialAccount) &&
-        Objects.equals(this.paymentPlan, billingAccountUpdate.paymentPlan) &&
-        Objects.equals(this.relatedParty, billingAccountUpdate.relatedParty) &&
-        Objects.equals(this.taxExemption, billingAccountUpdate.taxExemption) &&
-        Objects.equals(this.baseType, billingAccountUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, billingAccountUpdate.schemaLocation) &&
-        Objects.equals(this.type, billingAccountUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, ratingType, state, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountUpdate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    ratingType: ").append(toIndentedString(ratingType)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecification.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecification.java
deleted file mode 100644
index 26adcc1b4631d11677cf9da62ba6e229cd22f659..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecification.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle.
- */
-@Schema(description = "A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingCycleSpecification   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("billingDateShift")
-  private Integer billingDateShift = null;
-
-  @JsonProperty("billingPeriod")
-  private String billingPeriod = null;
-
-  @JsonProperty("chargeDateOffset")
-  private Integer chargeDateOffset = null;
-
-  @JsonProperty("creditDateOffset")
-  private Integer creditDateOffset = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("frequency")
-  private String frequency = null;
-
-  @JsonProperty("mailingDateOffset")
-  private Integer mailingDateOffset = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentDueDateOffset")
-  private Integer paymentDueDateOffset = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingCycleSpecification id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the billing cycle specification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the billing cycle specification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingCycleSpecification href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the billing cycle specification
-   * @return href
-  **/
-  @Schema(description = "Reference of the billing cycle specification")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingCycleSpecification billingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return billingDateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getBillingDateShift() {
-    return billingDateShift;
-  }
-
-  public void setBillingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-  }
-
-  public BillingCycleSpecification billingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-    return this;
-  }
-
-  /**
-   * A billing time period. It can be recurring, for example: week, month, quarter of year, year .
-   * @return billingPeriod
-  **/
-  @Schema(description = "A billing time period. It can be recurring, for example: week, month, quarter of year, year .")
-
-
-  public String getBillingPeriod() {
-    return billingPeriod;
-  }
-
-  public void setBillingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-  }
-
-  public BillingCycleSpecification chargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return chargeDateOffset
-  **/
-  @Schema(description = "An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getChargeDateOffset() {
-    return chargeDateOffset;
-  }
-
-  public void setChargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-  }
-
-  public BillingCycleSpecification creditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return creditDateOffset
-  **/
-  @Schema(description = "An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getCreditDateOffset() {
-    return creditDateOffset;
-  }
-
-  public void setCreditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-  }
-
-  public BillingCycleSpecification description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanation regarding this billing cycle specification
-   * @return description
-  **/
-  @Schema(description = "An explanation regarding this billing cycle specification")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingCycleSpecification frequency(String frequency) {
-    this.frequency = frequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the billing cycle (monthly for instance)
-   * @return frequency
-  **/
-  @Schema(description = "Frequency of the billing cycle (monthly for instance)")
-
-
-  public String getFrequency() {
-    return frequency;
-  }
-
-  public void setFrequency(String frequency) {
-    this.frequency = frequency;
-  }
-
-  public BillingCycleSpecification mailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return mailingDateOffset
-  **/
-  @Schema(description = "An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getMailingDateOffset() {
-    return mailingDateOffset;
-  }
-
-  public void setMailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-  }
-
-  public BillingCycleSpecification name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingCycleSpecification paymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return paymentDueDateOffset
-  **/
-  @Schema(description = "An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getPaymentDueDateOffset() {
-    return paymentDueDateOffset;
-  }
-
-  public void setPaymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-  }
-
-  public BillingCycleSpecification validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the billing specification cycle is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the billing specification cycle is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public BillingCycleSpecification baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingCycleSpecification schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingCycleSpecification type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingCycleSpecification billingCycleSpecification = (BillingCycleSpecification) o;
-    return Objects.equals(this.id, billingCycleSpecification.id) &&
-        Objects.equals(this.href, billingCycleSpecification.href) &&
-        Objects.equals(this.billingDateShift, billingCycleSpecification.billingDateShift) &&
-        Objects.equals(this.billingPeriod, billingCycleSpecification.billingPeriod) &&
-        Objects.equals(this.chargeDateOffset, billingCycleSpecification.chargeDateOffset) &&
-        Objects.equals(this.creditDateOffset, billingCycleSpecification.creditDateOffset) &&
-        Objects.equals(this.description, billingCycleSpecification.description) &&
-        Objects.equals(this.frequency, billingCycleSpecification.frequency) &&
-        Objects.equals(this.mailingDateOffset, billingCycleSpecification.mailingDateOffset) &&
-        Objects.equals(this.name, billingCycleSpecification.name) &&
-        Objects.equals(this.paymentDueDateOffset, billingCycleSpecification.paymentDueDateOffset) &&
-        Objects.equals(this.validFor, billingCycleSpecification.validFor) &&
-        Objects.equals(this.baseType, billingCycleSpecification.baseType) &&
-        Objects.equals(this.schemaLocation, billingCycleSpecification.schemaLocation) &&
-        Objects.equals(this.type, billingCycleSpecification.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, billingDateShift, billingPeriod, chargeDateOffset, creditDateOffset, description, frequency, mailingDateOffset, name, paymentDueDateOffset, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingCycleSpecification {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    billingDateShift: ").append(toIndentedString(billingDateShift)).append("\n");
-    sb.append("    billingPeriod: ").append(toIndentedString(billingPeriod)).append("\n");
-    sb.append("    chargeDateOffset: ").append(toIndentedString(chargeDateOffset)).append("\n");
-    sb.append("    creditDateOffset: ").append(toIndentedString(creditDateOffset)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    frequency: ").append(toIndentedString(frequency)).append("\n");
-    sb.append("    mailingDateOffset: ").append(toIndentedString(mailingDateOffset)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentDueDateOffset: ").append(toIndentedString(paymentDueDateOffset)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationCreate.java
deleted file mode 100644
index dc29383a7ed8a4c7ab21c83a6fb9738039f8f69e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationCreate.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle. Skipped properties: id,href
- */
-@Schema(description = "A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingCycleSpecificationCreate   {
-  @JsonProperty("billingDateShift")
-  private Integer billingDateShift = null;
-
-  @JsonProperty("billingPeriod")
-  private String billingPeriod = null;
-
-  @JsonProperty("chargeDateOffset")
-  private Integer chargeDateOffset = null;
-
-  @JsonProperty("creditDateOffset")
-  private Integer creditDateOffset = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("frequency")
-  private String frequency = null;
-
-  @JsonProperty("mailingDateOffset")
-  private Integer mailingDateOffset = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentDueDateOffset")
-  private Integer paymentDueDateOffset = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingCycleSpecificationCreate billingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return billingDateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getBillingDateShift() {
-    return billingDateShift;
-  }
-
-  public void setBillingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-  }
-
-  public BillingCycleSpecificationCreate billingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-    return this;
-  }
-
-  /**
-   * A billing time period. It can be recurring, for example: week, month, quarter of year, year .
-   * @return billingPeriod
-  **/
-  @Schema(description = "A billing time period. It can be recurring, for example: week, month, quarter of year, year .")
-
-
-  public String getBillingPeriod() {
-    return billingPeriod;
-  }
-
-  public void setBillingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-  }
-
-  public BillingCycleSpecificationCreate chargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return chargeDateOffset
-  **/
-  @Schema(description = "An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getChargeDateOffset() {
-    return chargeDateOffset;
-  }
-
-  public void setChargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-  }
-
-  public BillingCycleSpecificationCreate creditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return creditDateOffset
-  **/
-  @Schema(description = "An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getCreditDateOffset() {
-    return creditDateOffset;
-  }
-
-  public void setCreditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-  }
-
-  public BillingCycleSpecificationCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanation regarding this billing cycle specification
-   * @return description
-  **/
-  @Schema(description = "An explanation regarding this billing cycle specification")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingCycleSpecificationCreate frequency(String frequency) {
-    this.frequency = frequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the billing cycle (monthly for instance)
-   * @return frequency
-  **/
-  @Schema(description = "Frequency of the billing cycle (monthly for instance)")
-
-
-  public String getFrequency() {
-    return frequency;
-  }
-
-  public void setFrequency(String frequency) {
-    this.frequency = frequency;
-  }
-
-  public BillingCycleSpecificationCreate mailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return mailingDateOffset
-  **/
-  @Schema(description = "An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getMailingDateOffset() {
-    return mailingDateOffset;
-  }
-
-  public void setMailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-  }
-
-  public BillingCycleSpecificationCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingCycleSpecificationCreate paymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return paymentDueDateOffset
-  **/
-  @Schema(description = "An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getPaymentDueDateOffset() {
-    return paymentDueDateOffset;
-  }
-
-  public void setPaymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-  }
-
-  public BillingCycleSpecificationCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the billing specification cycle is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the billing specification cycle is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public BillingCycleSpecificationCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingCycleSpecificationCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingCycleSpecificationCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingCycleSpecificationCreate billingCycleSpecificationCreate = (BillingCycleSpecificationCreate) o;
-    return Objects.equals(this.billingDateShift, billingCycleSpecificationCreate.billingDateShift) &&
-        Objects.equals(this.billingPeriod, billingCycleSpecificationCreate.billingPeriod) &&
-        Objects.equals(this.chargeDateOffset, billingCycleSpecificationCreate.chargeDateOffset) &&
-        Objects.equals(this.creditDateOffset, billingCycleSpecificationCreate.creditDateOffset) &&
-        Objects.equals(this.description, billingCycleSpecificationCreate.description) &&
-        Objects.equals(this.frequency, billingCycleSpecificationCreate.frequency) &&
-        Objects.equals(this.mailingDateOffset, billingCycleSpecificationCreate.mailingDateOffset) &&
-        Objects.equals(this.name, billingCycleSpecificationCreate.name) &&
-        Objects.equals(this.paymentDueDateOffset, billingCycleSpecificationCreate.paymentDueDateOffset) &&
-        Objects.equals(this.validFor, billingCycleSpecificationCreate.validFor) &&
-        Objects.equals(this.baseType, billingCycleSpecificationCreate.baseType) &&
-        Objects.equals(this.schemaLocation, billingCycleSpecificationCreate.schemaLocation) &&
-        Objects.equals(this.type, billingCycleSpecificationCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(billingDateShift, billingPeriod, chargeDateOffset, creditDateOffset, description, frequency, mailingDateOffset, name, paymentDueDateOffset, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingCycleSpecificationCreate {\n");
-    
-    sb.append("    billingDateShift: ").append(toIndentedString(billingDateShift)).append("\n");
-    sb.append("    billingPeriod: ").append(toIndentedString(billingPeriod)).append("\n");
-    sb.append("    chargeDateOffset: ").append(toIndentedString(chargeDateOffset)).append("\n");
-    sb.append("    creditDateOffset: ").append(toIndentedString(creditDateOffset)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    frequency: ").append(toIndentedString(frequency)).append("\n");
-    sb.append("    mailingDateOffset: ").append(toIndentedString(mailingDateOffset)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentDueDateOffset: ").append(toIndentedString(paymentDueDateOffset)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRef.java
deleted file mode 100644
index d2a8d3092d359dccc85728be272144ff1e4cf50c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRef.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * BillingCycleSpecification reference. A description of when to initiate a billing cycle and the various sub steps of a billing cycle.
- */
-@Schema(description = "BillingCycleSpecification reference. A description of when to initiate a billing cycle and the various sub steps of a billing cycle.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingCycleSpecificationRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("dateShift")
-  private Integer dateShift = null;
-
-  @JsonProperty("frequency")
-  private String frequency = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillingCycleSpecificationRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the billing cycle specification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the billing cycle specification")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingCycleSpecificationRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the billing cycle specification
-   * @return href
-  **/
-  @Schema(description = "Reference of the billing cycle specification")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingCycleSpecificationRef dateShift(Integer dateShift) {
-    this.dateShift = dateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return dateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getDateShift() {
-    return dateShift;
-  }
-
-  public void setDateShift(Integer dateShift) {
-    this.dateShift = dateShift;
-  }
-
-  public BillingCycleSpecificationRef frequency(String frequency) {
-    this.frequency = frequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the billing cycle (monthly for instance)
-   * @return frequency
-  **/
-  @Schema(description = "Frequency of the billing cycle (monthly for instance)")
-
-
-  public String getFrequency() {
-    return frequency;
-  }
-
-  public void setFrequency(String frequency) {
-    this.frequency = frequency;
-  }
-
-  public BillingCycleSpecificationRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingCycleSpecificationRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingCycleSpecificationRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingCycleSpecificationRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillingCycleSpecificationRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingCycleSpecificationRef billingCycleSpecificationRef = (BillingCycleSpecificationRef) o;
-    return Objects.equals(this.id, billingCycleSpecificationRef.id) &&
-        Objects.equals(this.href, billingCycleSpecificationRef.href) &&
-        Objects.equals(this.dateShift, billingCycleSpecificationRef.dateShift) &&
-        Objects.equals(this.frequency, billingCycleSpecificationRef.frequency) &&
-        Objects.equals(this.name, billingCycleSpecificationRef.name) &&
-        Objects.equals(this.baseType, billingCycleSpecificationRef.baseType) &&
-        Objects.equals(this.schemaLocation, billingCycleSpecificationRef.schemaLocation) &&
-        Objects.equals(this.type, billingCycleSpecificationRef.type) &&
-        Objects.equals(this.referredType, billingCycleSpecificationRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, dateShift, frequency, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingCycleSpecificationRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    dateShift: ").append(toIndentedString(dateShift)).append("\n");
-    sb.append("    frequency: ").append(toIndentedString(frequency)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRefOrValue.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRefOrValue.java
deleted file mode 100644
index e9ee6c666eb6406592169bcf86146ed3bd8ad378..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationRefOrValue.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An attachment by value or by reference.
- */
-@Schema(description = "An attachment by value or by reference.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingCycleSpecificationRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("billingDateShift")
-  private Integer billingDateShift = null;
-
-  @JsonProperty("billingPeriod")
-  private String billingPeriod = null;
-
-  @JsonProperty("chargeDateOffset")
-  private Integer chargeDateOffset = null;
-
-  @JsonProperty("creditDateOffset")
-  private Integer creditDateOffset = null;
-
-  @JsonProperty("dateShift")
-  private Integer dateShift = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("frequency")
-  private String frequency = null;
-
-  @JsonProperty("mailingDateOffset")
-  private Integer mailingDateOffset = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentDueDateOffset")
-  private Integer paymentDueDateOffset = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public BillingCycleSpecificationRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the billing cycle specification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the billing cycle specification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingCycleSpecificationRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the billing cycle specification
-   * @return href
-  **/
-  @Schema(description = "Reference of the billing cycle specification")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingCycleSpecificationRefOrValue billingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return billingDateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getBillingDateShift() {
-    return billingDateShift;
-  }
-
-  public void setBillingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-  }
-
-  public BillingCycleSpecificationRefOrValue billingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-    return this;
-  }
-
-  /**
-   * A billing time period. It can be recurring, for example: week, month, quarter of year, year .
-   * @return billingPeriod
-  **/
-  @Schema(description = "A billing time period. It can be recurring, for example: week, month, quarter of year, year .")
-
-
-  public String getBillingPeriod() {
-    return billingPeriod;
-  }
-
-  public void setBillingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-  }
-
-  public BillingCycleSpecificationRefOrValue chargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return chargeDateOffset
-  **/
-  @Schema(description = "An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getChargeDateOffset() {
-    return chargeDateOffset;
-  }
-
-  public void setChargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-  }
-
-  public BillingCycleSpecificationRefOrValue creditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return creditDateOffset
-  **/
-  @Schema(description = "An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getCreditDateOffset() {
-    return creditDateOffset;
-  }
-
-  public void setCreditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-  }
-
-  public BillingCycleSpecificationRefOrValue dateShift(Integer dateShift) {
-    this.dateShift = dateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return dateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getDateShift() {
-    return dateShift;
-  }
-
-  public void setDateShift(Integer dateShift) {
-    this.dateShift = dateShift;
-  }
-
-  public BillingCycleSpecificationRefOrValue description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanation regarding this billing cycle specification
-   * @return description
-  **/
-  @Schema(description = "An explanation regarding this billing cycle specification")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingCycleSpecificationRefOrValue frequency(String frequency) {
-    this.frequency = frequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the billing cycle (monthly for instance)
-   * @return frequency
-  **/
-  @Schema(description = "Frequency of the billing cycle (monthly for instance)")
-
-
-  public String getFrequency() {
-    return frequency;
-  }
-
-  public void setFrequency(String frequency) {
-    this.frequency = frequency;
-  }
-
-  public BillingCycleSpecificationRefOrValue mailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return mailingDateOffset
-  **/
-  @Schema(description = "An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getMailingDateOffset() {
-    return mailingDateOffset;
-  }
-
-  public void setMailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-  }
-
-  public BillingCycleSpecificationRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingCycleSpecificationRefOrValue paymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return paymentDueDateOffset
-  **/
-  @Schema(description = "An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getPaymentDueDateOffset() {
-    return paymentDueDateOffset;
-  }
-
-  public void setPaymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-  }
-
-  public BillingCycleSpecificationRefOrValue validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the billing specification cycle is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the billing specification cycle is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public BillingCycleSpecificationRefOrValue baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingCycleSpecificationRefOrValue schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingCycleSpecificationRefOrValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public BillingCycleSpecificationRefOrValue referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingCycleSpecificationRefOrValue billingCycleSpecificationRefOrValue = (BillingCycleSpecificationRefOrValue) o;
-    return Objects.equals(this.id, billingCycleSpecificationRefOrValue.id) &&
-        Objects.equals(this.href, billingCycleSpecificationRefOrValue.href) &&
-        Objects.equals(this.billingDateShift, billingCycleSpecificationRefOrValue.billingDateShift) &&
-        Objects.equals(this.billingPeriod, billingCycleSpecificationRefOrValue.billingPeriod) &&
-        Objects.equals(this.chargeDateOffset, billingCycleSpecificationRefOrValue.chargeDateOffset) &&
-        Objects.equals(this.creditDateOffset, billingCycleSpecificationRefOrValue.creditDateOffset) &&
-        Objects.equals(this.dateShift, billingCycleSpecificationRefOrValue.dateShift) &&
-        Objects.equals(this.description, billingCycleSpecificationRefOrValue.description) &&
-        Objects.equals(this.frequency, billingCycleSpecificationRefOrValue.frequency) &&
-        Objects.equals(this.mailingDateOffset, billingCycleSpecificationRefOrValue.mailingDateOffset) &&
-        Objects.equals(this.name, billingCycleSpecificationRefOrValue.name) &&
-        Objects.equals(this.paymentDueDateOffset, billingCycleSpecificationRefOrValue.paymentDueDateOffset) &&
-        Objects.equals(this.validFor, billingCycleSpecificationRefOrValue.validFor) &&
-        Objects.equals(this.baseType, billingCycleSpecificationRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, billingCycleSpecificationRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, billingCycleSpecificationRefOrValue.type) &&
-        Objects.equals(this.referredType, billingCycleSpecificationRefOrValue.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, billingDateShift, billingPeriod, chargeDateOffset, creditDateOffset, dateShift, description, frequency, mailingDateOffset, name, paymentDueDateOffset, validFor, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingCycleSpecificationRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    billingDateShift: ").append(toIndentedString(billingDateShift)).append("\n");
-    sb.append("    billingPeriod: ").append(toIndentedString(billingPeriod)).append("\n");
-    sb.append("    chargeDateOffset: ").append(toIndentedString(chargeDateOffset)).append("\n");
-    sb.append("    creditDateOffset: ").append(toIndentedString(creditDateOffset)).append("\n");
-    sb.append("    dateShift: ").append(toIndentedString(dateShift)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    frequency: ").append(toIndentedString(frequency)).append("\n");
-    sb.append("    mailingDateOffset: ").append(toIndentedString(mailingDateOffset)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentDueDateOffset: ").append(toIndentedString(paymentDueDateOffset)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationUpdate.java
deleted file mode 100644
index a3b08858bb0fd5c200f3c59237bacc3e35dc8c7e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/BillingCycleSpecificationUpdate.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle. Skipped properties: id,href
- */
-@Schema(description = "A detailed description of when to initiate a billing cycle and the various sub steps of a billing cycle. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class BillingCycleSpecificationUpdate   {
-  @JsonProperty("billingDateShift")
-  private Integer billingDateShift = null;
-
-  @JsonProperty("billingPeriod")
-  private String billingPeriod = null;
-
-  @JsonProperty("chargeDateOffset")
-  private Integer chargeDateOffset = null;
-
-  @JsonProperty("creditDateOffset")
-  private Integer creditDateOffset = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("frequency")
-  private String frequency = null;
-
-  @JsonProperty("mailingDateOffset")
-  private Integer mailingDateOffset = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentDueDateOffset")
-  private Integer paymentDueDateOffset = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public BillingCycleSpecificationUpdate billingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-    return this;
-  }
-
-  /**
-   * An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.
-   * @return billingDateShift
-  **/
-  @Schema(description = "An offset of a billing/settlement date. The offset is expressed as number of days with regard to the start of the billing/settlement period.")
-
-
-  public Integer getBillingDateShift() {
-    return billingDateShift;
-  }
-
-  public void setBillingDateShift(Integer billingDateShift) {
-    this.billingDateShift = billingDateShift;
-  }
-
-  public BillingCycleSpecificationUpdate billingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-    return this;
-  }
-
-  /**
-   * A billing time period. It can be recurring, for example: week, month, quarter of year, year .
-   * @return billingPeriod
-  **/
-  @Schema(description = "A billing time period. It can be recurring, for example: week, month, quarter of year, year .")
-
-
-  public String getBillingPeriod() {
-    return billingPeriod;
-  }
-
-  public void setBillingPeriod(String billingPeriod) {
-    this.billingPeriod = billingPeriod;
-  }
-
-  public BillingCycleSpecificationUpdate chargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return chargeDateOffset
-  **/
-  @Schema(description = "An offset of a date through which charges previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getChargeDateOffset() {
-    return chargeDateOffset;
-  }
-
-  public void setChargeDateOffset(Integer chargeDateOffset) {
-    this.chargeDateOffset = chargeDateOffset;
-  }
-
-  public BillingCycleSpecificationUpdate creditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return creditDateOffset
-  **/
-  @Schema(description = "An offset of a date through which credits previously received by the billing system will appear on the bill. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getCreditDateOffset() {
-    return creditDateOffset;
-  }
-
-  public void setCreditDateOffset(Integer creditDateOffset) {
-    this.creditDateOffset = creditDateOffset;
-  }
-
-  public BillingCycleSpecificationUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanation regarding this billing cycle specification
-   * @return description
-  **/
-  @Schema(description = "An explanation regarding this billing cycle specification")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public BillingCycleSpecificationUpdate frequency(String frequency) {
-    this.frequency = frequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the billing cycle (monthly for instance)
-   * @return frequency
-  **/
-  @Schema(description = "Frequency of the billing cycle (monthly for instance)")
-
-
-  public String getFrequency() {
-    return frequency;
-  }
-
-  public void setFrequency(String frequency) {
-    this.frequency = frequency;
-  }
-
-  public BillingCycleSpecificationUpdate mailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return mailingDateOffset
-  **/
-  @Schema(description = "An offset of a customer bill mailing date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getMailingDateOffset() {
-    return mailingDateOffset;
-  }
-
-  public void setMailingDateOffset(Integer mailingDateOffset) {
-    this.mailingDateOffset = mailingDateOffset;
-  }
-
-  public BillingCycleSpecificationUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingCycleSpecificationUpdate paymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-    return this;
-  }
-
-  /**
-   * An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.
-   * @return paymentDueDateOffset
-  **/
-  @Schema(description = "An offset of a payment due date. The offset is expressed as number of days with regard to the start of the BillingPeriod.")
-
-
-  public Integer getPaymentDueDateOffset() {
-    return paymentDueDateOffset;
-  }
-
-  public void setPaymentDueDateOffset(Integer paymentDueDateOffset) {
-    this.paymentDueDateOffset = paymentDueDateOffset;
-  }
-
-  public BillingCycleSpecificationUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the billing specification cycle is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the billing specification cycle is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public BillingCycleSpecificationUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingCycleSpecificationUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingCycleSpecificationUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingCycleSpecificationUpdate billingCycleSpecificationUpdate = (BillingCycleSpecificationUpdate) o;
-    return Objects.equals(this.billingDateShift, billingCycleSpecificationUpdate.billingDateShift) &&
-        Objects.equals(this.billingPeriod, billingCycleSpecificationUpdate.billingPeriod) &&
-        Objects.equals(this.chargeDateOffset, billingCycleSpecificationUpdate.chargeDateOffset) &&
-        Objects.equals(this.creditDateOffset, billingCycleSpecificationUpdate.creditDateOffset) &&
-        Objects.equals(this.description, billingCycleSpecificationUpdate.description) &&
-        Objects.equals(this.frequency, billingCycleSpecificationUpdate.frequency) &&
-        Objects.equals(this.mailingDateOffset, billingCycleSpecificationUpdate.mailingDateOffset) &&
-        Objects.equals(this.name, billingCycleSpecificationUpdate.name) &&
-        Objects.equals(this.paymentDueDateOffset, billingCycleSpecificationUpdate.paymentDueDateOffset) &&
-        Objects.equals(this.validFor, billingCycleSpecificationUpdate.validFor) &&
-        Objects.equals(this.baseType, billingCycleSpecificationUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, billingCycleSpecificationUpdate.schemaLocation) &&
-        Objects.equals(this.type, billingCycleSpecificationUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(billingDateShift, billingPeriod, chargeDateOffset, creditDateOffset, description, frequency, mailingDateOffset, name, paymentDueDateOffset, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingCycleSpecificationUpdate {\n");
-    
-    sb.append("    billingDateShift: ").append(toIndentedString(billingDateShift)).append("\n");
-    sb.append("    billingPeriod: ").append(toIndentedString(billingPeriod)).append("\n");
-    sb.append("    chargeDateOffset: ").append(toIndentedString(chargeDateOffset)).append("\n");
-    sb.append("    creditDateOffset: ").append(toIndentedString(creditDateOffset)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    frequency: ").append(toIndentedString(frequency)).append("\n");
-    sb.append("    mailingDateOffset: ").append(toIndentedString(mailingDateOffset)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentDueDateOffset: ").append(toIndentedString(paymentDueDateOffset)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/Contact.java b/src/main/java/org/etsi/osl/tmf/am666/model/Contact.java
deleted file mode 100644
index 4f237b6d8a565cd905445d297e109ea495cb14ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/Contact.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An individual or an organization used as a contact point for a given account and accessed via some contact medium.
- */
-@Schema(description = "An individual or an organization used as a contact point for a given account and accessed via some contact medium.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class Contact   {
-  @JsonProperty("contactName")
-  private String contactName = null;
-
-  @JsonProperty("contactType")
-  private String contactType = null;
-
-  @JsonProperty("partyRoleType")
-  private String partyRoleType = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  private List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("relatedParty")
-  private RelatedParty relatedParty = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Contact contactName(String contactName) {
-    this.contactName = contactName;
-    return this;
-  }
-
-  /**
-   * A displayable name for that contact
-   * @return contactName
-  **/
-  @Schema(description = "A displayable name for that contact")
-
-
-  public String getContactName() {
-    return contactName;
-  }
-
-  public void setContactName(String contactName) {
-    this.contactName = contactName;
-  }
-
-  public Contact contactType(String contactType) {
-    this.contactType = contactType;
-    return this;
-  }
-
-  /**
-   * Type of contact (primary, secondary...)
-   * @return contactType
-  **/
-  @Schema(description = "Type of contact (primary, secondary...)")
-  @NotNull
-
-
-  public String getContactType() {
-    return contactType;
-  }
-
-  public void setContactType(String contactType) {
-    this.contactType = contactType;
-  }
-
-  public Contact partyRoleType(String partyRoleType) {
-    this.partyRoleType = partyRoleType;
-    return this;
-  }
-
-  /**
-   * Identifies what kind of party role type is linked to the contact (a account manager...)
-   * @return partyRoleType
-  **/
-  @Schema(description = "Identifies what kind of party role type is linked to the contact (a account manager...)")
-
-
-  public String getPartyRoleType() {
-    return partyRoleType;
-  }
-
-  public void setPartyRoleType(String partyRoleType) {
-    this.partyRoleType = partyRoleType;
-  }
-
-  public Contact contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public Contact addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public Contact relatedParty(RelatedParty relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public RelatedParty getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(RelatedParty relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public Contact validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Validity period of that contact
-   * @return validFor
-  **/
-  @Schema(description = "Validity period of that contact")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public Contact baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Contact schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Contact type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Contact contact = (Contact) o;
-    return Objects.equals(this.contactName, contact.contactName) &&
-        Objects.equals(this.contactType, contact.contactType) &&
-        Objects.equals(this.partyRoleType, contact.partyRoleType) &&
-        Objects.equals(this.contactMedium, contact.contactMedium) &&
-        Objects.equals(this.relatedParty, contact.relatedParty) &&
-        Objects.equals(this.validFor, contact.validFor) &&
-        Objects.equals(this.baseType, contact.baseType) &&
-        Objects.equals(this.schemaLocation, contact.schemaLocation) &&
-        Objects.equals(this.type, contact.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(contactName, contactType, partyRoleType, contactMedium, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Contact {\n");
-    
-    sb.append("    contactName: ").append(toIndentedString(contactName)).append("\n");
-    sb.append("    contactType: ").append(toIndentedString(contactType)).append("\n");
-    sb.append("    partyRoleType: ").append(toIndentedString(partyRoleType)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/ContactMedium.java b/src/main/java/org/etsi/osl/tmf/am666/model/ContactMedium.java
deleted file mode 100644
index b3d62950d6ab5b03e5bf80926cdaffb56bab3b6e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/ContactMedium.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Indicates the contact medium that could be used to contact the party.
- */
-@Schema(description = "Indicates the contact medium that could be used to contact the party.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class ContactMedium   {
-  @JsonProperty("mediumType")
-  private String mediumType = null;
-
-  @JsonProperty("preferred")
-  private Boolean preferred = null;
-
-  @JsonProperty("characteristic")
-  private MediumCharacteristic characteristic = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ContactMedium mediumType(String mediumType) {
-    this.mediumType = mediumType;
-    return this;
-  }
-
-  /**
-   * Type of the contact medium, such as: email address, telephone number, postal address
-   * @return mediumType
-  **/
-  @Schema(description = "Type of the contact medium, such as: email address, telephone number, postal address")
-
-
-  public String getMediumType() {
-    return mediumType;
-  }
-
-  public void setMediumType(String mediumType) {
-    this.mediumType = mediumType;
-  }
-
-  public ContactMedium preferred(Boolean preferred) {
-    this.preferred = preferred;
-    return this;
-  }
-
-  /**
-   * If true, indicates that is the preferred contact medium
-   * @return preferred
-  **/
-  @Schema(description = "If true, indicates that is the preferred contact medium")
-
-
-  public Boolean isPreferred() {
-    return preferred;
-  }
-
-  public void setPreferred(Boolean preferred) {
-    this.preferred = preferred;
-  }
-
-  public ContactMedium characteristic(MediumCharacteristic characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  /**
-   * Any additional characteristic(s) of this contact medium
-   * @return characteristic
-  **/
-  @Schema(description = "Any additional characteristic(s) of this contact medium")
-
-  @Valid
-
-  public MediumCharacteristic getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(MediumCharacteristic characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public ContactMedium validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the contact medium is valid for
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the contact medium is valid for")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ContactMedium baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ContactMedium schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ContactMedium type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ContactMedium contactMedium = (ContactMedium) o;
-    return Objects.equals(this.mediumType, contactMedium.mediumType) &&
-        Objects.equals(this.preferred, contactMedium.preferred) &&
-        Objects.equals(this.characteristic, contactMedium.characteristic) &&
-        Objects.equals(this.validFor, contactMedium.validFor) &&
-        Objects.equals(this.baseType, contactMedium.baseType) &&
-        Objects.equals(this.schemaLocation, contactMedium.schemaLocation) &&
-        Objects.equals(this.type, contactMedium.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mediumType, preferred, characteristic, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ContactMedium {\n");
-    
-    sb.append("    mediumType: ").append(toIndentedString(mediumType)).append("\n");
-    sb.append("    preferred: ").append(toIndentedString(preferred)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/EntityRef.java
deleted file mode 100644
index b1528af04d0d6089da02fea9e52195f1e0ad954f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/EntityRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/Error.java b/src/main/java/org/etsi/osl/tmf/am666/model/Error.java
deleted file mode 100644
index f17f1e4bd233d29cb158ff3286b8041ecc13394f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscription.java
deleted file mode 100644
index 83eb7ab86f2a1d73adf6ca73c5b730a5357bb6ec..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscriptionInput.java
deleted file mode 100644
index f27f0d4a9a276b13d652a9dfd815dea6d1dbf403..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccount.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccount.java
deleted file mode 100644
index 6d877f80c595457cd8ab68f9f70ea3aec3104e0c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccount.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account.
- */
-@Schema(description = "An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccount   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public FinancialAccount id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public FinancialAccount href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public FinancialAccount accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public FinancialAccount description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccount lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public FinancialAccount name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FinancialAccount state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public FinancialAccount accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public FinancialAccount addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public FinancialAccount accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public FinancialAccount addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public FinancialAccount contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public FinancialAccount addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public FinancialAccount creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public FinancialAccount relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public FinancialAccount addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public FinancialAccount taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public FinancialAccount addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public FinancialAccount baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public FinancialAccount schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public FinancialAccount type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccount financialAccount = (FinancialAccount) o;
-    return Objects.equals(this.id, financialAccount.id) &&
-        Objects.equals(this.href, financialAccount.href) &&
-        Objects.equals(this.accountType, financialAccount.accountType) &&
-        Objects.equals(this.description, financialAccount.description) &&
-        Objects.equals(this.lastModified, financialAccount.lastModified) &&
-        Objects.equals(this.name, financialAccount.name) &&
-        Objects.equals(this.state, financialAccount.state) &&
-        Objects.equals(this.accountBalance, financialAccount.accountBalance) &&
-        Objects.equals(this.accountRelationship, financialAccount.accountRelationship) &&
-        Objects.equals(this.contact, financialAccount.contact) &&
-        Objects.equals(this.creditLimit, financialAccount.creditLimit) &&
-        Objects.equals(this.relatedParty, financialAccount.relatedParty) &&
-        Objects.equals(this.taxExemption, financialAccount.taxExemption) &&
-        Objects.equals(this.baseType, financialAccount.baseType) &&
-        Objects.equals(this.schemaLocation, financialAccount.schemaLocation) &&
-        Objects.equals(this.type, financialAccount.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, accountType, description, lastModified, name, state, accountBalance, accountRelationship, contact, creditLimit, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccount {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEvent.java
deleted file mode 100644
index f3155e43a1fd3e4e0679cdb35ea4512e2c64282c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private FinancialAccountAttributeValueChangeEventPayload event = null;
-
-  public FinancialAccountAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public FinancialAccountAttributeValueChangeEvent event(FinancialAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public FinancialAccountAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(FinancialAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountAttributeValueChangeEvent financialAccountAttributeValueChangeEvent = (FinancialAccountAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, financialAccountAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, financialAccountAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, financialAccountAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, financialAccountAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, financialAccountAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, financialAccountAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, financialAccountAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, financialAccountAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, financialAccountAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, financialAccountAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, financialAccountAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEventPayload.java
deleted file mode 100644
index ee7389f2238c2429387f82ef290e42d1af74580a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountAttributeValueChangeEventPayload   {
-  @JsonProperty("financialAccount")
-  private FinancialAccount financialAccount = null;
-
-  public FinancialAccountAttributeValueChangeEventPayload financialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return financialAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public FinancialAccount getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountAttributeValueChangeEventPayload financialAccountAttributeValueChangeEventPayload = (FinancialAccountAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.financialAccount, financialAccountAttributeValueChangeEventPayload.financialAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(financialAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreate.java
deleted file mode 100644
index 6236a5f1fd5a435acdd8518a1599b2ca58707e15..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreate.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account. Skipped properties: id,href
- */
-@Schema(description = "An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountCreate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public FinancialAccountCreate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public FinancialAccountCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountCreate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public FinancialAccountCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FinancialAccountCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public FinancialAccountCreate accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public FinancialAccountCreate addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public FinancialAccountCreate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public FinancialAccountCreate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public FinancialAccountCreate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public FinancialAccountCreate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public FinancialAccountCreate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public FinancialAccountCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public FinancialAccountCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public FinancialAccountCreate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public FinancialAccountCreate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public FinancialAccountCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public FinancialAccountCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public FinancialAccountCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountCreate financialAccountCreate = (FinancialAccountCreate) o;
-    return Objects.equals(this.accountType, financialAccountCreate.accountType) &&
-        Objects.equals(this.description, financialAccountCreate.description) &&
-        Objects.equals(this.lastModified, financialAccountCreate.lastModified) &&
-        Objects.equals(this.name, financialAccountCreate.name) &&
-        Objects.equals(this.state, financialAccountCreate.state) &&
-        Objects.equals(this.accountBalance, financialAccountCreate.accountBalance) &&
-        Objects.equals(this.accountRelationship, financialAccountCreate.accountRelationship) &&
-        Objects.equals(this.contact, financialAccountCreate.contact) &&
-        Objects.equals(this.creditLimit, financialAccountCreate.creditLimit) &&
-        Objects.equals(this.relatedParty, financialAccountCreate.relatedParty) &&
-        Objects.equals(this.taxExemption, financialAccountCreate.taxExemption) &&
-        Objects.equals(this.baseType, financialAccountCreate.baseType) &&
-        Objects.equals(this.schemaLocation, financialAccountCreate.schemaLocation) &&
-        Objects.equals(this.type, financialAccountCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, state, accountBalance, accountRelationship, contact, creditLimit, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountCreate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEvent.java
deleted file mode 100644
index 6390738b4b1e1fba877760e4c53ecf10e2f0048b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private FinancialAccountCreateEventPayload event = null;
-
-  public FinancialAccountCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public FinancialAccountCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public FinancialAccountCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public FinancialAccountCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public FinancialAccountCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public FinancialAccountCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public FinancialAccountCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public FinancialAccountCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public FinancialAccountCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public FinancialAccountCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public FinancialAccountCreateEvent event(FinancialAccountCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public FinancialAccountCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(FinancialAccountCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountCreateEvent financialAccountCreateEvent = (FinancialAccountCreateEvent) o;
-    return Objects.equals(this.id, financialAccountCreateEvent.id) &&
-        Objects.equals(this.href, financialAccountCreateEvent.href) &&
-        Objects.equals(this.eventId, financialAccountCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, financialAccountCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, financialAccountCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, financialAccountCreateEvent.correlationId) &&
-        Objects.equals(this.domain, financialAccountCreateEvent.domain) &&
-        Objects.equals(this.title, financialAccountCreateEvent.title) &&
-        Objects.equals(this.description, financialAccountCreateEvent.description) &&
-        Objects.equals(this.priority, financialAccountCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, financialAccountCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, financialAccountCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEventPayload.java
deleted file mode 100644
index e757c54a8272535b384b1715450c380082c6501e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountCreateEventPayload   {
-  @JsonProperty("financialAccount")
-  private FinancialAccount financialAccount = null;
-
-  public FinancialAccountCreateEventPayload financialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return financialAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public FinancialAccount getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountCreateEventPayload financialAccountCreateEventPayload = (FinancialAccountCreateEventPayload) o;
-    return Objects.equals(this.financialAccount, financialAccountCreateEventPayload.financialAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(financialAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountCreateEventPayload {\n");
-    
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEvent.java
deleted file mode 100644
index 97c4c967e3ba01b74d102b05f304fd91b8587401..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private FinancialAccountDeleteEventPayload event = null;
-
-  public FinancialAccountDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public FinancialAccountDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public FinancialAccountDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public FinancialAccountDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public FinancialAccountDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public FinancialAccountDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public FinancialAccountDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public FinancialAccountDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public FinancialAccountDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public FinancialAccountDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public FinancialAccountDeleteEvent event(FinancialAccountDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public FinancialAccountDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(FinancialAccountDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountDeleteEvent financialAccountDeleteEvent = (FinancialAccountDeleteEvent) o;
-    return Objects.equals(this.id, financialAccountDeleteEvent.id) &&
-        Objects.equals(this.href, financialAccountDeleteEvent.href) &&
-        Objects.equals(this.eventId, financialAccountDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, financialAccountDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, financialAccountDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, financialAccountDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, financialAccountDeleteEvent.domain) &&
-        Objects.equals(this.title, financialAccountDeleteEvent.title) &&
-        Objects.equals(this.description, financialAccountDeleteEvent.description) &&
-        Objects.equals(this.priority, financialAccountDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, financialAccountDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, financialAccountDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEventPayload.java
deleted file mode 100644
index 0f8344bddfde54d52053f757693663878edb3792..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountDeleteEventPayload   {
-  @JsonProperty("financialAccount")
-  private FinancialAccount financialAccount = null;
-
-  public FinancialAccountDeleteEventPayload financialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return financialAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public FinancialAccount getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountDeleteEventPayload financialAccountDeleteEventPayload = (FinancialAccountDeleteEventPayload) o;
-    return Objects.equals(this.financialAccount, financialAccountDeleteEventPayload.financialAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(financialAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountDeleteEventPayload {\n");
-    
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountRef.java
deleted file mode 100644
index 12502fddaaa38588d9ae91923f2ae91bbea9de44..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountRef.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * AccountReceivable reference. An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. An account receivable aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party.
- */
-@Schema(description = "AccountReceivable reference. An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. An account receivable aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("accountBalance")
-  private AccountBalance accountBalance = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public FinancialAccountRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public FinancialAccountRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public FinancialAccountRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FinancialAccountRef accountBalance(AccountBalance accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public AccountBalance getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(AccountBalance accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public FinancialAccountRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public FinancialAccountRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public FinancialAccountRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public FinancialAccountRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountRef financialAccountRef = (FinancialAccountRef) o;
-    return Objects.equals(this.id, financialAccountRef.id) &&
-        Objects.equals(this.href, financialAccountRef.href) &&
-        Objects.equals(this.name, financialAccountRef.name) &&
-        Objects.equals(this.accountBalance, financialAccountRef.accountBalance) &&
-        Objects.equals(this.baseType, financialAccountRef.baseType) &&
-        Objects.equals(this.schemaLocation, financialAccountRef.schemaLocation) &&
-        Objects.equals(this.type, financialAccountRef.type) &&
-        Objects.equals(this.referredType, financialAccountRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, accountBalance, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEvent.java
deleted file mode 100644
index 57c9cd91ac90bc15825fb0255d7942c4facd226f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private FinancialAccountStateChangeEventPayload event = null;
-
-  public FinancialAccountStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public FinancialAccountStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public FinancialAccountStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public FinancialAccountStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public FinancialAccountStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public FinancialAccountStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public FinancialAccountStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public FinancialAccountStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public FinancialAccountStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public FinancialAccountStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public FinancialAccountStateChangeEvent event(FinancialAccountStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public FinancialAccountStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(FinancialAccountStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountStateChangeEvent financialAccountStateChangeEvent = (FinancialAccountStateChangeEvent) o;
-    return Objects.equals(this.id, financialAccountStateChangeEvent.id) &&
-        Objects.equals(this.href, financialAccountStateChangeEvent.href) &&
-        Objects.equals(this.eventId, financialAccountStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, financialAccountStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, financialAccountStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, financialAccountStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, financialAccountStateChangeEvent.domain) &&
-        Objects.equals(this.title, financialAccountStateChangeEvent.title) &&
-        Objects.equals(this.description, financialAccountStateChangeEvent.description) &&
-        Objects.equals(this.priority, financialAccountStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, financialAccountStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, financialAccountStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEventPayload.java
deleted file mode 100644
index 830e069b937566bcac5c5b2f2e2f7226e6b7a42d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountStateChangeEventPayload   {
-  @JsonProperty("financialAccount")
-  private FinancialAccount financialAccount = null;
-
-  public FinancialAccountStateChangeEventPayload financialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return financialAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public FinancialAccount getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccount financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountStateChangeEventPayload financialAccountStateChangeEventPayload = (FinancialAccountStateChangeEventPayload) o;
-    return Objects.equals(this.financialAccount, financialAccountStateChangeEventPayload.financialAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(financialAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountStateChangeEventPayload {\n");
-    
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountUpdate.java
deleted file mode 100644
index 4a2b29d303494331e547296579db0811aa21835d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/FinancialAccountUpdate.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account. Skipped properties: id,href,lastModified
- */
-@Schema(description = "An account of money owed by a party to another entity in exchange for goods or services that have been delivered or used. A financial (account receivable account/account payable) aggregates the amounts of one or more party accounts (billing or settlement) owned by a given party. It is a specialization of entity Account. Skipped properties: id,href,lastModified")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class FinancialAccountUpdate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public FinancialAccountUpdate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public FinancialAccountUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public FinancialAccountUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FinancialAccountUpdate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public FinancialAccountUpdate accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public FinancialAccountUpdate addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public FinancialAccountUpdate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public FinancialAccountUpdate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public FinancialAccountUpdate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public FinancialAccountUpdate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public FinancialAccountUpdate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public FinancialAccountUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public FinancialAccountUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public FinancialAccountUpdate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public FinancialAccountUpdate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public FinancialAccountUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public FinancialAccountUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public FinancialAccountUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FinancialAccountUpdate financialAccountUpdate = (FinancialAccountUpdate) o;
-    return Objects.equals(this.accountType, financialAccountUpdate.accountType) &&
-        Objects.equals(this.description, financialAccountUpdate.description) &&
-        Objects.equals(this.name, financialAccountUpdate.name) &&
-        Objects.equals(this.state, financialAccountUpdate.state) &&
-        Objects.equals(this.accountBalance, financialAccountUpdate.accountBalance) &&
-        Objects.equals(this.accountRelationship, financialAccountUpdate.accountRelationship) &&
-        Objects.equals(this.contact, financialAccountUpdate.contact) &&
-        Objects.equals(this.creditLimit, financialAccountUpdate.creditLimit) &&
-        Objects.equals(this.relatedParty, financialAccountUpdate.relatedParty) &&
-        Objects.equals(this.taxExemption, financialAccountUpdate.taxExemption) &&
-        Objects.equals(this.baseType, financialAccountUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, financialAccountUpdate.schemaLocation) &&
-        Objects.equals(this.type, financialAccountUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, name, state, accountBalance, accountRelationship, contact, creditLimit, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FinancialAccountUpdate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/MediumCharacteristic.java b/src/main/java/org/etsi/osl/tmf/am666/model/MediumCharacteristic.java
deleted file mode 100644
index e2cc66da5a858fd4116c21b23d0f77a2cc941c14..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/MediumCharacteristic.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)
- */
-@Schema(description = "Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class MediumCharacteristic   {
-  @JsonProperty("city")
-  private String city = null;
-
-  @JsonProperty("contactType")
-  private String contactType = null;
-
-  @JsonProperty("country")
-  private String country = null;
-
-  @JsonProperty("emailAddress")
-  private String emailAddress = null;
-
-  @JsonProperty("faxNumber")
-  private String faxNumber = null;
-
-  @JsonProperty("phoneNumber")
-  private String phoneNumber = null;
-
-  @JsonProperty("postCode")
-  private String postCode = null;
-
-  @JsonProperty("socialNetworkId")
-  private String socialNetworkId = null;
-
-  @JsonProperty("stateOrProvince")
-  private String stateOrProvince = null;
-
-  @JsonProperty("street1")
-  private String street1 = null;
-
-  @JsonProperty("street2")
-  private String street2 = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public MediumCharacteristic city(String city) {
-    this.city = city;
-    return this;
-  }
-
-  /**
-   * The city
-   * @return city
-  **/
-  @Schema(description = "The city")
-
-
-  public String getCity() {
-    return city;
-  }
-
-  public void setCity(String city) {
-    this.city = city;
-  }
-
-  public MediumCharacteristic contactType(String contactType) {
-    this.contactType = contactType;
-    return this;
-  }
-
-  /**
-   * The type of contact, for example: phone number such as mobile, fixed home, fixed office. postal address such as shipping instalation…
-   * @return contactType
-  **/
-  @Schema(description = "The type of contact, for example: phone number such as mobile, fixed home, fixed office. postal address such as shipping instalation…")
-
-
-  public String getContactType() {
-    return contactType;
-  }
-
-  public void setContactType(String contactType) {
-    this.contactType = contactType;
-  }
-
-  public MediumCharacteristic country(String country) {
-    this.country = country;
-    return this;
-  }
-
-  /**
-   * The country
-   * @return country
-  **/
-  @Schema(description = "The country")
-
-
-  public String getCountry() {
-    return country;
-  }
-
-  public void setCountry(String country) {
-    this.country = country;
-  }
-
-  public MediumCharacteristic emailAddress(String emailAddress) {
-    this.emailAddress = emailAddress;
-    return this;
-  }
-
-  /**
-   * Full email address in standard format
-   * @return emailAddress
-  **/
-  @Schema(description = "Full email address in standard format")
-
-
-  public String getEmailAddress() {
-    return emailAddress;
-  }
-
-  public void setEmailAddress(String emailAddress) {
-    this.emailAddress = emailAddress;
-  }
-
-  public MediumCharacteristic faxNumber(String faxNumber) {
-    this.faxNumber = faxNumber;
-    return this;
-  }
-
-  /**
-   * The fax number of the contact
-   * @return faxNumber
-  **/
-  @Schema(description = "The fax number of the contact")
-
-
-  public String getFaxNumber() {
-    return faxNumber;
-  }
-
-  public void setFaxNumber(String faxNumber) {
-    this.faxNumber = faxNumber;
-  }
-
-  public MediumCharacteristic phoneNumber(String phoneNumber) {
-    this.phoneNumber = phoneNumber;
-    return this;
-  }
-
-  /**
-   * The primary phone number of the contact
-   * @return phoneNumber
-  **/
-  @Schema(description = "The primary phone number of the contact")
-
-
-  public String getPhoneNumber() {
-    return phoneNumber;
-  }
-
-  public void setPhoneNumber(String phoneNumber) {
-    this.phoneNumber = phoneNumber;
-  }
-
-  public MediumCharacteristic postCode(String postCode) {
-    this.postCode = postCode;
-    return this;
-  }
-
-  /**
-   * Postcode
-   * @return postCode
-  **/
-  @Schema(description = "Postcode")
-
-
-  public String getPostCode() {
-    return postCode;
-  }
-
-  public void setPostCode(String postCode) {
-    this.postCode = postCode;
-  }
-
-  public MediumCharacteristic socialNetworkId(String socialNetworkId) {
-    this.socialNetworkId = socialNetworkId;
-    return this;
-  }
-
-  /**
-   * Identifier as a member of a social network
-   * @return socialNetworkId
-  **/
-  @Schema(description = "Identifier as a member of a social network")
-
-
-  public String getSocialNetworkId() {
-    return socialNetworkId;
-  }
-
-  public void setSocialNetworkId(String socialNetworkId) {
-    this.socialNetworkId = socialNetworkId;
-  }
-
-  public MediumCharacteristic stateOrProvince(String stateOrProvince) {
-    this.stateOrProvince = stateOrProvince;
-    return this;
-  }
-
-  /**
-   * State or province
-   * @return stateOrProvince
-  **/
-  @Schema(description = "State or province")
-
-
-  public String getStateOrProvince() {
-    return stateOrProvince;
-  }
-
-  public void setStateOrProvince(String stateOrProvince) {
-    this.stateOrProvince = stateOrProvince;
-  }
-
-  public MediumCharacteristic street1(String street1) {
-    this.street1 = street1;
-    return this;
-  }
-
-  /**
-   * Describes the street
-   * @return street1
-  **/
-  @Schema(description = "Describes the street")
-
-
-  public String getStreet1() {
-    return street1;
-  }
-
-  public void setStreet1(String street1) {
-    this.street1 = street1;
-  }
-
-  public MediumCharacteristic street2(String street2) {
-    this.street2 = street2;
-    return this;
-  }
-
-  /**
-   * Complementary street description
-   * @return street2
-  **/
-  @Schema(description = "Complementary street description")
-
-
-  public String getStreet2() {
-    return street2;
-  }
-
-  public void setStreet2(String street2) {
-    this.street2 = street2;
-  }
-
-  public MediumCharacteristic baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public MediumCharacteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public MediumCharacteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MediumCharacteristic mediumCharacteristic = (MediumCharacteristic) o;
-    return Objects.equals(this.city, mediumCharacteristic.city) &&
-        Objects.equals(this.contactType, mediumCharacteristic.contactType) &&
-        Objects.equals(this.country, mediumCharacteristic.country) &&
-        Objects.equals(this.emailAddress, mediumCharacteristic.emailAddress) &&
-        Objects.equals(this.faxNumber, mediumCharacteristic.faxNumber) &&
-        Objects.equals(this.phoneNumber, mediumCharacteristic.phoneNumber) &&
-        Objects.equals(this.postCode, mediumCharacteristic.postCode) &&
-        Objects.equals(this.socialNetworkId, mediumCharacteristic.socialNetworkId) &&
-        Objects.equals(this.stateOrProvince, mediumCharacteristic.stateOrProvince) &&
-        Objects.equals(this.street1, mediumCharacteristic.street1) &&
-        Objects.equals(this.street2, mediumCharacteristic.street2) &&
-        Objects.equals(this.baseType, mediumCharacteristic.baseType) &&
-        Objects.equals(this.schemaLocation, mediumCharacteristic.schemaLocation) &&
-        Objects.equals(this.type, mediumCharacteristic.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(city, contactType, country, emailAddress, faxNumber, phoneNumber, postCode, socialNetworkId, stateOrProvince, street1, street2, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MediumCharacteristic {\n");
-    
-    sb.append("    city: ").append(toIndentedString(city)).append("\n");
-    sb.append("    contactType: ").append(toIndentedString(contactType)).append("\n");
-    sb.append("    country: ").append(toIndentedString(country)).append("\n");
-    sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
-    sb.append("    faxNumber: ").append(toIndentedString(faxNumber)).append("\n");
-    sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-    sb.append("    postCode: ").append(toIndentedString(postCode)).append("\n");
-    sb.append("    socialNetworkId: ").append(toIndentedString(socialNetworkId)).append("\n");
-    sb.append("    stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");
-    sb.append("    street1: ").append(toIndentedString(street1)).append("\n");
-    sb.append("    street2: ").append(toIndentedString(street2)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/Money.java b/src/main/java/org/etsi/osl/tmf/am666/model/Money.java
deleted file mode 100644
index c12d62e837daa3ea994eabbe3fb679d4a27fb169..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/Money.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * A base / value business entity used to represent money
- */
-@Schema(description = "A base / value business entity used to represent money")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class Money   {
-  @JsonProperty("unit")
-  private String unit = null;
-
-  @JsonProperty("value")
-  private Float value = null;
-
-  public Money unit(String unit) {
-    this.unit = unit;
-    return this;
-  }
-
-  /**
-   * Currency (ISO4217 norm uses 3 letters to define the currency)
-   * @return unit
-  **/
-  @Schema(description = "Currency (ISO4217 norm uses 3 letters to define the currency)")
-
-
-  public String getUnit() {
-    return unit;
-  }
-
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
-
-  public Money value(Float value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * A positive floating point number
-   * @return value
-  **/
-  @Schema(description = "A positive floating point number")
-
-
-  public Float getValue() {
-    return value;
-  }
-
-  public void setValue(Float value) {
-    this.value = value;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Money money = (Money) o;
-    return Objects.equals(this.unit, money.unit) &&
-        Objects.equals(this.value, money.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unit, value);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Money {\n");
-    
-    sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccount.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccount.java
deleted file mode 100644
index dae3eb7b4b95f4457157c27745fcc65f01fcd0c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccount.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account.
- */
-@Schema(description = "Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccount   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyAccount id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyAccount href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyAccount accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public PartyAccount description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyAccount lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public PartyAccount name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyAccount paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public PartyAccount state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public PartyAccount accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public PartyAccount addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public PartyAccount accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public PartyAccount addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public PartyAccount billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public PartyAccount contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public PartyAccount addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public PartyAccount creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public PartyAccount defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public PartyAccount financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public PartyAccount paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public PartyAccount addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public PartyAccount relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyAccount addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyAccount taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public PartyAccount addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public PartyAccount baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyAccount schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyAccount type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccount partyAccount = (PartyAccount) o;
-    return Objects.equals(this.id, partyAccount.id) &&
-        Objects.equals(this.href, partyAccount.href) &&
-        Objects.equals(this.accountType, partyAccount.accountType) &&
-        Objects.equals(this.description, partyAccount.description) &&
-        Objects.equals(this.lastModified, partyAccount.lastModified) &&
-        Objects.equals(this.name, partyAccount.name) &&
-        Objects.equals(this.paymentStatus, partyAccount.paymentStatus) &&
-        Objects.equals(this.state, partyAccount.state) &&
-        Objects.equals(this.accountBalance, partyAccount.accountBalance) &&
-        Objects.equals(this.accountRelationship, partyAccount.accountRelationship) &&
-        Objects.equals(this.billStructure, partyAccount.billStructure) &&
-        Objects.equals(this.contact, partyAccount.contact) &&
-        Objects.equals(this.creditLimit, partyAccount.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, partyAccount.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, partyAccount.financialAccount) &&
-        Objects.equals(this.paymentPlan, partyAccount.paymentPlan) &&
-        Objects.equals(this.relatedParty, partyAccount.relatedParty) &&
-        Objects.equals(this.taxExemption, partyAccount.taxExemption) &&
-        Objects.equals(this.baseType, partyAccount.baseType) &&
-        Objects.equals(this.schemaLocation, partyAccount.schemaLocation) &&
-        Objects.equals(this.type, partyAccount.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, accountType, description, lastModified, name, paymentStatus, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccount {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEvent.java
deleted file mode 100644
index b75d398cbeb03bb00a8be4a1224d2760819d112e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private PartyAccountAttributeValueChangeEventPayload event = null;
-
-  public PartyAccountAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyAccountAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyAccountAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyAccountAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyAccountAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyAccountAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyAccountAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyAccountAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyAccountAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyAccountAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public PartyAccountAttributeValueChangeEvent event(PartyAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyAccountAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountAttributeValueChangeEvent partyAccountAttributeValueChangeEvent = (PartyAccountAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, partyAccountAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, partyAccountAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, partyAccountAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, partyAccountAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, partyAccountAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, partyAccountAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, partyAccountAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, partyAccountAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyAccountAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, partyAccountAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, partyAccountAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEventPayload.java
deleted file mode 100644
index 52fcf32f6de0467b5525f111960f9741eb94d33a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountAttributeValueChangeEventPayload   {
-  @JsonProperty("partyAccount")
-  private PartyAccount partyAccount = null;
-
-  public PartyAccountAttributeValueChangeEventPayload partyAccount(PartyAccount partyAccount) {
-    this.partyAccount = partyAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyAccount getPartyAccount() {
-    return partyAccount;
-  }
-
-  public void setPartyAccount(PartyAccount partyAccount) {
-    this.partyAccount = partyAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountAttributeValueChangeEventPayload partyAccountAttributeValueChangeEventPayload = (PartyAccountAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.partyAccount, partyAccountAttributeValueChangeEventPayload.partyAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    partyAccount: ").append(toIndentedString(partyAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountCreate.java
deleted file mode 100644
index 0b992ce40a64fa98d1e62ee32b9d348eec666604..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountCreate.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account. Skipped properties: id,href
- */
-@Schema(description = "Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountCreate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyAccountCreate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public PartyAccountCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyAccountCreate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public PartyAccountCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyAccountCreate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public PartyAccountCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public PartyAccountCreate accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public PartyAccountCreate addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public PartyAccountCreate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public PartyAccountCreate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public PartyAccountCreate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public PartyAccountCreate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public PartyAccountCreate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public PartyAccountCreate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public PartyAccountCreate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public PartyAccountCreate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public PartyAccountCreate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public PartyAccountCreate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public PartyAccountCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyAccountCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyAccountCreate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public PartyAccountCreate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public PartyAccountCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyAccountCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyAccountCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountCreate partyAccountCreate = (PartyAccountCreate) o;
-    return Objects.equals(this.accountType, partyAccountCreate.accountType) &&
-        Objects.equals(this.description, partyAccountCreate.description) &&
-        Objects.equals(this.lastModified, partyAccountCreate.lastModified) &&
-        Objects.equals(this.name, partyAccountCreate.name) &&
-        Objects.equals(this.paymentStatus, partyAccountCreate.paymentStatus) &&
-        Objects.equals(this.state, partyAccountCreate.state) &&
-        Objects.equals(this.accountBalance, partyAccountCreate.accountBalance) &&
-        Objects.equals(this.accountRelationship, partyAccountCreate.accountRelationship) &&
-        Objects.equals(this.billStructure, partyAccountCreate.billStructure) &&
-        Objects.equals(this.contact, partyAccountCreate.contact) &&
-        Objects.equals(this.creditLimit, partyAccountCreate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, partyAccountCreate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, partyAccountCreate.financialAccount) &&
-        Objects.equals(this.paymentPlan, partyAccountCreate.paymentPlan) &&
-        Objects.equals(this.relatedParty, partyAccountCreate.relatedParty) &&
-        Objects.equals(this.taxExemption, partyAccountCreate.taxExemption) &&
-        Objects.equals(this.baseType, partyAccountCreate.baseType) &&
-        Objects.equals(this.schemaLocation, partyAccountCreate.schemaLocation) &&
-        Objects.equals(this.type, partyAccountCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountCreate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEvent.java
deleted file mode 100644
index c0025e7add4eff21652c6d3ea8aa51178818d246..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private PartyAccountStateChangeEventPayload event = null;
-
-  public PartyAccountStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyAccountStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyAccountStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyAccountStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyAccountStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyAccountStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyAccountStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyAccountStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyAccountStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyAccountStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyAccountStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyAccountStateChangeEvent event(PartyAccountStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyAccountStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyAccountStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountStateChangeEvent partyAccountStateChangeEvent = (PartyAccountStateChangeEvent) o;
-    return Objects.equals(this.id, partyAccountStateChangeEvent.id) &&
-        Objects.equals(this.href, partyAccountStateChangeEvent.href) &&
-        Objects.equals(this.eventId, partyAccountStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, partyAccountStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, partyAccountStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, partyAccountStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, partyAccountStateChangeEvent.domain) &&
-        Objects.equals(this.title, partyAccountStateChangeEvent.title) &&
-        Objects.equals(this.description, partyAccountStateChangeEvent.description) &&
-        Objects.equals(this.priority, partyAccountStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyAccountStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, partyAccountStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEventPayload.java
deleted file mode 100644
index 1d34d503acddc4d258c7be801723d662998ac854..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountStateChangeEventPayload   {
-  @JsonProperty("partyAccount")
-  private PartyAccount partyAccount = null;
-
-  public PartyAccountStateChangeEventPayload partyAccount(PartyAccount partyAccount) {
-    this.partyAccount = partyAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyAccount getPartyAccount() {
-    return partyAccount;
-  }
-
-  public void setPartyAccount(PartyAccount partyAccount) {
-    this.partyAccount = partyAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountStateChangeEventPayload partyAccountStateChangeEventPayload = (PartyAccountStateChangeEventPayload) o;
-    return Objects.equals(this.partyAccount, partyAccountStateChangeEventPayload.partyAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountStateChangeEventPayload {\n");
-    
-    sb.append("    partyAccount: ").append(toIndentedString(partyAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountUpdate.java
deleted file mode 100644
index 46eac039a79d44708b0fb94fc238d296089a2a90..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PartyAccountUpdate.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account. Skipped properties: id,href,accountBalance
- */
-@Schema(description = "Account used for billing or for settlement purposes concerning a given party (an organization or an individual). It is a specialization of entity Account. Skipped properties: id,href,accountBalance")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PartyAccountUpdate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyAccountUpdate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public PartyAccountUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyAccountUpdate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public PartyAccountUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyAccountUpdate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public PartyAccountUpdate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public PartyAccountUpdate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public PartyAccountUpdate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public PartyAccountUpdate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public PartyAccountUpdate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public PartyAccountUpdate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public PartyAccountUpdate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public PartyAccountUpdate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public PartyAccountUpdate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public PartyAccountUpdate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public PartyAccountUpdate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public PartyAccountUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyAccountUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyAccountUpdate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public PartyAccountUpdate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public PartyAccountUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyAccountUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyAccountUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyAccountUpdate partyAccountUpdate = (PartyAccountUpdate) o;
-    return Objects.equals(this.accountType, partyAccountUpdate.accountType) &&
-        Objects.equals(this.description, partyAccountUpdate.description) &&
-        Objects.equals(this.lastModified, partyAccountUpdate.lastModified) &&
-        Objects.equals(this.name, partyAccountUpdate.name) &&
-        Objects.equals(this.paymentStatus, partyAccountUpdate.paymentStatus) &&
-        Objects.equals(this.state, partyAccountUpdate.state) &&
-        Objects.equals(this.accountRelationship, partyAccountUpdate.accountRelationship) &&
-        Objects.equals(this.billStructure, partyAccountUpdate.billStructure) &&
-        Objects.equals(this.contact, partyAccountUpdate.contact) &&
-        Objects.equals(this.creditLimit, partyAccountUpdate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, partyAccountUpdate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, partyAccountUpdate.financialAccount) &&
-        Objects.equals(this.paymentPlan, partyAccountUpdate.paymentPlan) &&
-        Objects.equals(this.relatedParty, partyAccountUpdate.relatedParty) &&
-        Objects.equals(this.taxExemption, partyAccountUpdate.taxExemption) &&
-        Objects.equals(this.baseType, partyAccountUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, partyAccountUpdate.schemaLocation) &&
-        Objects.equals(this.type, partyAccountUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, state, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyAccountUpdate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PaymentMethodRef.java b/src/main/java/org/etsi/osl/tmf/am666/model/PaymentMethodRef.java
deleted file mode 100644
index 34b8e2afb390a2f166c2a0d1ebf00c5a8deba42c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PaymentMethodRef.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * PaymentMethod reference. A payment method defines a specific mean of payment (e.g direct debit).
- */
-@Schema(description = "PaymentMethod reference. A payment method defines a specific mean of payment (e.g direct debit).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-@Entity(name = "PaymentMethodRef")
-public class PaymentMethodRef    extends  BaseRootNamedEntity{
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public PaymentMethodRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the payment mean
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the payment mean")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  
-
-  public PaymentMethodRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PaymentMethodRef paymentMethodRef = (PaymentMethodRef) o;
-    return Objects.equals(this.id, paymentMethodRef.id) &&
-        Objects.equals(this.href, paymentMethodRef.href) &&
-        Objects.equals(this.name, paymentMethodRef.name) &&
-        Objects.equals(this.baseType, paymentMethodRef.baseType) &&
-        Objects.equals(this.schemaLocation, paymentMethodRef.schemaLocation) &&
-        Objects.equals(this.type, paymentMethodRef.type) &&
-        Objects.equals(this.referredType, paymentMethodRef.referredType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PaymentMethodRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/PaymentPlan.java b/src/main/java/org/etsi/osl/tmf/am666/model/PaymentPlan.java
deleted file mode 100644
index 08c5582598b7af73faa8186fbbd243b3f42ee4c6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/PaymentPlan.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Defines a plan for payment (when a party wants to spread his payments)
- */
-@Schema(description = "Defines a plan for payment (when a party wants to spread his payments)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class PaymentPlan   {
-  @JsonProperty("numberOfPayments")
-  private Integer numberOfPayments = null;
-
-  @JsonProperty("paymentFrequency")
-  private String paymentFrequency = null;
-
-  @JsonProperty("planType")
-  private String planType = null;
-
-  @JsonProperty("priority")
-  private Integer priority = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("paymentMethod")
-  private PaymentMethodRef paymentMethod = null;
-
-  @JsonProperty("totalAmount")
-  private Money totalAmount = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PaymentPlan numberOfPayments(Integer numberOfPayments) {
-    this.numberOfPayments = numberOfPayments;
-    return this;
-  }
-
-  /**
-   * Number of payments used to spread the global payment
-   * @return numberOfPayments
-  **/
-  @Schema(description = "Number of payments used to spread the global payment")
-
-
-  public Integer getNumberOfPayments() {
-    return numberOfPayments;
-  }
-
-  public void setNumberOfPayments(Integer numberOfPayments) {
-    this.numberOfPayments = numberOfPayments;
-  }
-
-  public PaymentPlan paymentFrequency(String paymentFrequency) {
-    this.paymentFrequency = paymentFrequency;
-    return this;
-  }
-
-  /**
-   * Frequency of the payments, such as monthly and bimonthly
-   * @return paymentFrequency
-  **/
-  @Schema(description = "Frequency of the payments, such as monthly and bimonthly")
-
-
-  public String getPaymentFrequency() {
-    return paymentFrequency;
-  }
-
-  public void setPaymentFrequency(String paymentFrequency) {
-    this.paymentFrequency = paymentFrequency;
-  }
-
-  public PaymentPlan planType(String planType) {
-    this.planType = planType;
-    return this;
-  }
-
-  /**
-   * Type of payment plan
-   * @return planType
-  **/
-  @Schema(description = "Type of payment plan")
-
-
-  public String getPlanType() {
-    return planType;
-  }
-
-  public void setPlanType(String planType) {
-    this.planType = planType;
-  }
-
-  public PaymentPlan priority(Integer priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * Priority of the payment plan
-   * @return priority
-  **/
-  @Schema(description = "Priority of the payment plan")
-
-
-  public Integer getPriority() {
-    return priority;
-  }
-
-  public void setPriority(Integer priority) {
-    this.priority = priority;
-  }
-
-  public PaymentPlan status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the payment plan (effective, ineffective)
-   * @return status
-  **/
-  @Schema(description = "Status of the payment plan (effective, ineffective)")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public PaymentPlan paymentMethod(PaymentMethodRef paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  /**
-   * Get paymentMethod
-   * @return paymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(PaymentMethodRef paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public PaymentPlan totalAmount(Money totalAmount) {
-    this.totalAmount = totalAmount;
-    return this;
-  }
-
-  /**
-   * Amount paid
-   * @return totalAmount
-  **/
-  @Schema(description = "Amount paid")
-
-  @Valid
-
-  public Money getTotalAmount() {
-    return totalAmount;
-  }
-
-  public void setTotalAmount(Money totalAmount) {
-    this.totalAmount = totalAmount;
-  }
-
-  public PaymentPlan validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Validity period of the payment plan
-   * @return validFor
-  **/
-  @Schema(description = "Validity period of the payment plan")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public PaymentPlan baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PaymentPlan schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PaymentPlan type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PaymentPlan paymentPlan = (PaymentPlan) o;
-    return Objects.equals(this.numberOfPayments, paymentPlan.numberOfPayments) &&
-        Objects.equals(this.paymentFrequency, paymentPlan.paymentFrequency) &&
-        Objects.equals(this.planType, paymentPlan.planType) &&
-        Objects.equals(this.priority, paymentPlan.priority) &&
-        Objects.equals(this.status, paymentPlan.status) &&
-        Objects.equals(this.paymentMethod, paymentPlan.paymentMethod) &&
-        Objects.equals(this.totalAmount, paymentPlan.totalAmount) &&
-        Objects.equals(this.validFor, paymentPlan.validFor) &&
-        Objects.equals(this.baseType, paymentPlan.baseType) &&
-        Objects.equals(this.schemaLocation, paymentPlan.schemaLocation) &&
-        Objects.equals(this.type, paymentPlan.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(numberOfPayments, paymentFrequency, planType, priority, status, paymentMethod, totalAmount, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PaymentPlan {\n");
-    
-    sb.append("    numberOfPayments: ").append(toIndentedString(numberOfPayments)).append("\n");
-    sb.append("    paymentFrequency: ").append(toIndentedString(paymentFrequency)).append("\n");
-    sb.append("    planType: ").append(toIndentedString(planType)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    totalAmount: ").append(toIndentedString(totalAmount)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccount.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccount.java
deleted file mode 100644
index e01cc25381c6d37bf22a934ec033106227607e74..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccount.java
+++ /dev/null
@@ -1,669 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount.
- */
-@Schema(description = "A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccount   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public SettlementAccount id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the account")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public SettlementAccount href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the account
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the account")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public SettlementAccount accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public SettlementAccount description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public SettlementAccount lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public SettlementAccount name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public SettlementAccount paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public SettlementAccount state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public SettlementAccount accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public SettlementAccount addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public SettlementAccount accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public SettlementAccount addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public SettlementAccount billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public SettlementAccount contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public SettlementAccount addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public SettlementAccount creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public SettlementAccount defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public SettlementAccount financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public SettlementAccount paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public SettlementAccount addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public SettlementAccount relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public SettlementAccount addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public SettlementAccount taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public SettlementAccount addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public SettlementAccount baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public SettlementAccount schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public SettlementAccount type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccount settlementAccount = (SettlementAccount) o;
-    return Objects.equals(this.id, settlementAccount.id) &&
-        Objects.equals(this.href, settlementAccount.href) &&
-        Objects.equals(this.accountType, settlementAccount.accountType) &&
-        Objects.equals(this.description, settlementAccount.description) &&
-        Objects.equals(this.lastModified, settlementAccount.lastModified) &&
-        Objects.equals(this.name, settlementAccount.name) &&
-        Objects.equals(this.paymentStatus, settlementAccount.paymentStatus) &&
-        Objects.equals(this.state, settlementAccount.state) &&
-        Objects.equals(this.accountBalance, settlementAccount.accountBalance) &&
-        Objects.equals(this.accountRelationship, settlementAccount.accountRelationship) &&
-        Objects.equals(this.billStructure, settlementAccount.billStructure) &&
-        Objects.equals(this.contact, settlementAccount.contact) &&
-        Objects.equals(this.creditLimit, settlementAccount.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, settlementAccount.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, settlementAccount.financialAccount) &&
-        Objects.equals(this.paymentPlan, settlementAccount.paymentPlan) &&
-        Objects.equals(this.relatedParty, settlementAccount.relatedParty) &&
-        Objects.equals(this.taxExemption, settlementAccount.taxExemption) &&
-        Objects.equals(this.baseType, settlementAccount.baseType) &&
-        Objects.equals(this.schemaLocation, settlementAccount.schemaLocation) &&
-        Objects.equals(this.type, settlementAccount.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, accountType, description, lastModified, name, paymentStatus, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccount {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEvent.java
deleted file mode 100644
index 7c8eaad5001021f1cbe6e259b5642ae12059bea3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private SettlementAccountAttributeValueChangeEventPayload event = null;
-
-  public SettlementAccountAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public SettlementAccountAttributeValueChangeEvent event(SettlementAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public SettlementAccountAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(SettlementAccountAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountAttributeValueChangeEvent settlementAccountAttributeValueChangeEvent = (SettlementAccountAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, settlementAccountAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, settlementAccountAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, settlementAccountAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, settlementAccountAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, settlementAccountAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, settlementAccountAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, settlementAccountAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, settlementAccountAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, settlementAccountAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, settlementAccountAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, settlementAccountAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEventPayload.java
deleted file mode 100644
index 23747ca63d225b0e6c7fd34d4650b3aace6d4d51..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountAttributeValueChangeEventPayload   {
-  @JsonProperty("settlementAccount")
-  private SettlementAccount settlementAccount = null;
-
-  public SettlementAccountAttributeValueChangeEventPayload settlementAccount(SettlementAccount settlementAccount) {
-    this.settlementAccount = settlementAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return settlementAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public SettlementAccount getSettlementAccount() {
-    return settlementAccount;
-  }
-
-  public void setSettlementAccount(SettlementAccount settlementAccount) {
-    this.settlementAccount = settlementAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountAttributeValueChangeEventPayload settlementAccountAttributeValueChangeEventPayload = (SettlementAccountAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.settlementAccount, settlementAccountAttributeValueChangeEventPayload.settlementAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(settlementAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    settlementAccount: ").append(toIndentedString(settlementAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountCreate.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountCreate.java
deleted file mode 100644
index 4e418315fb40f801a97fe8f02ddc9cf2718145ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountCreate.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href
- */
-@Schema(description = "A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountCreate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountBalance")
-  @Valid
-  private List<AccountBalance> accountBalance = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public SettlementAccountCreate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public SettlementAccountCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public SettlementAccountCreate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public SettlementAccountCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public SettlementAccountCreate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public SettlementAccountCreate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public SettlementAccountCreate accountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-    return this;
-  }
-
-  public SettlementAccountCreate addAccountBalanceItem(AccountBalance accountBalanceItem) {
-    if (this.accountBalance == null) {
-      this.accountBalance = new ArrayList<>();
-    }
-    this.accountBalance.add(accountBalanceItem);
-    return this;
-  }
-
-  /**
-   * Get accountBalance
-   * @return accountBalance
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountBalance> getAccountBalance() {
-    return accountBalance;
-  }
-
-  public void setAccountBalance(List<AccountBalance> accountBalance) {
-    this.accountBalance = accountBalance;
-  }
-
-  public SettlementAccountCreate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public SettlementAccountCreate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public SettlementAccountCreate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public SettlementAccountCreate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public SettlementAccountCreate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public SettlementAccountCreate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public SettlementAccountCreate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public SettlementAccountCreate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public SettlementAccountCreate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public SettlementAccountCreate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public SettlementAccountCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public SettlementAccountCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public SettlementAccountCreate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public SettlementAccountCreate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public SettlementAccountCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public SettlementAccountCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public SettlementAccountCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountCreate settlementAccountCreate = (SettlementAccountCreate) o;
-    return Objects.equals(this.accountType, settlementAccountCreate.accountType) &&
-        Objects.equals(this.description, settlementAccountCreate.description) &&
-        Objects.equals(this.lastModified, settlementAccountCreate.lastModified) &&
-        Objects.equals(this.name, settlementAccountCreate.name) &&
-        Objects.equals(this.paymentStatus, settlementAccountCreate.paymentStatus) &&
-        Objects.equals(this.state, settlementAccountCreate.state) &&
-        Objects.equals(this.accountBalance, settlementAccountCreate.accountBalance) &&
-        Objects.equals(this.accountRelationship, settlementAccountCreate.accountRelationship) &&
-        Objects.equals(this.billStructure, settlementAccountCreate.billStructure) &&
-        Objects.equals(this.contact, settlementAccountCreate.contact) &&
-        Objects.equals(this.creditLimit, settlementAccountCreate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, settlementAccountCreate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, settlementAccountCreate.financialAccount) &&
-        Objects.equals(this.paymentPlan, settlementAccountCreate.paymentPlan) &&
-        Objects.equals(this.relatedParty, settlementAccountCreate.relatedParty) &&
-        Objects.equals(this.taxExemption, settlementAccountCreate.taxExemption) &&
-        Objects.equals(this.baseType, settlementAccountCreate.baseType) &&
-        Objects.equals(this.schemaLocation, settlementAccountCreate.schemaLocation) &&
-        Objects.equals(this.type, settlementAccountCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, state, accountBalance, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountCreate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountBalance: ").append(toIndentedString(accountBalance)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEvent.java
deleted file mode 100644
index febe3143c27f599a75674a86bc323e28d6cfa30f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private SettlementAccountStateChangeEventPayload event = null;
-
-  public SettlementAccountStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public SettlementAccountStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public SettlementAccountStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public SettlementAccountStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public SettlementAccountStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public SettlementAccountStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public SettlementAccountStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public SettlementAccountStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public SettlementAccountStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public SettlementAccountStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public SettlementAccountStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public SettlementAccountStateChangeEvent event(SettlementAccountStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public SettlementAccountStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(SettlementAccountStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountStateChangeEvent settlementAccountStateChangeEvent = (SettlementAccountStateChangeEvent) o;
-    return Objects.equals(this.id, settlementAccountStateChangeEvent.id) &&
-        Objects.equals(this.href, settlementAccountStateChangeEvent.href) &&
-        Objects.equals(this.eventId, settlementAccountStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, settlementAccountStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, settlementAccountStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, settlementAccountStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, settlementAccountStateChangeEvent.domain) &&
-        Objects.equals(this.title, settlementAccountStateChangeEvent.title) &&
-        Objects.equals(this.description, settlementAccountStateChangeEvent.description) &&
-        Objects.equals(this.priority, settlementAccountStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, settlementAccountStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, settlementAccountStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEventPayload.java
deleted file mode 100644
index 3782fbe1d5f0730b8352390fe120a96ebfbd0576..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountStateChangeEventPayload   {
-  @JsonProperty("settlementAccount")
-  private SettlementAccount settlementAccount = null;
-
-  public SettlementAccountStateChangeEventPayload settlementAccount(SettlementAccount settlementAccount) {
-    this.settlementAccount = settlementAccount;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return settlementAccount
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public SettlementAccount getSettlementAccount() {
-    return settlementAccount;
-  }
-
-  public void setSettlementAccount(SettlementAccount settlementAccount) {
-    this.settlementAccount = settlementAccount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountStateChangeEventPayload settlementAccountStateChangeEventPayload = (SettlementAccountStateChangeEventPayload) o;
-    return Objects.equals(this.settlementAccount, settlementAccountStateChangeEventPayload.settlementAccount);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(settlementAccount);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountStateChangeEventPayload {\n");
-    
-    sb.append("    settlementAccount: ").append(toIndentedString(settlementAccount)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountUpdate.java b/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountUpdate.java
deleted file mode 100644
index b67d18f7c65529f3ce671e8f74557d04e7dd39ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/am666/model/SettlementAccountUpdate.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.am666.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href,accountBalance
- */
-@Schema(description = "A party account used for settlement purposes. It includes a description of the bill structure (frequency, presentation media, format and so on). It is a specialization of entity PartyAccount. Skipped properties: id,href,accountBalance")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:49:45.251+03:00")
-
-public class SettlementAccountUpdate   {
-  @JsonProperty("accountType")
-  private String accountType = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("lastModified")
-  private OffsetDateTime lastModified = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("paymentStatus")
-  private String paymentStatus = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("accountRelationship")
-  @Valid
-  private List<AccountRelationship> accountRelationship = null;
-
-  @JsonProperty("billStructure")
-  private BillStructure billStructure = null;
-
-  @JsonProperty("contact")
-  @Valid
-  private List<Contact> contact = null;
-
-  @JsonProperty("creditLimit")
-  private Money creditLimit = null;
-
-  @JsonProperty("defaultPaymentMethod")
-  private PaymentMethodRef defaultPaymentMethod = null;
-
-  @JsonProperty("financialAccount")
-  private FinancialAccountRef financialAccount = null;
-
-  @JsonProperty("paymentPlan")
-  @Valid
-  private List<PaymentPlan> paymentPlan = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = new ArrayList<>();
-
-  @JsonProperty("taxExemption")
-  @Valid
-  private List<AccountTaxExemption> taxExemption = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public SettlementAccountUpdate accountType(String accountType) {
-    this.accountType = accountType;
-    return this;
-  }
-
-  /**
-   * A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.
-   * @return accountType
-  **/
-  @Schema(description = "A categorization of an account, such as individual, joint, and so forth, whose instances share some of the same characteristics. Note: for flexibility we use a String here but an implementation may use an enumeration with a limited list of valid values.")
-
-
-  public String getAccountType() {
-    return accountType;
-  }
-
-  public void setAccountType(String accountType) {
-    this.accountType = accountType;
-  }
-
-  public SettlementAccountUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Detailed description of the party account
-   * @return description
-  **/
-  @Schema(description = "Detailed description of the party account")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public SettlementAccountUpdate lastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-    return this;
-  }
-
-  /**
-   * Date of last modification of the account
-   * @return lastModified
-  **/
-  @Schema(description = "Date of last modification of the account")
-
-  @Valid
-
-  public OffsetDateTime getLastModified() {
-    return lastModified;
-  }
-
-  public void setLastModified(OffsetDateTime lastModified) {
-    this.lastModified = lastModified;
-  }
-
-  public SettlementAccountUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the account
-   * @return name
-  **/
-  @Schema(description = "Name of the account")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public SettlementAccountUpdate paymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-    return this;
-  }
-
-  /**
-   * The condition of the account, such as due, paid, in arrears.
-   * @return paymentStatus
-  **/
-  @Schema(description = "The condition of the account, such as due, paid, in arrears.")
-
-
-  public String getPaymentStatus() {
-    return paymentStatus;
-  }
-
-  public void setPaymentStatus(String paymentStatus) {
-    this.paymentStatus = paymentStatus;
-  }
-
-  public SettlementAccountUpdate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Contains the lifecycle state such as: Active, Closed, Suspended and so on.
-   * @return state
-  **/
-  @Schema(description = "Contains the lifecycle state such as: Active, Closed, Suspended and so on.")
-
-
-  public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public SettlementAccountUpdate accountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-    return this;
-  }
-
-  public SettlementAccountUpdate addAccountRelationshipItem(AccountRelationship accountRelationshipItem) {
-    if (this.accountRelationship == null) {
-      this.accountRelationship = new ArrayList<>();
-    }
-    this.accountRelationship.add(accountRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get accountRelationship
-   * @return accountRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRelationship> getAccountRelationship() {
-    return accountRelationship;
-  }
-
-  public void setAccountRelationship(List<AccountRelationship> accountRelationship) {
-    this.accountRelationship = accountRelationship;
-  }
-
-  public SettlementAccountUpdate billStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-    return this;
-  }
-
-  /**
-   * Get billStructure
-   * @return billStructure
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public BillStructure getBillStructure() {
-    return billStructure;
-  }
-
-  public void setBillStructure(BillStructure billStructure) {
-    this.billStructure = billStructure;
-  }
-
-  public SettlementAccountUpdate contact(List<Contact> contact) {
-    this.contact = contact;
-    return this;
-  }
-
-  public SettlementAccountUpdate addContactItem(Contact contactItem) {
-    if (this.contact == null) {
-      this.contact = new ArrayList<>();
-    }
-    this.contact.add(contactItem);
-    return this;
-  }
-
-  /**
-   * Get contact
-   * @return contact
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Contact> getContact() {
-    return contact;
-  }
-
-  public void setContact(List<Contact> contact) {
-    this.contact = contact;
-  }
-
-  public SettlementAccountUpdate creditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-    return this;
-  }
-
-  /**
-   * The maximum amount of money that may be charged on an account
-   * @return creditLimit
-  **/
-  @Schema(description = "The maximum amount of money that may be charged on an account")
-
-  @Valid
-
-  public Money getCreditLimit() {
-    return creditLimit;
-  }
-
-  public void setCreditLimit(Money creditLimit) {
-    this.creditLimit = creditLimit;
-  }
-
-  public SettlementAccountUpdate defaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-    return this;
-  }
-
-  /**
-   * Get defaultPaymentMethod
-   * @return defaultPaymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public PaymentMethodRef getDefaultPaymentMethod() {
-    return defaultPaymentMethod;
-  }
-
-  public void setDefaultPaymentMethod(PaymentMethodRef defaultPaymentMethod) {
-    this.defaultPaymentMethod = defaultPaymentMethod;
-  }
-
-  public SettlementAccountUpdate financialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-    return this;
-  }
-
-  /**
-   * Get financialAccount
-   * @return financialAccount
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public FinancialAccountRef getFinancialAccount() {
-    return financialAccount;
-  }
-
-  public void setFinancialAccount(FinancialAccountRef financialAccount) {
-    this.financialAccount = financialAccount;
-  }
-
-  public SettlementAccountUpdate paymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-    return this;
-  }
-
-  public SettlementAccountUpdate addPaymentPlanItem(PaymentPlan paymentPlanItem) {
-    if (this.paymentPlan == null) {
-      this.paymentPlan = new ArrayList<>();
-    }
-    this.paymentPlan.add(paymentPlanItem);
-    return this;
-  }
-
-  /**
-   * Get paymentPlan
-   * @return paymentPlan
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentPlan> getPaymentPlan() {
-    return paymentPlan;
-  }
-
-  public void setPaymentPlan(List<PaymentPlan> paymentPlan) {
-    this.paymentPlan = paymentPlan;
-  }
-
-  public SettlementAccountUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public SettlementAccountUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-@Size(min=1) 
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public SettlementAccountUpdate taxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-    return this;
-  }
-
-  public SettlementAccountUpdate addTaxExemptionItem(AccountTaxExemption taxExemptionItem) {
-    if (this.taxExemption == null) {
-      this.taxExemption = new ArrayList<>();
-    }
-    this.taxExemption.add(taxExemptionItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemption
-   * @return taxExemption
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountTaxExemption> getTaxExemption() {
-    return taxExemption;
-  }
-
-  public void setTaxExemption(List<AccountTaxExemption> taxExemption) {
-    this.taxExemption = taxExemption;
-  }
-
-  public SettlementAccountUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public SettlementAccountUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public SettlementAccountUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SettlementAccountUpdate settlementAccountUpdate = (SettlementAccountUpdate) o;
-    return Objects.equals(this.accountType, settlementAccountUpdate.accountType) &&
-        Objects.equals(this.description, settlementAccountUpdate.description) &&
-        Objects.equals(this.lastModified, settlementAccountUpdate.lastModified) &&
-        Objects.equals(this.name, settlementAccountUpdate.name) &&
-        Objects.equals(this.paymentStatus, settlementAccountUpdate.paymentStatus) &&
-        Objects.equals(this.state, settlementAccountUpdate.state) &&
-        Objects.equals(this.accountRelationship, settlementAccountUpdate.accountRelationship) &&
-        Objects.equals(this.billStructure, settlementAccountUpdate.billStructure) &&
-        Objects.equals(this.contact, settlementAccountUpdate.contact) &&
-        Objects.equals(this.creditLimit, settlementAccountUpdate.creditLimit) &&
-        Objects.equals(this.defaultPaymentMethod, settlementAccountUpdate.defaultPaymentMethod) &&
-        Objects.equals(this.financialAccount, settlementAccountUpdate.financialAccount) &&
-        Objects.equals(this.paymentPlan, settlementAccountUpdate.paymentPlan) &&
-        Objects.equals(this.relatedParty, settlementAccountUpdate.relatedParty) &&
-        Objects.equals(this.taxExemption, settlementAccountUpdate.taxExemption) &&
-        Objects.equals(this.baseType, settlementAccountUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, settlementAccountUpdate.schemaLocation) &&
-        Objects.equals(this.type, settlementAccountUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accountType, description, lastModified, name, paymentStatus, state, accountRelationship, billStructure, contact, creditLimit, defaultPaymentMethod, financialAccount, paymentPlan, relatedParty, taxExemption, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SettlementAccountUpdate {\n");
-    
-    sb.append("    accountType: ").append(toIndentedString(accountType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastModified: ").append(toIndentedString(lastModified)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    paymentStatus: ").append(toIndentedString(paymentStatus)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    accountRelationship: ").append(toIndentedString(accountRelationship)).append("\n");
-    sb.append("    billStructure: ").append(toIndentedString(billStructure)).append("\n");
-    sb.append("    contact: ").append(toIndentedString(contact)).append("\n");
-    sb.append("    creditLimit: ").append(toIndentedString(creditLimit)).append("\n");
-    sb.append("    defaultPaymentMethod: ").append(toIndentedString(defaultPaymentMethod)).append("\n");
-    sb.append("    financialAccount: ").append(toIndentedString(financialAccount)).append("\n");
-    sb.append("    paymentPlan: ").append(toIndentedString(paymentPlan)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    taxExemption: ").append(toIndentedString(taxExemption)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CreditProfile.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CreditProfile.java
deleted file mode 100644
index b36a400f2e7315ea36e9b32cbbbfd53a47b16e34..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CreditProfile.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Credit profile for the party (containing credit scoring, ...). By default only the current credit profile  is retrieved. It can be used as a list to give the party credit profiles history, the first one in the list will be the current one.
- */
-@Schema(description = "Credit profile for the party (containing credit scoring, ...). By default only the current credit profile  is retrieved. It can be used as a list to give the party credit profiles history, the first one in the list will be the current one.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-@Entity(name = "CreditProfile")
-public class CreditProfile   extends BaseRootEntity{
-  @JsonProperty("creditProfileDate")
-  private OffsetDateTime creditProfileDate = null;
-
-  @JsonProperty("creditRiskRating")
-  private Integer creditRiskRating = null;
-
-  @JsonProperty("creditScore")
-  private Integer creditScore = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  public CreditProfile creditProfileDate(OffsetDateTime creditProfileDate) {
-    this.creditProfileDate = creditProfileDate;
-    return this;
-  }
-
-  /**
-   * The date the profile was established
-   * @return creditProfileDate
-  **/
-  @Schema(description = "The date the profile was established")
-  @NotNull
-
-  @Valid
-
-  public OffsetDateTime getCreditProfileDate() {
-    return creditProfileDate;
-  }
-
-  public void setCreditProfileDate(OffsetDateTime creditProfileDate) {
-    this.creditProfileDate = creditProfileDate;
-  }
-
-  public CreditProfile creditRiskRating(Integer creditRiskRating) {
-    this.creditRiskRating = creditRiskRating;
-    return this;
-  }
-
-  /**
-   * This is an integer whose value is used to rate the risk
-   * @return creditRiskRating
-  **/
-  @Schema(description = "This is an integer whose value is used to rate the risk")
-
-
-  public Integer getCreditRiskRating() {
-    return creditRiskRating;
-  }
-
-  public void setCreditRiskRating(Integer creditRiskRating) {
-    this.creditRiskRating = creditRiskRating;
-  }
-
-  public CreditProfile creditScore(Integer creditScore) {
-    this.creditScore = creditScore;
-    return this;
-  }
-
-  /**
-   * A measure of a person or organizations creditworthiness calculated on the basis of a combination of factors such as their income and credit history
-   * @return creditScore
-  **/
-  @Schema(description = "A measure of a person or organizations creditworthiness calculated on the basis of a combination of factors such as their income and credit history")
-
-
-  public Integer getCreditScore() {
-    return creditScore;
-  }
-
-  public void setCreditScore(Integer creditScore) {
-    this.creditScore = creditScore;
-  }
-
-  public CreditProfile validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the profile is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the profile is valid")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
- 
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CreditProfile creditProfile = (CreditProfile) o;
-    return Objects.equals(this.creditProfileDate, creditProfile.creditProfileDate) &&
-        Objects.equals(this.creditRiskRating, creditProfile.creditRiskRating) &&
-        Objects.equals(this.creditScore, creditProfile.creditScore) &&
-        Objects.equals(this.validFor, creditProfile.validFor) &&
-        Objects.equals(this.baseType, creditProfile.baseType) &&
-        Objects.equals(this.schemaLocation, creditProfile.schemaLocation) &&
-        Objects.equals(this.type, creditProfile.type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CreditProfile {\n");
-    
-    sb.append("    creditProfileDate: ").append(toIndentedString(creditProfileDate)).append("\n");
-    sb.append("    creditRiskRating: ").append(toIndentedString(creditRiskRating)).append("\n");
-    sb.append("    creditScore: ").append(toIndentedString(creditScore)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/Customer.java b/src/main/java/org/etsi/osl/tmf/cm629/model/Customer.java
deleted file mode 100644
index 698e9e9bc408f34c38c73a2c4c67fb8610bebfb9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/Customer.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.am666.model.AccountRef;
-import org.etsi.osl.tmf.am666.model.PaymentMethodRef;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.pm632.model.Characteristic;
-import org.etsi.osl.tmf.pm632.model.ContactMedium;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Customer
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-@Entity(name = "Customer")
-public class Customer extends BaseRootNamedEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("status")
-	private String status = null;
-
-	@JsonProperty("statusReason")
-	private String statusReason = null;
-
-	@JsonProperty("account")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AccountRef> account =  new HashSet<>();
-
-	@JsonProperty("agreement")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AgreementRef> agreement = new HashSet<>();
-
-	@JsonProperty("characteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> characteristic = new HashSet<>();
-
-	@JsonProperty("contactMedium")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ContactMedium> contactMedium = new HashSet<>();
-
-	@JsonProperty("creditProfile")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CreditProfile> creditProfile = new HashSet<>();
-
-	@JsonProperty("engagedParty")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn( referencedColumnName = "uuid")
-	private RelatedParty engagedParty = null;
-
-	@JsonProperty("paymentMethod")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PaymentMethodRef> paymentMethod = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty =  new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	/**
-	 * Unique identifier for Customers
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier for Customers")
-
-	public String getId() {
-		return uuid;
-	}
-
-	public Customer status(String status) {
-		this.status = status;
-		return this;
-	}
-
-	/**
-	 * Used to track the lifecycle status of the customer.
-	 * 
-	 * @return status
-	 **/
-	@Schema(description = "Used to track the lifecycle status of the customer.")
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Customer statusReason(String statusReason) {
-		this.statusReason = statusReason;
-		return this;
-	}
-
-	/**
-	 * A string providing an explanation on the value of the status lifecycle. For
-	 * instance if the status is Rejected, statusReason will provide the reason for
-	 * rejection.
-	 * 
-	 * @return statusReason
-	 **/
-	@Schema(description = "A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.")
-
-	public String getStatusReason() {
-		return statusReason;
-	}
-
-	public void setStatusReason(String statusReason) {
-		this.statusReason = statusReason;
-	}
-
-	public Customer account(Set<AccountRef> account) {
-		this.account = account;
-		return this;
-	}
-
-	public Customer addAccountItem(AccountRef accountItem) {
-		if (this.account == null) {
-			this.account = new HashSet<>();
-		}
-		this.account.add(accountItem);
-		return this;
-	}
-
-	/**
-	 * Get account
-	 * 
-	 * @return account
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<AccountRef> getAccount() {
-		return account;
-	}
-
-	public void setAccount(Set<AccountRef> account) {
-		this.account = account;
-	}
-
-	public Customer agreement(Set<AgreementRef> agreement) {
-		this.agreement = agreement;
-		return this;
-	}
-
-	public Customer addAgreementItem(AgreementRef agreementItem) {
-		if (this.agreement == null) {
-			this.agreement = new HashSet<>();
-		}
-		this.agreement.add(agreementItem);
-		return this;
-	}
-
-	/**
-	 * Get agreement
-	 * 
-	 * @return agreement
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<AgreementRef> getAgreement() {
-		return agreement;
-	}
-
-	public void setAgreement(Set<AgreementRef> agreement) {
-		this.agreement = agreement;
-	}
-
-	public Customer characteristic(Set<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-		return this;
-	}
-
-	public Customer addCharacteristicItem(Characteristic characteristicItem) {
-		if (this.characteristic == null) {
-			this.characteristic = new HashSet<>();
-		}
-		this.characteristic.add(characteristicItem);
-		return this;
-	}
-
-	/**
-	 * Describes the characteristic of a customer.
-	 * 
-	 * @return characteristic
-	 **/
-	@Schema(description = "Describes the characteristic of a customer.")
-
-	@Valid
-
-	public Set<Characteristic> getCharacteristic() {
-		return characteristic;
-	}
-
-	public void setCharacteristic(Set<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-	}
-
-	public Customer contactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-		return this;
-	}
-
-	public Customer addContactMediumItem(ContactMedium contactMediumItem) {
-		if (this.contactMedium == null) {
-			this.contactMedium = new HashSet<>();
-		}
-		this.contactMedium.add(contactMediumItem);
-		return this;
-	}
-
-	/**
-	 * Get contactMedium
-	 * 
-	 * @return contactMedium
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ContactMedium> getContactMedium() {
-		return contactMedium;
-	}
-
-	public void setContactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-	}
-
-	public Customer creditProfile(Set<CreditProfile> creditProfile) {
-		this.creditProfile = creditProfile;
-		return this;
-	}
-
-	public Customer addCreditProfileItem(CreditProfile creditProfileItem) {
-		if (this.creditProfile == null) {
-			this.creditProfile = new HashSet<>();
-		}
-		this.creditProfile.add(creditProfileItem);
-		return this;
-	}
-
-	/**
-	 * Get creditProfile
-	 * 
-	 * @return creditProfile
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<CreditProfile> getCreditProfile() {
-		return creditProfile;
-	}
-
-	public void setCreditProfile(Set<CreditProfile> creditProfile) {
-		this.creditProfile = creditProfile;
-	}
-
-	public Customer engagedParty(RelatedParty engagedParty) {
-		this.engagedParty = engagedParty;
-		return this;
-	}
-
-	/**
-	 * The party - an organization or an individual - that is engaged as a customer.
-	 * 
-	 * @return engagedParty
-	 **/
-	@Schema(description = "The party - an organization or an individual - that is engaged as a customer.")
-	@NotNull
-
-	@Valid
-
-	public RelatedParty getEngagedParty() {
-		return engagedParty;
-	}
-
-	public void setEngagedParty(RelatedParty engagedParty) {
-		this.engagedParty = engagedParty;
-	}
-
-	public Customer paymentMethod(Set<PaymentMethodRef> paymentMethod) {
-		this.paymentMethod = paymentMethod;
-		return this;
-	}
-
-	public Customer addPaymentMethodItem(PaymentMethodRef paymentMethodItem) {
-		if (this.paymentMethod == null) {
-			this.paymentMethod = new HashSet<>();
-		}
-		this.paymentMethod.add(paymentMethodItem);
-		return this;
-	}
-
-	/**
-	 * Get paymentMethod
-	 * 
-	 * @return paymentMethod
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<PaymentMethodRef> getPaymentMethod() {
-		return paymentMethod;
-	}
-
-	public void setPaymentMethod(Set<PaymentMethodRef> paymentMethod) {
-		this.paymentMethod = paymentMethod;
-	}
-
-	public Customer relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Customer addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Customer validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The time period that the Customer is valid for.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The time period that the Customer is valid for.")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Customer customer = (Customer) o;
-		return Objects.equals(this.id, customer.id) && Objects.equals(this.href, customer.href)
-				&& Objects.equals(this.name, customer.name) && Objects.equals(this.status, customer.status)
-				&& Objects.equals(this.statusReason, customer.statusReason)
-				&& Objects.equals(this.account, customer.account) && Objects.equals(this.agreement, customer.agreement)
-				&& Objects.equals(this.characteristic, customer.characteristic)
-				&& Objects.equals(this.contactMedium, customer.contactMedium)
-				&& Objects.equals(this.creditProfile, customer.creditProfile)
-				&& Objects.equals(this.engagedParty, customer.engagedParty)
-				&& Objects.equals(this.paymentMethod, customer.paymentMethod)
-				&& Objects.equals(this.relatedParty, customer.relatedParty)
-				&& Objects.equals(this.validFor, customer.validFor) && Objects.equals(this.baseType, customer.baseType)
-				&& Objects.equals(this.schemaLocation, customer.schemaLocation)
-				&& Objects.equals(this.type, customer.type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Customer {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    status: ").append(toIndentedString(status)).append("\n");
-		sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-		sb.append("    account: ").append(toIndentedString(account)).append("\n");
-		sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-		sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-		sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-		sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-		sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-		sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEvent.java
deleted file mode 100644
index 8674f46beaf309ff8e3ac7c2d2226e214e6ba6ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  protected OffsetDateTime eventTime =  OffsetDateTime.now(ZoneOffset.UTC);
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private CustomerAttributeValueChangeEventPayload event = null;
-
-  public CustomerAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CustomerAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  @JsonProperty("eventTime")
- 	public String getEventTimeString() {
- 		return eventTime.toString();
- 	}
- 	
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CustomerAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CustomerAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CustomerAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CustomerAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CustomerAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CustomerAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CustomerAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CustomerAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public CustomerAttributeValueChangeEvent event(CustomerAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CustomerAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CustomerAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerAttributeValueChangeEvent customerAttributeValueChangeEvent = (CustomerAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, customerAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, customerAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, customerAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, customerAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, customerAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, customerAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, customerAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, customerAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, customerAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, customerAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, customerAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEventPayload.java
deleted file mode 100644
index 2505e85c203c201fb809662cc5b8b6f8406dcd39..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerAttributeValueChangeEventPayload   {
-  @JsonProperty("customer")
-  private Customer customer = null;
-
-  public CustomerAttributeValueChangeEventPayload customer(Customer customer) {
-    this.customer = customer;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return customer
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Customer getCustomer() {
-    return customer;
-  }
-
-  public void setCustomer(Customer customer) {
-    this.customer = customer;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerAttributeValueChangeEventPayload customerAttributeValueChangeEventPayload = (CustomerAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.customer, customerAttributeValueChangeEventPayload.customer);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(customer);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    customer: ").append(toIndentedString(customer)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreate.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreate.java
deleted file mode 100644
index cf3b2869c482a330257123c9b6f19ef8a706418e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreate.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- *  Skipped properties: id,href
- */
-@Schema(description = " Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerCreate extends CustomerUpdate  {
- 
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerCreate customerCreate = (CustomerCreate) o;
-    return Objects.equals(this.name, customerCreate.name) &&
-        Objects.equals(this.status, customerCreate.status) &&
-        Objects.equals(this.statusReason, customerCreate.statusReason) &&
-        Objects.equals(this.account, customerCreate.account) &&
-        Objects.equals(this.agreement, customerCreate.agreement) &&
-        Objects.equals(this.characteristic, customerCreate.characteristic) &&
-        Objects.equals(this.contactMedium, customerCreate.contactMedium) &&
-        Objects.equals(this.creditProfile, customerCreate.creditProfile) &&
-        Objects.equals(this.engagedParty, customerCreate.engagedParty) &&
-        Objects.equals(this.paymentMethod, customerCreate.paymentMethod) &&
-        Objects.equals(this.relatedParty, customerCreate.relatedParty) &&
-        Objects.equals(this.validFor, customerCreate.validFor) &&
-        Objects.equals(this.baseType, customerCreate.baseType) &&
-        Objects.equals(this.schemaLocation, customerCreate.schemaLocation) &&
-        Objects.equals(this.type, customerCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, status, statusReason, account, agreement, characteristic, contactMedium, creditProfile, engagedParty, paymentMethod, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-    sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEvent.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEvent.java
deleted file mode 100644
index e80156d7a103b6090251581c916b6f1144ed083b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEvent.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  protected OffsetDateTime eventTime =  OffsetDateTime.now(ZoneOffset.UTC);
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CustomerCreateEventPayload event = null;
-
-  public CustomerCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CustomerCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CustomerCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CustomerCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-  
-  @JsonProperty("eventTime")
-	public String getEventTimeString() {
-		return eventTime.toString();
-	}
-	
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-  
-  
-
-  public CustomerCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CustomerCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CustomerCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CustomerCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CustomerCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CustomerCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CustomerCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CustomerCreateEvent event(CustomerCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CustomerCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CustomerCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerCreateEvent customerCreateEvent = (CustomerCreateEvent) o;
-    return Objects.equals(this.id, customerCreateEvent.id) &&
-        Objects.equals(this.href, customerCreateEvent.href) &&
-        Objects.equals(this.eventId, customerCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, customerCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, customerCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, customerCreateEvent.correlationId) &&
-        Objects.equals(this.domain, customerCreateEvent.domain) &&
-        Objects.equals(this.title, customerCreateEvent.title) &&
-        Objects.equals(this.description, customerCreateEvent.description) &&
-        Objects.equals(this.priority, customerCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, customerCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, customerCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEventPayload.java
deleted file mode 100644
index 165838f84ee676392db08548ee7eb86e14a7db71..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerCreateEventPayload   {
-  @JsonProperty("customer")
-  private Customer customer = null;
-
-  public CustomerCreateEventPayload customer(Customer customer) {
-    this.customer = customer;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return customer
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Customer getCustomer() {
-    return customer;
-  }
-
-  public void setCustomer(Customer customer) {
-    this.customer = customer;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerCreateEventPayload customerCreateEventPayload = (CustomerCreateEventPayload) o;
-    return Objects.equals(this.customer, customerCreateEventPayload.customer);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(customer);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerCreateEventPayload {\n");
-    
-    sb.append("    customer: ").append(toIndentedString(customer)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEvent.java
deleted file mode 100644
index a0e5158b44d992653adec2ccc39efaa8a561a87e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CustomerDeleteEventPayload event = null;
-
-  public CustomerDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CustomerDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CustomerDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CustomerDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CustomerDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CustomerDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CustomerDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CustomerDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CustomerDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CustomerDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CustomerDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CustomerDeleteEvent event(CustomerDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CustomerDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CustomerDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerDeleteEvent customerDeleteEvent = (CustomerDeleteEvent) o;
-    return Objects.equals(this.id, customerDeleteEvent.id) &&
-        Objects.equals(this.href, customerDeleteEvent.href) &&
-        Objects.equals(this.eventId, customerDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, customerDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, customerDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, customerDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, customerDeleteEvent.domain) &&
-        Objects.equals(this.title, customerDeleteEvent.title) &&
-        Objects.equals(this.description, customerDeleteEvent.description) &&
-        Objects.equals(this.priority, customerDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, customerDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, customerDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEventPayload.java
deleted file mode 100644
index 62235792c967d6b29d7e28f8dac303560030a9a6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerDeleteEventPayload   {
-  @JsonProperty("customer")
-  private Customer customer = null;
-
-  public CustomerDeleteEventPayload customer(Customer customer) {
-    this.customer = customer;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return customer
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Customer getCustomer() {
-    return customer;
-  }
-
-  public void setCustomer(Customer customer) {
-    this.customer = customer;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerDeleteEventPayload customerDeleteEventPayload = (CustomerDeleteEventPayload) o;
-    return Objects.equals(this.customer, customerDeleteEventPayload.customer);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(customer);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerDeleteEventPayload {\n");
-    
-    sb.append("    customer: ").append(toIndentedString(customer)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEvent.java
deleted file mode 100644
index 842cd25e6c44a9105e7c5d3fe8fb53cb3e6204c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CustomerStateChangeEventPayload event = null;
-
-  public CustomerStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CustomerStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CustomerStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CustomerStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CustomerStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CustomerStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CustomerStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CustomerStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CustomerStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CustomerStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CustomerStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CustomerStateChangeEvent event(CustomerStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CustomerStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CustomerStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerStateChangeEvent customerStateChangeEvent = (CustomerStateChangeEvent) o;
-    return Objects.equals(this.id, customerStateChangeEvent.id) &&
-        Objects.equals(this.href, customerStateChangeEvent.href) &&
-        Objects.equals(this.eventId, customerStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, customerStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, customerStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, customerStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, customerStateChangeEvent.domain) &&
-        Objects.equals(this.title, customerStateChangeEvent.title) &&
-        Objects.equals(this.description, customerStateChangeEvent.description) &&
-        Objects.equals(this.priority, customerStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, customerStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, customerStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEventPayload.java
deleted file mode 100644
index 35f481bf96cddf36db01cd9de2e3597ce6e1f43d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerStateChangeEventPayload   {
-  @JsonProperty("customer")
-  private Customer customer = null;
-
-  public CustomerStateChangeEventPayload customer(Customer customer) {
-    this.customer = customer;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return customer
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Customer getCustomer() {
-    return customer;
-  }
-
-  public void setCustomer(Customer customer) {
-    this.customer = customer;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerStateChangeEventPayload customerStateChangeEventPayload = (CustomerStateChangeEventPayload) o;
-    return Objects.equals(this.customer, customerStateChangeEventPayload.customer);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(customer);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerStateChangeEventPayload {\n");
-    
-    sb.append("    customer: ").append(toIndentedString(customer)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerUpdate.java b/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerUpdate.java
deleted file mode 100644
index 3e22ecd67ca064a58a9cf0960aa568947b17c38e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/CustomerUpdate.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.am666.model.AccountRef;
-import org.etsi.osl.tmf.am666.model.PaymentMethodRef;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.pm632.model.Characteristic;
-import org.etsi.osl.tmf.pm632.model.ContactMedium;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- *  Skipped properties: id,href
- */
-@Schema(description = " Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class CustomerUpdate   {
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("status")
-  protected String status = null;
-
-  @JsonProperty("statusReason")
-  protected String statusReason = null;
-
-  @JsonProperty("account")
-  @Valid
-  protected List<AccountRef> account = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  protected List<AgreementRef> agreement = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  protected List<Characteristic> characteristic = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  protected List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("creditProfile")
-  @Valid
-  protected List<CreditProfile> creditProfile = null;
-
-  @JsonProperty("engagedParty")
-  protected RelatedParty engagedParty = null;
-
-  @JsonProperty("paymentMethod")
-  @Valid
-  protected List<PaymentMethodRef> paymentMethod = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public CustomerUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which the Customer is known and distinguished from other Customers.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which the Customer is known and distinguished from other Customers.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public CustomerUpdate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Used to track the lifecycle status of the customer.
-   * @return status
-  **/
-  @Schema(description = "Used to track the lifecycle status of the customer.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public CustomerUpdate statusReason(String statusReason) {
-    this.statusReason = statusReason;
-    return this;
-  }
-
-  /**
-   * A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.
-   * @return statusReason
-  **/
-  @Schema(description = "A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.")
-
-
-  public String getStatusReason() {
-    return statusReason;
-  }
-
-  public void setStatusReason(String statusReason) {
-    this.statusReason = statusReason;
-  }
-
-  public CustomerUpdate account(List<AccountRef> account) {
-    this.account = account;
-    return this;
-  }
-
-  public CustomerUpdate addAccountItem(AccountRef accountItem) {
-    if (this.account == null) {
-      this.account = new ArrayList<>();
-    }
-    this.account.add(accountItem);
-    return this;
-  }
-
-  /**
-   * Get account
-   * @return account
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRef> getAccount() {
-    return account;
-  }
-
-  public void setAccount(List<AccountRef> account) {
-    this.account = account;
-  }
-
-  public CustomerUpdate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public CustomerUpdate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public CustomerUpdate characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public CustomerUpdate addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Describes the characteristic of a customer.
-   * @return characteristic
-  **/
-  @Schema(description = "Describes the characteristic of a customer.")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public CustomerUpdate contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public CustomerUpdate addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public CustomerUpdate creditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-    return this;
-  }
-
-  public CustomerUpdate addCreditProfileItem(CreditProfile creditProfileItem) {
-    if (this.creditProfile == null) {
-      this.creditProfile = new ArrayList<>();
-    }
-    this.creditProfile.add(creditProfileItem);
-    return this;
-  }
-
-  /**
-   * Get creditProfile
-   * @return creditProfile
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<CreditProfile> getCreditProfile() {
-    return creditProfile;
-  }
-
-  public void setCreditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-  }
-
-  public CustomerUpdate engagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-    return this;
-  }
-
-  /**
-   * The party - an organization or an individual - that is engaged as a customer.
-   * @return engagedParty
-  **/
-  @Schema(description = "The party - an organization or an individual - that is engaged as a customer.")
-  @NotNull
-
-  @Valid
-
-  public RelatedParty getEngagedParty() {
-    return engagedParty;
-  }
-
-  public void setEngagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-  }
-
-  public CustomerUpdate paymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  public CustomerUpdate addPaymentMethodItem(PaymentMethodRef paymentMethodItem) {
-    if (this.paymentMethod == null) {
-      this.paymentMethod = new ArrayList<>();
-    }
-    this.paymentMethod.add(paymentMethodItem);
-    return this;
-  }
-
-  /**
-   * Get paymentMethod
-   * @return paymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentMethodRef> getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public CustomerUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public CustomerUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public CustomerUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the Customer is valid for.
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the Customer is valid for.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CustomerUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CustomerUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CustomerUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CustomerUpdate customerUpdate = (CustomerUpdate) o;
-    return Objects.equals(this.name, customerUpdate.name) &&
-        Objects.equals(this.status, customerUpdate.status) &&
-        Objects.equals(this.statusReason, customerUpdate.statusReason) &&
-        Objects.equals(this.account, customerUpdate.account) &&
-        Objects.equals(this.agreement, customerUpdate.agreement) &&
-        Objects.equals(this.characteristic, customerUpdate.characteristic) &&
-        Objects.equals(this.contactMedium, customerUpdate.contactMedium) &&
-        Objects.equals(this.creditProfile, customerUpdate.creditProfile) &&
-        Objects.equals(this.engagedParty, customerUpdate.engagedParty) &&
-        Objects.equals(this.paymentMethod, customerUpdate.paymentMethod) &&
-        Objects.equals(this.relatedParty, customerUpdate.relatedParty) &&
-        Objects.equals(this.validFor, customerUpdate.validFor) &&
-        Objects.equals(this.baseType, customerUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, customerUpdate.schemaLocation) &&
-        Objects.equals(this.type, customerUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, status, statusReason, account, agreement, characteristic, contactMedium, creditProfile, engagedParty, paymentMethod, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CustomerUpdate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-    sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/cm629/model/EntityRef.java
deleted file mode 100644
index 829e637d76dacdaa8c4e5f87701f8581b06a9b20..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/EntityRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/Error.java b/src/main/java/org/etsi/osl/tmf/cm629/model/Error.java
deleted file mode 100644
index aa600a524d8abe9983444f4738c24592d2cb1679..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscription.java
deleted file mode 100644
index 5de3d45df6968b55ccc7c8302c609468fa056f3f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscriptionInput.java
deleted file mode 100644
index 2ebea7996b125300cdc9aa023569d82b626ad520..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/cm629/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.cm629.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/Any.java b/src/main/java/org/etsi/osl/tmf/common/model/Any.java
deleted file mode 100644
index ed5751db9ef7c86e03170d6fc2a292656e1200f4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/Any.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import jakarta.persistence.Lob;
-
-/**
- * Any
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Embeddable
-public class Any {
-
-
-	@Lob
-	@Column( columnDefinition = "LONGTEXT")
-	private String value;
-	
-	/**
-	 * provides a meaning to the value. useful in enumerations
-	 */
-	private String alias;
-	
-	public Any() {
-		super();
-	}
-
-
-	public Any(String value) {
-		super();
-		this.value = value;
-	}
-	
-	public Any(String value, String alias) {
-		super();
-		this.value = value;
-		this.alias = alias;
-	}
-	
-	public Any(long value, String alias) {
-		super();
-		this.value = value+"";
-		this.alias = alias;
-	}
-
-	public Any(int value, String alias) {
-		super();
-		this.value = value+"";
-		this.alias = alias;
-	}
-	
-	public Any(int value) {
-		super();
-		this.value = value+"";
-		this.alias = "";
-	}
-	
-	public Any(Any anyval) {
-
-		if (anyval != null) {
-			this.value = anyval.value;
-			this.alias = anyval.alias;
-			
-		}
-	}
-
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @param value the value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-
-		Any a = (Any) o;
-		
-		return Objects.equals(this.value, a.value)
-				&& Objects.equals(this.alias, a.alias );
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash();
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Any {\n");
-	    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-	    sb.append("    alias: ").append(toIndentedString(alias)).append("\n");
-
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-
-	public String getAlias() {
-		return alias;
-	}
-
-
-	public void setAlias(String alias) {
-		this.alias = alias;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/Attachment.java b/src/main/java/org/etsi/osl/tmf/common/model/Attachment.java
deleted file mode 100644
index 0e5e267d11726abbdf68c721e641e960b8bf59e2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/Attachment.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.validation.Valid;
-
-/**
- * Complements the description of an element (for instance a product) through
- * video, pictures...
- */
-@Schema(description = "Complements the description of an element (for instance a product) through video, pictures...")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity(name = "Attachment")
-public class Attachment extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("attachmentType")
-	private String attachmentType = null;
-
-	@Lob
-	@Column(name = "LCONTENT", columnDefinition = "LONGTEXT")
-	@JsonProperty("content")
-	private String content = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("mimeType")
-	private String mimeType = null;
-
-	@JsonProperty("url")
-	private String url = null;
-
-	@JsonProperty("size")
-	private Quantity size = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	/**
-	 * Unique identifier for this particular attachment
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier for this particular attachment")
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public Attachment attachmentType(String attachmentType) {
-		this.attachmentType = attachmentType;
-		return this;
-	}
-
-	/**
-	 * Attachment type such as video, picture
-	 * 
-	 * @return attachmentType
-	 **/
-	@Schema(description = "Attachment type such as video, picture")
-
-	public String getAttachmentType() {
-		return attachmentType;
-	}
-
-	public void setAttachmentType(String attachmentType) {
-		this.attachmentType = attachmentType;
-	}
-
-	public Attachment content(String content) {
-		this.content = content;
-		return this;
-	}
-
-	/**
-	 * The actual contents of the attachment object, if embedded, encoded as base64
-	 * 
-	 * @return content
-	 **/
-	@Schema(description = "The actual contents of the attachment object, if embedded, encoded as base64")
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public Attachment description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative text describing the content of the attachment
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative text describing the content of the attachment")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Attachment mimeType(String mimeType) {
-		this.mimeType = mimeType;
-		return this;
-	}
-
-	/**
-	 * Attachment mime type such as extension file for video, picture and document
-	 * 
-	 * @return mimeType
-	 **/
-	@Schema(description = "Attachment mime type such as extension file for video, picture and document")
-
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	public void setMimeType(String mimeType) {
-		this.mimeType = mimeType;
-	}
-
-	public Attachment url(String url) {
-		this.url = url;
-		return this;
-	}
-
-	/**
-	 * Uniform Resource Locator, is a web page address (a subset of URI)
-	 * 
-	 * @return url
-	 **/
-	@Schema(description = "Uniform Resource Locator, is a web page address (a subset of URI)")
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public Attachment size(Quantity size) {
-		this.size = size;
-		return this;
-	}
-
-	/**
-	 * The size of the attachment.
-	 * 
-	 * @return size
-	 **/
-	@Schema(description = "The size of the attachment.")
-
-	@Valid
-
-	public Quantity getSize() {
-		return size;
-	}
-
-	public void setSize(Quantity size) {
-		this.size = size;
-	}
-
-	public Attachment validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period of time for which the attachment is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period of time for which the attachment is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Attachment attachment = (Attachment) o;
-		return Objects.equals(this.id, attachment.id) && Objects.equals(this.uuid, attachment.uuid)
-				&& Objects.equals(this.href, attachment.href)
-				&& Objects.equals(this.attachmentType, attachment.attachmentType)
-				&& Objects.equals(this.content, attachment.content)
-				&& Objects.equals(this.description, attachment.description)
-				&& Objects.equals(this.mimeType, attachment.mimeType) && Objects.equals(this.name, attachment.name)
-				&& Objects.equals(this.url, attachment.url) && Objects.equals(this.size, attachment.size)
-				&& Objects.equals(this.validFor, attachment.validFor)
-				&& Objects.equals(this.baseType, attachment.baseType)
-				&& Objects.equals(this.schemaLocation, attachment.schemaLocation)
-				&& Objects.equals(this.type, attachment.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(uuid, id, href, attachmentType, content, description, mimeType, name, url, size, validFor,
-				baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Attachment {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    attachmentType: ").append(toIndentedString(attachmentType)).append("\n");
-		sb.append("    content: ").append(toIndentedString(content)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    url: ").append(toIndentedString(url)).append("\n");
-		sb.append("    size: ").append(toIndentedString(size)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRef.java b/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRef.java
deleted file mode 100644
index a46b1539dd44cf1285d7b625104d23c261b9ca42..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRef.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Attachment reference. An attachment complements the description of an element
- * (for instance a product) through video, pictures
- */
-@Schema(description = "Attachment reference. An attachment complements the description of an element (for instance a product) through video, pictures")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "AttachmentRef")
-public class AttachmentRef   extends BaseRootNamedEntity {
-
-	
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("url")
-	private String url = null;
-
-	
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-
-	public AttachmentRef() {
-	}
-
-	public AttachmentRef(AttachmentRef src) {
-		description = src.description;
-		url = src.url;
-		id = src.id;
-	}
-
-	public AttachmentRef description(String description) {
-		this.description = description;
-		return this;
-	}
-	
-	
-
-	/**
-	 * A narrative text describing the content of the attachment
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative text describing the content of the attachment")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public AttachmentRef url(String url) {
-		this.url = url;
-		return this;
-	}
-
-	/**
-	 * Link to the attachment media/content
-	 * 
-	 * @return url
-	 **/
-	@Schema(description = "Link to the attachment media/content")
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public AttachmentRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid
-	 *            the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id
-	 *            the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * @return the href
-	 */
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AttachmentRef attachmentRef = (AttachmentRef) o;
-		return Objects.equals(this.id, attachmentRef.id) && Objects.equals(this.href, attachmentRef.href)
-				&& Objects.equals(this.description, attachmentRef.description)
-				&& Objects.equals(this.url, attachmentRef.url) && Objects.equals(this.baseType, attachmentRef.baseType)
-				&& Objects.equals(this.schemaLocation, attachmentRef.schemaLocation)
-				&& Objects.equals(this.type, attachmentRef.type)
-				&& Objects.equals(this.referredType, attachmentRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, url, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AttachmentRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    url: ").append(toIndentedString(url)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRefOrValue.java b/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRefOrValue.java
deleted file mode 100644
index d3473b55789ffbc3902468cc06b5e36e0fae635e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/AttachmentRefOrValue.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * An attachment by value or by reference. An attachment complements the
- * description of an element, for example through a document, a video, a
- * picture.
- */
-@Schema(description = "An attachment by value or by reference. An attachment complements the description of an element, for example through a document, a video, a picture.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "AttachmentRefOrValue")
-@Table(name = "AttachmentRefOrValue")
-public class AttachmentRefOrValue extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("attachmentType")
-	private String attachmentType = null;
-
-	@JsonProperty("content")
-	private String content = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("mimeType")
-	private String mimeType = null;
-
-	@JsonProperty("url")
-	private String url = null;
-
-	@JsonProperty("size")
-	private Quantity size = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	/**
-	 * Unique identifier for this particular attachment
-	 * 
-	 * @return id
-	 **/
-	@Schema(example = "4aafacbd-11ff-4dc8-b445-305f2215715f", description = "Unique identifier for this particular attachment")
-
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public AttachmentRefOrValue attachmentType(String attachmentType) {
-		this.attachmentType = attachmentType;
-		return this;
-	}
-
-	/**
-	 * Attachment type such as video, picture
-	 * 
-	 * @return attachmentType
-	 **/
-	@Schema(example = "video", description = "Attachment type such as video, picture")
-
-	public String getAttachmentType() {
-		return attachmentType;
-	}
-
-	public void setAttachmentType(String attachmentType) {
-		this.attachmentType = attachmentType;
-	}
-
-	public AttachmentRefOrValue content(String content) {
-		this.content = content;
-		return this;
-	}
-
-	/**
-	 * The actual contents of the attachment object, if embedded, encoded as base64
-	 * 
-	 * @return content
-	 **/
-	@Schema(description = "The actual contents of the attachment object, if embedded, encoded as base64")
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public AttachmentRefOrValue description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative text describing the content of the attachment
-	 * 
-	 * @return description
-	 **/
-	@Schema(example = "Photograph of the Product", description = "A narrative text describing the content of the attachment")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public AttachmentRefOrValue mimeType(String mimeType) {
-		this.mimeType = mimeType;
-		return this;
-	}
-
-	/**
-	 * Attachment mime type such as extension file for video, picture and document
-	 * 
-	 * @return mimeType
-	 **/
-	@Schema(description = "Attachment mime type such as extension file for video, picture and document")
-
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	public void setMimeType(String mimeType) {
-		this.mimeType = mimeType;
-	}
-
-	public AttachmentRefOrValue url(String url) {
-		this.url = url;
-		return this;
-	}
-
-	/**
-	 * Uniform Resource Locator, is a web page address (a subset of URI)
-	 * 
-	 * @return url
-	 **/
-	@Schema(example = "http://host/Content/4aafacbd-11ff-4dc8-b445-305f2215715f", description = "Uniform Resource Locator, is a web page address (a subset of URI)")
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public AttachmentRefOrValue size(Quantity size) {
-		this.size = size;
-		return this;
-	}
-
-	/**
-	 * Get size
-	 * 
-	 * @return size
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Quantity getSize() {
-		return size;
-	}
-
-	public void setSize(Quantity size) {
-		this.size = size;
-	}
-
-	public AttachmentRefOrValue validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public AttachmentRefOrValue _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AttachmentRefOrValue attachmentRefOrValue = (AttachmentRefOrValue) o;
-		return Objects.equals(this.id, attachmentRefOrValue.id) && Objects.equals(this.href, attachmentRefOrValue.href)
-				&& Objects.equals(this.attachmentType, attachmentRefOrValue.attachmentType)
-				&& Objects.equals(this.content, attachmentRefOrValue.content)
-				&& Objects.equals(this.description, attachmentRefOrValue.description)
-				&& Objects.equals(this.mimeType, attachmentRefOrValue.mimeType)
-				&& Objects.equals(this.name, attachmentRefOrValue.name)
-				&& Objects.equals(this.url, attachmentRefOrValue.url)
-				&& Objects.equals(this.size, attachmentRefOrValue.size)
-				&& Objects.equals(this.validFor, attachmentRefOrValue.validFor)
-				&& Objects.equals(this.baseType, attachmentRefOrValue.baseType)
-				&& Objects.equals(this.schemaLocation, attachmentRefOrValue.schemaLocation)
-				&& Objects.equals(this.type, attachmentRefOrValue.type)
-				&& Objects.equals(this._atReferredType, attachmentRefOrValue._atReferredType);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, attachmentType, content, description, mimeType, name, url, size, validFor, baseType, schemaLocation, type, _atReferredType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AttachmentRefOrValue {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    attachmentType: ").append(toIndentedString(attachmentType)).append("\n");
-		sb.append("    content: ").append(toIndentedString(content)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    mimeType: ").append(toIndentedString(mimeType)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    url: ").append(toIndentedString(url)).append("\n");
-		sb.append("    size: ").append(toIndentedString(size)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/BaseEntity.java b/src/main/java/org/etsi/osl/tmf/common/model/BaseEntity.java
deleted file mode 100644
index 0b769356ee2865a777edeb9b277d21cbfbd7a2db..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/BaseEntity.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
-import jakarta.persistence.Lob;
-import jakarta.validation.Valid;
-
-
-
-/**
- * 
- * basic entity that defines common attributes of the model
- * @author ctranoris
- *
- */
-@Entity(name = "BaseEntity")
-@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
-public class BaseEntity extends BaseRootNamedEntity{
-
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	protected String description = null;
-
-	protected OffsetDateTime lastUpdate = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = ELifecycle.IN_STUDY.getValue();
-
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-
-	public BaseEntity() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = "BaseEntity";
-	}
-
-
-	public BaseEntity description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this catalog
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this catalog")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public BaseEntity lastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-		return this;
-	}
-	
-
-	/**
-	 * Date and time of the last update
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update")
-
-	@Valid
-
-	@JsonProperty("lastUpdate")
-	public String getLastUpdateString() {
-		if ( this.lastUpdate != null ) {
-			return this.lastUpdate.toString();			
-		} else {
-			return null;
-		}
-	}
-
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-	
-	public void setLastUpdate (String lastUpdate) {
-		
-		if ( lastUpdate!= null) {
-			this.lastUpdate = OffsetDateTime.parse( lastUpdate );			
-		} else {
-			this.lastUpdate = OffsetDateTime.now();
-		}
-	}
-
-
-	public BaseEntity lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-	
-	public void setLifecycleStatusEnum( ELifecycle alifecycleStatus) {
-		this.lifecycleStatus = alifecycleStatus.getValue();
-	}
-
-
-	public BaseEntity version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Entity version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Entity version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-
-	/**
-	 * The period for which the entity is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the entity is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BaseEntity Entity = (BaseEntity) o;
-		return Objects.equals(this.uuid, Entity.uuid) && Objects.equals(this.href, Entity.href)
-				&& Objects.equals(this.description, Entity.description)
-				&& Objects.equals(this.lastUpdate, Entity.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, Entity.lifecycleStatus)
-				&& Objects.equals(this.name, Entity.name)
-				&& Objects.equals(this.version, Entity.version)
-				&& Objects.equals(this.validFor, Entity.validFor)
-				&& Objects.equals(this.baseType, Entity.baseType)
-				&& Objects.equals(this.schemaLocation, Entity.schemaLocation)
-				&& Objects.equals(this.type, Entity.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(uuid, href, description, lastUpdate, lifecycleStatus, name, 
-				version, 
-				validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Entity {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-	
-
-	public void copyFromObj(BaseEntity be) {
-		super.copyFromObj(be);
-		this.description = be.description;
-		this.lastUpdate = be.lastUpdate;
-		this.lifecycleStatus = be.lifecycleStatus;
-		this.version = be.version;
-		if ( this.validFor != null) {
-			this.validFor.copyFromObj(be.validFor);			
-		}
-			
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/BaseRootEntity.java b/src/main/java/org/etsi/osl/tmf/common/model/BaseRootEntity.java
deleted file mode 100644
index 564fcade7b97bbb1914a13ecd61e4279027ee142..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/BaseRootEntity.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.hibernate.annotations.GenericGenerator;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
-
-/**
- * 
- * basic root entity that defines common attributes of the model
- * 
- * @author ctranoris
- *
- */
-@Entity(name = "BaseRootEntity")
-@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
-public class BaseRootEntity {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = "BaseEntity";
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-	
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-
-
-	@JsonProperty("href")
-	protected String href = null;
-
-
-	
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-
-	public BaseRootEntity baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-	
-	
-
-
-	/**
-	 * Unique reference of the entity
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Unique reference of the entity")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public BaseRootEntity schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BaseRootEntity Entity = (BaseRootEntity) o;
-		return Objects.equals(this.uuid, Entity.uuid) 
-				&& Objects.equals(this.baseType, Entity.baseType)
-				&& Objects.equals(this.schemaLocation, Entity.schemaLocation);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, 
-//
-//				baseType, schemaLocation);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Entity {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	public void copyFromObj(BaseRootEntity be) {
-		this.uuid = be.uuid;
-		this.baseType = be.baseType;
-		this.schemaLocation = be.schemaLocation;
-		this.type = be.type;
-		
-	}
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	/**
-	 * @return the type
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/BaseRootNamedEntity.java b/src/main/java/org/etsi/osl/tmf/common/model/BaseRootNamedEntity.java
deleted file mode 100644
index b7f8aba29169475f06d7d44253282554707db597..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/BaseRootNamedEntity.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Index;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
-import jakarta.persistence.Table;
-
-/**
- * 
- * basic root entity that defines common attributes of the model
- * 
- * @author ctranoris
- *
- */
-@Entity( name = "BaseRootNamedEntity")
-@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
-@Table( indexes = {@Index(name = "IX_NAME", columnList = "name")} )
-public class BaseRootNamedEntity  extends BaseRootEntity{
-
-	
-	@JsonProperty("name")
-	protected String name = null;
-
-	
-
-
-
-	public BaseRootNamedEntity name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the entity
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the entity")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BaseRootNamedEntity Entity = (BaseRootNamedEntity) o;
-		return Objects.equals(this.uuid, Entity.uuid) && Objects.equals(this.href, Entity.href)
-				&& Objects.equals(this.name, Entity.name)
-				&& Objects.equals(this.baseType, Entity.baseType)
-				&& Objects.equals(this.schemaLocation, Entity.schemaLocation);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(uuid, href, name,
-
-				baseType, schemaLocation);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Entity {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	public void copyFromObj(BaseRootNamedEntity be) {
-		this.uuid = be.uuid;
-		this.name = be.name;
-		this.href = be.href;
-		this.baseType = be.baseType;
-		this.schemaLocation = be.schemaLocation;
-		this.type = be.type;
-		
-	}
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/ELifecycle.java b/src/main/java/org/etsi/osl/tmf/common/model/ELifecycle.java
deleted file mode 100644
index ba2fb4c7327cf4b4d0eb72f74616572d9aa0e474..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/ELifecycle.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-
-public enum ELifecycle {
-
-	IN_STUDY("In study"),
-	IN_DESIGN("In design"),
-	IN_TEST("In test"),
-	ACTIVE("Active"),
-	LAUNCHED("Launched"),
-	RETIRED("Retired"),
-	OBSOLETE("Obsolete"),
-	REJECTED("Rejected");
-	
-	
-	private String value;
-	
-	ELifecycle(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static ELifecycle getEnum(String value) {
-        for(ELifecycle v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/EValueType.java b/src/main/java/org/etsi/osl/tmf/common/model/EValueType.java
deleted file mode 100644
index d8cb3f8ad54993973bb8cf1104c0cbc0dcc7ffd6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/EValueType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-
-public enum EValueType {
-
-	INTEGER("INTEGER"),
-	SMALLINT("SMALLINT"),
-	lONGINT("LONGINT"),
-	FLOAT("FLOAT"),
-	BINARY("BINARY"),
-	BOOLEAN("BOOLEAN"),
-	ARRAY("ARRAY"),
-	SET("SET"),
-	TEXT("TEXT"),
-	LONGTEXT("LONGTEXT"),
-	ENUM("ENUM"),
-	TIMESTAMP("TIMESTAMP"),
-	MAP("MAP"),
-	OBJECT("OBJECT");
-	
-	
-	private String value;
-	
-	EValueType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static EValueType getEnum(String value) {
-        for(EValueType v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/Notification.java b/src/main/java/org/etsi/osl/tmf/common/model/Notification.java
deleted file mode 100644
index 8d0c38cb15fa417a7e6e8e1df0271c2f169e3b68..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/Notification.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-import java.util.UUID;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- * 
- * @author ctranoris
- *
- */
-@Schema(description = "The notification data structure")
-@Validated
-
-public class Notification {
-	@JsonProperty("eventId")
-	protected String eventId = UUID.randomUUID().toString();
-
-	protected OffsetDateTime eventTime =  OffsetDateTime.now(ZoneOffset.UTC);
-
-	@JsonProperty("eventType")
-	protected String eventType = null;
-
-	@JsonProperty("fieldPath")
-	protected String fieldPath = null;
-
-	@JsonProperty("resourcePath")
-	protected String resourcePath = null;
-
-	
-	
-	public Notification() {
-		super();
-	}
-
-
-	public Notification eventId() {
-		return this;
-	}
-	
-	
-	public Notification eventId(String eventId) {
-		this.eventId = eventId;
-		return this;
-	}
-
-	/**
-	 * The identifier of the notification
-	 * 
-	 * @return eventId
-	 **/
-	@Schema(description = "The identifier of the notification")
-
-	public String getEventId() {
-		return eventId;
-	}
-
-	public void setEventId(String eventId) {
-		this.eventId = eventId;
-	}
-
-	public Notification eventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-		return this;
-	}
-
-	/**
-	 * Time of the event occurrence
-	 * 
-	 * @return eventTime
-	 **/
-	@Schema(description = "Time of the event occurrence")
-
-	@Valid
-
-	@JsonProperty("eventTime")
-	public String getEventTimeString() {
-		return eventTime.toString();
-	}
-	
-	public OffsetDateTime getEventTime() {
-		return eventTime;
-	}
-
-	public void setEventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-	}
-	
-	public void setEventTime(String eventTime) {
-		if ( eventTime!= null ) {
-			this.eventTime = OffsetDateTime.parse( eventTime );			
-		}
-	}
-
-	public Notification eventType(String eventType) {
-		this.eventType = eventType;
-		return this;
-	}
-
-	/**
-	 * The type of the notification
-	 * 
-	 * @return eventType
-	 **/
-	@Schema(description = "The type of the notification")
-
-	public String getEventType() {
-		return eventType;
-	}
-
-	public void setEventType(String eventType) {
-		this.eventType = eventType;
-	}
-
-	public Notification fieldPath(String fieldPath) {
-		this.fieldPath = fieldPath;
-		return this;
-	}
-
-	/**
-	 * The path identifying the object field concerned by this notification
-	 * 
-	 * @return fieldPath
-	 **/
-	@Schema(description = "The path identifying the object field concerned by this notification")
-
-	public String getFieldPath() {
-		return fieldPath;
-	}
-
-	public void setFieldPath(String fieldPath) {
-		this.fieldPath = fieldPath;
-	}
-
-	public Notification resourcePath(String resourcePath) {
-		this.resourcePath = resourcePath;
-		return this;
-	}
-
-	/**
-	 * The path identifying the resource object concerned by this notification
-	 * 
-	 * @return resourcePath
-	 **/
-	@Schema(description = "The path identifying the resource object concerned by this notification")
-
-	public String getResourcePath() {
-		return resourcePath;
-	}
-
-	public void setResourcePath(String resourcePath) {
-		this.resourcePath = resourcePath;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Notification serviceOrderCreateNotification = (Notification) o;
-		return Objects.equals(this.eventId, serviceOrderCreateNotification.eventId)
-				&& Objects.equals(this.eventTime, serviceOrderCreateNotification.eventTime)
-				&& Objects.equals(this.eventType, serviceOrderCreateNotification.eventType)
-				&& Objects.equals(this.fieldPath, serviceOrderCreateNotification.fieldPath)
-				&& Objects.equals(this.resourcePath, serviceOrderCreateNotification.resourcePath);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrderCreateNotification {\n");
-
-		sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-		sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-		sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-		sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-		sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/OpensliceEvent.java b/src/main/java/org/etsi/osl/tmf/common/model/OpensliceEvent.java
deleted file mode 100644
index e4bb2a039ce01b0290b1d75066c2b082f6046aa4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/OpensliceEvent.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-import java.util.UUID;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * This data structure is created as a generic one. This is similar to
- * {@link Notification} class. Seems that TMF new versions have deprecated
- * Notifications and use Event and EventPayload
- * 
- * @author ctranoris
- *
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-15T11:15:47.327930400+02:00[Europe/Athens]")
-public class OpensliceEvent {
-	
-	@JsonProperty("id")
-	protected String id = UUID.randomUUID().toString();;
-
-	@JsonProperty("href")
-	protected String href = null;
-
-	@JsonProperty("eventId")
-	protected String eventId = UUID.randomUUID().toString();;
-
-	protected OffsetDateTime eventTime = OffsetDateTime.now(ZoneOffset.UTC);
-
-	@JsonProperty("eventType")
-	protected String eventType = null;
-
-	@JsonProperty("correlationId")
-	protected String correlationId = null;
-
-	@JsonProperty("domain")
-	protected String domain = null;
-
-	@JsonProperty("title")
-	protected String title = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("priority")
-	protected String priority = null;
-
-	protected OffsetDateTime timeOcurred = null;
-
-	public OpensliceEvent id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Identifier of the Process flow
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of the Process flow")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public OpensliceEvent href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Reference of the ProcessFlow
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Reference of the ProcessFlow")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public OpensliceEvent eventId(String eventId) {
-		this.eventId = eventId;
-		return this;
-	}
-
-	/**
-	 * The identifier of the notification.
-	 * 
-	 * @return eventId
-	 **/
-	@Schema(description = "The identifier of the notification.")
-
-	public String getEventId() {
-		return eventId;
-	}
-
-	public void setEventId(String eventId) {
-		this.eventId = eventId;
-	}
-
-	public OpensliceEvent eventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-		return this;
-	}
-
-	/**
-	 * Time of the event occurrence.
-	 * 
-	 * @return eventTime
-	 **/
-	@Schema(description = "Time of the event occurrence.")
-
-	@Valid
-
-	@JsonProperty("eventTime")
-	public String getEventTimeString() {
-		return eventTime.toString();
-	}
-
-	public OffsetDateTime getEventTime() {
-		return eventTime;
-	}
-
-	public void setEventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-	}
-	
-	public void setEventTime(String eventTime) {
-		if ( eventTime != null) {
-			this.eventTime = OffsetDateTime.parse( eventTime );
-			
-		}
-	}
-
-	public OpensliceEvent eventType(String eventType) {
-		this.eventType = eventType;
-		return this;
-	}
-
-	/**
-	 * The type of the notification.
-	 * 
-	 * @return eventType
-	 **/
-	@Schema(description = "The type of the notification.")
-
-	public String getEventType() {
-		return eventType;
-	}
-
-	public void setEventType(String eventType) {
-		this.eventType = eventType;
-	}
-
-	public OpensliceEvent correlationId(String correlationId) {
-		this.correlationId = correlationId;
-		return this;
-	}
-
-	/**
-	 * The correlation id for this event.
-	 * 
-	 * @return correlationId
-	 **/
-	@Schema(description = "The correlation id for this event.")
-
-	public String getCorrelationId() {
-		return correlationId;
-	}
-
-	public void setCorrelationId(String correlationId) {
-		this.correlationId = correlationId;
-	}
-
-	public OpensliceEvent domain(String domain) {
-		this.domain = domain;
-		return this;
-	}
-
-	/**
-	 * The domain of the event.
-	 * 
-	 * @return domain
-	 **/
-	@Schema(description = "The domain of the event.")
-
-	public String getDomain() {
-		return domain;
-	}
-
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	public OpensliceEvent title(String title) {
-		this.title = title;
-		return this;
-	}
-
-	/**
-	 * The title of the event.
-	 * 
-	 * @return title
-	 **/
-	@Schema(description = "The title of the event.")
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public OpensliceEvent description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * An explnatory of the event.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "An explnatory of the event.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public OpensliceEvent priority(String priority) {
-		this.priority = priority;
-		return this;
-	}
-
-	/**
-	 * A priority.
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "A priority.")
-
-	public String getPriority() {
-		return priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-
-	public OpensliceEvent timeOcurred(OffsetDateTime timeOcurred) {
-		this.timeOcurred = timeOcurred;
-		return this;
-	}
-
-	/**
-	 * The time the event occured.
-	 * 
-	 * @return timeOcurred
-	 **/
-	@Schema(description = "The time the event occured.")
-
-	@Valid
-	
-
-	@JsonProperty("timeOcurred")
-	public String getTimeOcurredString() {
-		return timeOcurred.toString();
-	}
-	
-	public OffsetDateTime getTimeOcurred() {
-		return timeOcurred;
-	}
-
-	public void setTimeOcurred(OffsetDateTime timeOcurred) {
-		this.timeOcurred = timeOcurred;
-	}
-	
-	
-	public void setTimeOcurred(String timeOcurred) {
-		if ( timeOcurred != null) {
-			this.timeOcurred = OffsetDateTime.parse( timeOcurred );
-			
-		}
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		OpensliceEvent alarmCreateEvent = (OpensliceEvent) o;
-		return Objects.equals(this.id, alarmCreateEvent.id) && Objects.equals(this.href, alarmCreateEvent.href)
-				&& Objects.equals(this.eventId, alarmCreateEvent.eventId)
-				&& Objects.equals(this.eventTime, alarmCreateEvent.eventTime)
-				&& Objects.equals(this.eventType, alarmCreateEvent.eventType)
-				&& Objects.equals(this.correlationId, alarmCreateEvent.correlationId)
-				&& Objects.equals(this.domain, alarmCreateEvent.domain)
-				&& Objects.equals(this.title, alarmCreateEvent.title)
-				&& Objects.equals(this.description, alarmCreateEvent.description)
-				&& Objects.equals(this.priority, alarmCreateEvent.priority)
-				&& Objects.equals(this.timeOcurred, alarmCreateEvent.timeOcurred);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description,
-//				priority, timeOcurred, event);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AlarmCreateEvent {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-		sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-		sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-		sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-		sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-		sb.append("    title: ").append(toIndentedString(title)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/Quantity.java b/src/main/java/org/etsi/osl/tmf/common/model/Quantity.java
deleted file mode 100644
index 62dd4ce010e2356de1f1cdda9d34c5100b77bc59..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/Quantity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-
-/**
- * An amount in a given unit
- */
-@Schema(description = "An amount in a given unit")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Embeddable 
-public class Quantity   {
-  @JsonProperty("amount")
-  private Float amount = 1.0f;
-
-  @JsonProperty("units")
-  private String units = null;
-
-  public Quantity amount(Float amount) {
-    this.amount = amount;
-    return this;
-  }
-
-  /**
-   * Numeric value in a given unit
-   * @return amount
-  **/
-  @Schema(description = "Numeric value in a given unit")
-  
-    public Float getAmount() {
-    return amount;
-  }
-
-  public void setAmount(Float amount) {
-    this.amount = amount;
-  }
-
-  public Quantity units(String units) {
-    this.units = units;
-    return this;
-  }
-
-  /**
-   * Unit
-   * @return units
-  **/
-  @Schema(description = "Unit")
-  
-    public String getUnits() {
-    return units;
-  }
-
-  public void setUnits(String units) {
-    this.units = units;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Quantity quantity = (Quantity) o;
-    return Objects.equals(this.amount, quantity.amount) &&
-        Objects.equals(this.units, quantity.units);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(amount, units);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Quantity {\n");
-    
-    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-    sb.append("    units: ").append(toIndentedString(units)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/TimePeriod.java b/src/main/java/org/etsi/osl/tmf/common/model/TimePeriod.java
deleted file mode 100644
index 3f805c54ba5e56b1969fae64b1392ebb64faf19a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/TimePeriod.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-import jakarta.validation.Valid;
-
-/**
- * A period of time, either as a deadline (endDateTime only) a startDateTime
- * only, or both
- */
-@Schema(description = "A period of time, either as a deadline (endDateTime only) a startDateTime only, or both")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Embeddable
-public class TimePeriod {
-	private OffsetDateTime endDateTime = null;
-
-	private OffsetDateTime startDateTime = null;
-	
-	public TimePeriod() {
-		this.setStartDateTime(OffsetDateTime.now(ZoneOffset.UTC) );
-		this.setEndDateTime(OffsetDateTime.now(ZoneOffset.UTC).plusYears(20) );	
-	}
-
-	public TimePeriod(TimePeriod src) {
-		this();
-		if ( src!= null) {
-			this.setStartDateTime(src.getStartDateTime());
-			this.setEndDateTime(  src.getEndDateTime() );			
-		}
-	}
-
-	public TimePeriod endDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-		return this;
-	}
-
-	/**
-	 * End of the time period, using IETC-RFC-3339 format
-	 * 
-	 * @return endDateTime
-	 **/
-	@Schema(description = "End of the time period, using IETC-RFC-3339 format")
-	@Valid
-	@JsonProperty("endDateTime")
-	public String getEndDateTimeString() {
-		return endDateTime.toString();
-	}
-	
-	public OffsetDateTime getEndDateTime() {
-		return endDateTime;
-	}
-
-	public void setEndDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-	}
-
-	public TimePeriod startDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-		return this;
-	}
-
-
-	public void setEndDateTime(String endDateTime) {
-		this.endDateTime = OffsetDateTime.parse( endDateTime );
-	}
-
-	
-
-
-	
-	/**
-	 * Start of the time period, using IETC-RFC-3339 format. If you define a start,
-	 * you must also define an end
-	 * 
-	 * @return startDateTime
-	 **/
-	@Schema(description = "Start of the time period, using IETC-RFC-3339 format. If you define a start, you must also define an end")
-	@Valid
-	@JsonProperty("startDateTime")
-	public String getStartDateTimeString() {
-		return startDateTime.toString();
-	}
-	
-	public OffsetDateTime getStartDateTime() {
-		return startDateTime;
-	}
-	
-	
-	public void setStartDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-	}
-	
-	public void setStartDateTime(String startDateTime) {
-		if ( startDateTime!= null ) {
-			this.startDateTime = OffsetDateTime.parse( startDateTime );
-		}
-	}
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		TimePeriod timePeriod = (TimePeriod) o;
-		return Objects.equals(this.endDateTime, timePeriod.endDateTime)
-				&& Objects.equals(this.startDateTime, timePeriod.startDateTime);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(endDateTime, startDateTime);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class TimePeriod {\n");
-
-		sb.append("    endDateTime: ").append(toIndentedString(endDateTime)).append("\n");
-		sb.append("    startDateTime: ").append(toIndentedString(startDateTime)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void copyFromObj(TimePeriod validFor) {
-		if (validFor != null) {
-			this.startDateTime = validFor.startDateTime;
-			this.endDateTime = validFor.endDateTime;
-		}
-
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/UserAuthRoleType.java b/src/main/java/org/etsi/osl/tmf/common/model/UserAuthRoleType.java
deleted file mode 100644
index 1077dc2c55326368ce1ebf20abb781bce054a25f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/UserAuthRoleType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-
-
-package org.etsi.osl.tmf.common.model;
-
-/**
- * @author ctranoris
- * different defined user roles
- */
-
-public enum UserAuthRoleType {
-
-	ROLE_ADMIN("ADMIN"),
-	ROLE_USER("USER");
-	
-	
-	
-
-    private String value;
-
-	UserAuthRoleType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static UserAuthRoleType getEnum(String value) {
-        for(UserAuthRoleType v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/UserPartRoleType.java b/src/main/java/org/etsi/osl/tmf/common/model/UserPartRoleType.java
deleted file mode 100644
index a88f5cf7afa3127ac554beafc0df2ef14c32c9b2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/UserPartRoleType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-
-
-package org.etsi.osl.tmf.common.model;
-
-/**
- * @author ctranoris
- * different defined user party roles
- */
-
-public enum UserPartRoleType {
-
-	OWNER("OWNER"),
-	REQUESTER("REQUESTER"),
-	ORGANIZATION("ORGANIZATION");
-	
-	
-	
-
-    private String value;
-
-	UserPartRoleType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static UserPartRoleType getEnum(String value) {
-        for(UserPartRoleType v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/Characteristic.java b/src/main/java/org/etsi/osl/tmf/common/model/service/Characteristic.java
deleted file mode 100644
index 3b2dfaf807a0d9aa36ccfab9c81fad8c5b9418eb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/Characteristic.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ServiceRestrictionCharacteristic")
-public class Characteristic  extends BaseRootNamedEntity {
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  private Any value = null;
-
- 
-
-  public Characteristic valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * Data type of the value of the characteristic
-   * @return valueType
-  **/
-  @Schema(description = "Data type of the value of the characteristic")
-
-
-  public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public Characteristic value(Any value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * The value of the characteristic
-   * @return value
-  **/
-  @Schema(description = "The value of the characteristic")
-  @NotNull
-
-  @Valid
-
-
-  @JsonProperty("value")
-  public Object getValueAsString() {
-	 
-	if ( ( this.value != null) && ( this.valueType != null) && (this.valueType.equalsIgnoreCase("string") )) {
-		if ( ( this.value.getAlias() == null) || this.value.getAlias().equals("") ) {
-			return this.value.getValue();			
-		}
-	}
-    return value;
-  }
-  
-  public Any getValue() {
-    return value;
-  }
-
-  public void setValue(Any value) {
-    this.value = value;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Characteristic characteristic = (Characteristic) o;
-    return Objects.equals(this.name, characteristic.name) &&
-        Objects.equals(this.valueType, characteristic.valueType) &&
-        Objects.equals(this.value, characteristic.value) &&
-        Objects.equals(this.baseType, characteristic.baseType) &&
-        Objects.equals(this.schemaLocation, characteristic.schemaLocation) &&
-        Objects.equals(this.type, characteristic.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(name, valueType, value, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Characteristic {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/Note.java b/src/main/java/org/etsi/osl/tmf/common/model/service/Note.java
deleted file mode 100644
index eed23b7dbb50812db2f9de1509b34e8c38decb13..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/Note.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.validation.Valid;
-
-/**
- * Extra information about a given entity
- */
-@Schema(description = "Extra information about a given entity")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "Note")
-public class Note extends BaseRootEntity {
-	@JsonProperty("author")
-	private String author = null;
-
-	private OffsetDateTime date = null;
-
-	@JsonProperty("system")
-	private String system = null;
-
-	@Lob
-	@Column(name = "LTEXT", columnDefinition = "LONGTEXT")
-	@JsonProperty("text")
-	private String text = null;
-
-	public Note author(String author) {
-		this.author = author;
-		return this;
-	}
-
-	/**
-	 * Author of the note
-	 * 
-	 * @return author
-	 **/
-	@Schema(description = "Author of the note")
-
-	public String getAuthor() {
-		return author;
-	}
-
-	public void setAuthor(String author) {
-		this.author = author;
-	}
-
-	public Note date(OffsetDateTime date) {
-		this.date = date;
-		return this;
-	}
-
-	/**
-	 * Date of the note
-	 * 
-	 * @return date
-	 **/
-	@Schema(description = "Date of the note")
-
-	@Valid
-
-	@JsonProperty("date")
-	public String getDateString() {
-		if (this.date == null) {
-			return null;
-		}
-		return this.date.toString();
-	}
-
-	public OffsetDateTime getDate() {
-		return date;
-	}
-
-	public void setDate(String adate) {
-		if (adate!=null) {
-			this.date = OffsetDateTime.parse( adate );
-			
-		}
-	}
-	
-
-
-	public void setDate(OffsetDateTime date) {
-		this.date = date;
-	}
-
-	public Note system(String system) {
-		this.system = system;
-		return this;
-	}
-
-	/**
-	 * Describes the system from which the action related to this note was done
-	 * 
-	 * @return system
-	 **/
-	@Schema(description = "Describes the system from which the action related to this note was done")
-
-	public String getSystem() {
-		return system;
-	}
-
-	public void setSystem(String system) {
-		this.system = system;
-	}
-
-	public Note text(String text) {
-		this.text = text;
-		if ( date == null) {
-			this.setDate(  OffsetDateTime.now(ZoneOffset.UTC).toString() );			
-		}
-		return this;
-	}
-
-	/**
-	 * Text of the note
-	 * 
-	 * @return text
-	 **/
-	@Schema(description = "Text of the note")
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-		this.setDate(  OffsetDateTime.now(ZoneOffset.UTC).toString() );
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Note note = (Note) o;
-		return Objects.equals(this.author, note.author) && Objects.equals(this.date, note.date)
-				&& Objects.equals(this.system, note.system) && Objects.equals(this.text, note.text)
-				&& Objects.equals(this.baseType, note.baseType)
-				&& Objects.equals(this.schemaLocation, note.schemaLocation) && Objects.equals(this.type, note.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(author, date, system, text, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Note {\n");
-
-		sb.append("    author: ").append(toIndentedString(author)).append("\n");
-		sb.append("    date: ").append(toIndentedString(date)).append("\n");
-		sb.append("    system: ").append(toIndentedString(system)).append("\n");
-		sb.append("    text: ").append(toIndentedString(text)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/Place.java b/src/main/java/org/etsi/osl/tmf/common/model/service/Place.java
deleted file mode 100644
index 9c17d4fcf9857dcaaf7bb65e7b052024d211b977..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/Place.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Place reference. Place defines the places where the products are sold or delivered.
- */
-@Schema(description = "Place reference. Place defines the places where the products are sold or delivered.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "Place")
-public class Place extends BaseRootNamedEntity  {
-	
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("role")
-  private String role = null;
-
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-
-
-  public String getId() {
-    return uuid;
-  }
-
-  /**
-   * Role of the place, such as: [home delivery], [shop retrieval])
-   * @return role
-  **/
-  @Schema(description = "Role of the place, such as: [home delivery], [shop retrieval])")
-
-
-  public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Place place = (Place) o;
-    return Objects.equals(this.id, place.id) &&
-        Objects.equals(this.href, place.href) &&
-        Objects.equals(this.name, place.name) &&
-        Objects.equals(this.role, place.role) &&
-        Objects.equals(this.baseType, place.baseType) &&
-        Objects.equals(this.schemaLocation, place.schemaLocation) &&
-        Objects.equals(this.type, place.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, role, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Place {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/ResourceRef.java b/src/main/java/org/etsi/osl/tmf/common/model/service/ResourceRef.java
deleted file mode 100644
index e06e4ce213fe483fda06fb11890d52bb8f82f242..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/ResourceRef.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ResourceRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ResourceRef")
-public class ResourceRef  extends BaseRootNamedEntity{
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ResourceRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the supporting resource
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the supporting resource")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceRef resourceRef = (ResourceRef) o;
-    return Objects.equals(this.id, resourceRef.id) &&
-        Objects.equals(this.href, resourceRef.href) &&
-        Objects.equals(this.name, resourceRef.name) &&
-        Objects.equals(this.baseType, resourceRef.baseType) &&
-        Objects.equals(this.schemaLocation, resourceRef.schemaLocation) &&
-        Objects.equals(this.type, resourceRef.type) &&
-        Objects.equals(this.referredType, resourceRef.referredType);
-  }
-//
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRef.java b/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRef.java
deleted file mode 100644
index 206524b655e15428bd0688d3b722a8f449c23a15..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRef.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Service reference, for when Service is used by other entities
- */
-@Schema(description = "Service reference, for when Service is used by other entities")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ServiceRef")
-public class ServiceRef extends BaseRootNamedEntity {
-	
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	public ServiceRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Id of the service
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Id of the service")
-	@NotNull
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ServiceRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceRef serviceRef = (ServiceRef) o;
-		return Objects.equals(this.id, serviceRef.id) && Objects.equals(this.href, serviceRef.href)
-				&& Objects.equals(this.baseType, serviceRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceRef.schemaLocation)
-				&& Objects.equals(this.type, serviceRef.type)
-				&& Objects.equals(this.referredType, serviceRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRelationship.java b/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRelationship.java
deleted file mode 100644
index dca0c34173d418edbe46f10060299cafc25dbd3d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceRelationship.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes links with services of the same category (useful for bundled
- * services)
- */
-@Schema(description = "Describes links with services of the same category (useful for bundled services)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ServiceRelationship")
-public class ServiceRelationship extends BaseRootEntity {
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "service_serviceref_uuid", referencedColumnName = "uuid")
-	@JsonProperty("service")
-	private ServiceRef service = null;
-
-	public ServiceRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * The type of relationship (e.g. depends on, enables)
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "The type of relationship (e.g. depends on, enables)")
-	@NotNull
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ServiceRelationship service(ServiceRef service) {
-		this.service = service;
-		return this;
-	}
-
-	/**
-	 * The service being referred to
-	 * 
-	 * @return service
-	 **/
-	@Schema(description = "The service being referred to")
-	@NotNull
-
-	@Valid
-
-	public ServiceRef getService() {
-		return service;
-	}
-
-	public void setService(ServiceRef service) {
-		this.service = service;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceRelationship serviceRelationship = (ServiceRelationship) o;
-		return Objects.equals(this.relationshipType, serviceRelationship.relationshipType)
-				&& Objects.equals(this.service, serviceRelationship.service)
-				&& Objects.equals(this.baseType, serviceRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, serviceRelationship.schemaLocation)
-				&& Objects.equals(this.type, serviceRelationship.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(relationshipType, service, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceRelationship {\n");
-
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    service: ").append(toIndentedString(service)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceSpecificationRef.java
deleted file mode 100644
index b7e835c74491b1100d0600e5aa85fbfb87047493..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceSpecificationRef.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.scm633.model.TargetServiceSchema;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Service specification reference: ServiceSpecification(s) required to realize
- * a ProductSpecification.
- */
-@Schema(description = "Service specification reference: ServiceSpecification(s) required to realize a ProductSpecification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Entity(name = "ServiceSpecificationRef")
-@JsonIgnoreProperties( {"uuid"} )
-public class ServiceSpecificationRef extends BaseRootNamedEntity {
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("targetServiceSchema")
-	private TargetServiceSchema targetServiceSchema = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ServiceSpecificationRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Service specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Service specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceSpecificationRef targetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-		return this;
-	}
-
-	/**
-	 * A target service schema reference (TargetServiceSchemaRef). The reference
-	 * object to the schema and type of target service which is described by service
-	 * specification.
-	 * 
-	 * @return targetServiceSchema
-	 **/
-	@Schema(description = "A target service schema reference (TargetServiceSchemaRef). The reference object to the schema and type of target service which is described by service specification.")
-
-	@Valid
-
-	public TargetServiceSchema getTargetServiceSchema() {
-		return targetServiceSchema;
-	}
-
-	public void setTargetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-	}
-
-	public ServiceSpecificationRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecificationRef serviceSpecificationRef = (ServiceSpecificationRef) o;
-		return Objects.equals(this.id, serviceSpecificationRef.id)
-				&& Objects.equals(this.href, serviceSpecificationRef.href)
-				&& Objects.equals(this.name, serviceSpecificationRef.name)
-				&& Objects.equals(this.version, serviceSpecificationRef.version)
-				&& Objects.equals(this.targetServiceSchema, serviceSpecificationRef.targetServiceSchema)
-				&& Objects.equals(this.baseType, serviceSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecificationRef.type)
-				&& Objects.equals(this.referredType, serviceSpecificationRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, version, targetServiceSchema, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    targetServiceSchema: ").append(toIndentedString(targetServiceSchema)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceStateType.java b/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceStateType.java
deleted file mode 100644
index 933c2c7d744dbf14844550d9245d09fdb4dfb176..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/ServiceStateType.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Valid values for the lifecycle state of the service
- */
-public enum ServiceStateType {
-  
-  FEASIBILITYCHECKED("feasibilityChecked"),
-  
-  DESIGNED("designed"),
-  
-  RESERVED("reserved"),
-  
-  INACTIVE("inactive"),
-  
-  ACTIVE("active"),
-  
-  TERMINATED("terminated");
-
-  private String value;
-
-  ServiceStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ServiceStateType fromValue(String text) {
-    for (ServiceStateType b : ServiceStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/common/model/service/TargetServiceSchema.java b/src/main/java/org/etsi/osl/tmf/common/model/service/TargetServiceSchema.java
deleted file mode 100644
index f53daaea3c8bafbb14cd355b27b0102783b39341..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/common/model/service/TargetServiceSchema.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.common.model.service;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The reference object to the schema and type of target service which is described by service specification
- */
-@Schema(description = "The reference object to the schema and type of target service which is described by service specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class TargetServiceSchema   {
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public TargetServiceSchema baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public TargetServiceSchema schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing the target service
-   * @return schemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing the target service")
-  @NotNull
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public TargetServiceSchema type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Class type of the target service
-   * @return type
-  **/
-  @Schema(description = "Class type of the target service")
-  @NotNull
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetServiceSchema targetServiceSchema = (TargetServiceSchema) o;
-    return Objects.equals(this.baseType, targetServiceSchema.baseType) &&
-        Objects.equals(this.schemaLocation, targetServiceSchema.schemaLocation) &&
-        Objects.equals(this.type, targetServiceSchema.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetServiceSchema {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/EntitlementType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/EntitlementType.java
deleted file mode 100644
index 1754ca637345d467e6e23c6e134c3f5c02c6946c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/EntitlementType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EntitlementType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "EntitlementType")
-public class EntitlementType  extends BaseRootEntity {
-  @JsonProperty("function")
-  private String function = null;
-
-  @JsonProperty("action")
-  private String action = null;
-
-  public EntitlementType function(String function) {
-    this.function = function;
-    return this;
-  }
-
-  /**
-   * Get function
-   * @return function
-  **/
-  @Schema(description = "")
-  @NotNull
-
-
-  public String getFunction() {
-    return function;
-  }
-
-  public void setFunction(String function) {
-    this.function = function;
-  }
-
-  public EntitlementType action(String action) {
-    this.action = action;
-    return this;
-  }
-
-  /**
-   * Get action
-   * @return action
-  **/
-  @Schema(description = "")
-  @NotNull
-
-
-  public String getAction() {
-    return action;
-  }
-
-  public void setAction(String action) {
-    this.action = action;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntitlementType entitlementType = (EntitlementType) o;
-    return Objects.equals(this.function, entitlementType.function) &&
-        Objects.equals(this.action, entitlementType.action);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(function, action);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntitlementType {\n");
-    
-    sb.append("    function: ").append(toIndentedString(function)).append("\n");
-    sb.append("    action: ").append(toIndentedString(action)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicAddressType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicAddressType.java
deleted file mode 100644
index b892f30709446787bea5013008eba4d15da11795..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicAddressType.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * GeographicAddressType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "GeographicAddressType")
-public class GeographicAddressType extends BaseRootEntity {
-	@JsonProperty("streetNr")
-	private String streetNr = null;
-
-	@JsonProperty("streetNrSuffix")
-	private String streetNrSuffix = null;
-
-	@JsonProperty("streetNrLast")
-	private String streetNrLast = null;
-
-	@JsonProperty("streetNrLastSuffix")
-	private String streetNrLastSuffix = null;
-
-	@JsonProperty("streetName")
-	private String streetName = null;
-
-	@JsonProperty("streetType")
-	private String streetType = null;
-
-	@JsonProperty("streetSuffix")
-	private String streetSuffix = null;
-
-	@JsonProperty("postcode")
-	private String postcode = null;
-
-	@JsonProperty("locality")
-	private String locality = null;
-
-	@JsonProperty("city")
-	private String city = null;
-
-	@JsonProperty("stateOrProvince")
-	private String stateOrProvince = null;
-
-	@JsonProperty("country")
-	private String country = null;
-
-	@JsonProperty("geographicLocation")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(referencedColumnName = "uuid")
-	private GeographicLocationRefOrValueType geographicLocation = null;
-
-	@JsonProperty("geographicSubAddress")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(referencedColumnName = "uuid")
-	private GeographicSubAddressType geographicSubAddress = null;
-
-	public GeographicAddressType streetNr(String streetNr) {
-		this.streetNr = streetNr;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. Number identifying a specific property on a
-	 * public street. It may be combined with streetNrLast for ranged addresses
-	 * 
-	 * @return streetNr
-	 **/
-	@Schema(description = "Required if href not included. Number identifying a specific property on a public street. It may be combined with streetNrLast for ranged addresses")
-	@NotNull
-
-	public String getStreetNr() {
-		return streetNr;
-	}
-
-	public void setStreetNr(String streetNr) {
-		this.streetNr = streetNr;
-	}
-
-	public GeographicAddressType streetNrSuffix(String streetNrSuffix) {
-		this.streetNrSuffix = streetNrSuffix;
-		return this;
-	}
-
-	/**
-	 * The street number suffix (or suffix of first number for aranged address)
-	 * 
-	 * @return streetNrSuffix
-	 **/
-	@Schema(description = "The street number suffix (or suffix of first number for  aranged address)")
-
-	public String getStreetNrSuffix() {
-		return streetNrSuffix;
-	}
-
-	public void setStreetNrSuffix(String streetNrSuffix) {
-		this.streetNrSuffix = streetNrSuffix;
-	}
-
-	public GeographicAddressType streetNrLast(String streetNrLast) {
-		this.streetNrLast = streetNrLast;
-		return this;
-	}
-
-	/**
-	 * Last number in a range of street numbers allocated to a property
-	 * 
-	 * @return streetNrLast
-	 **/
-	@Schema(description = "Last number in a range of street numbers allocated to a property")
-
-	public String getStreetNrLast() {
-		return streetNrLast;
-	}
-
-	public void setStreetNrLast(String streetNrLast) {
-		this.streetNrLast = streetNrLast;
-	}
-
-	public GeographicAddressType streetNrLastSuffix(String streetNrLastSuffix) {
-		this.streetNrLastSuffix = streetNrLastSuffix;
-		return this;
-	}
-
-	/**
-	 * Last street number suffix for a ranged address
-	 * 
-	 * @return streetNrLastSuffix
-	 **/
-	@Schema(description = "Last street number suffix for a ranged address")
-
-	public String getStreetNrLastSuffix() {
-		return streetNrLastSuffix;
-	}
-
-	public void setStreetNrLastSuffix(String streetNrLastSuffix) {
-		this.streetNrLastSuffix = streetNrLastSuffix;
-	}
-
-	public GeographicAddressType streetName(String streetName) {
-		this.streetName = streetName;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. Name of the street or other street type
-	 * 
-	 * @return streetName
-	 **/
-	@Schema(description = "Required if href not included. Name of the street or other street type")
-	@NotNull
-
-	public String getStreetName() {
-		return streetName;
-	}
-
-	public void setStreetName(String streetName) {
-		this.streetName = streetName;
-	}
-
-	public GeographicAddressType streetType(String streetType) {
-		this.streetType = streetType;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. Alley, avenue, street, boulevard, brae,
-	 * crescent, drive, highway, lane, terrace, parade, place, tarn, way, wharf
-	 * 
-	 * @return streetType
-	 **/
-	@Schema(description = "Required if href not included. Alley, avenue, street, boulevard, brae, crescent, drive, highway, lane, terrace, parade, place, tarn, way, wharf")
-	@NotNull
-
-	public String getStreetType() {
-		return streetType;
-	}
-
-	public void setStreetType(String streetType) {
-		this.streetType = streetType;
-	}
-
-	public GeographicAddressType streetSuffix(String streetSuffix) {
-		this.streetSuffix = streetSuffix;
-		return this;
-	}
-
-	/**
-	 * A modifier denoting a relative direction (E, W, S, N)
-	 * 
-	 * @return streetSuffix
-	 **/
-	@Schema(description = "A modifier denoting a relative direction (E, W, S, N)")
-
-	public String getStreetSuffix() {
-		return streetSuffix;
-	}
-
-	public void setStreetSuffix(String streetSuffix) {
-		this.streetSuffix = streetSuffix;
-	}
-
-	public GeographicAddressType postcode(String postcode) {
-		this.postcode = postcode;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. Descriptor for a postal delivery area (also
-	 * known as zipcode)
-	 * 
-	 * @return postcode
-	 **/
-	@Schema(description = "Required if href not included. Descriptor for a postal delivery area (also known as zipcode)")
-	@NotNull
-
-	public String getPostcode() {
-		return postcode;
-	}
-
-	public void setPostcode(String postcode) {
-		this.postcode = postcode;
-	}
-
-	public GeographicAddressType locality(String locality) {
-		this.locality = locality;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. An area of defined or undefined boundaries
-	 * within a local authority or other legislatively defined area, usually rural
-	 * or semi-rural in nature, or a suburb, a bounded locality within a city, town
-	 * or shire principally of urban character
-	 * 
-	 * @return locality
-	 **/
-	@Schema(description = "Required if href not included. An area of defined or undefined boundaries within a local authority or other legislatively defined area, usually rural or semi-rural in nature, or a suburb, a bounded locality within a city, town or shire principally of urban character ")
-	@NotNull
-
-	public String getLocality() {
-		return locality;
-	}
-
-	public void setLocality(String locality) {
-		this.locality = locality;
-	}
-
-	public GeographicAddressType city(String city) {
-		this.city = city;
-		return this;
-	}
-
-	/**
-	 * City that the address is in
-	 * 
-	 * @return city
-	 **/
-	@Schema(description = "City that the address is in")
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public GeographicAddressType stateOrProvince(String stateOrProvince) {
-		this.stateOrProvince = stateOrProvince;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. the State or Province that the address is in
-	 * 
-	 * @return stateOrProvince
-	 **/
-	@Schema(description = "Required if href not included. the State or Province that the address is in")
-	@NotNull
-
-	public String getStateOrProvince() {
-		return stateOrProvince;
-	}
-
-	public void setStateOrProvince(String stateOrProvince) {
-		this.stateOrProvince = stateOrProvince;
-	}
-
-	public GeographicAddressType country(String country) {
-		this.country = country;
-		return this;
-	}
-
-	/**
-	 * Required if href not included. Country that the address is in
-	 * 
-	 * @return country
-	 **/
-	@Schema(description = "Required if href not included. Country that the address is in")
-	@NotNull
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public GeographicAddressType geographicLocation(GeographicLocationRefOrValueType geographicLocation) {
-		this.geographicLocation = geographicLocation;
-		return this;
-	}
-
-	/**
-	 * A geo location reference, allows describing through coordinate(s) a point, a
-	 * line or a space
-	 * 
-	 * @return geographicLocation
-	 **/
-	@Schema(description = "A geo location reference, allows describing through coordinate(s) a point, a line or a space")
-
-	@Valid
-
-	public GeographicLocationRefOrValueType getGeographicLocation() {
-		return geographicLocation;
-	}
-
-	public void setGeographicLocation(GeographicLocationRefOrValueType geographicLocation) {
-		this.geographicLocation = geographicLocation;
-	}
-
-	public GeographicAddressType geographicSubAddress(GeographicSubAddressType geographicSubAddress) {
-		this.geographicSubAddress = geographicSubAddress;
-		return this;
-	}
-
-	/**
-	 * A list of sub addresses. It is used for addressing within a property in an
-	 * urban area (country properties are often defined differently). It may refer
-	 * to a building, a building cluster, or a floor of a multistory building.
-	 * 
-	 * @return geographicSubAddress
-	 **/
-	@Schema(description = "A list of sub addresses. It is used for addressing within a property in an urban area (country properties are often defined differently). It may refer to a building, a building cluster, or a floor of a multistory building.")
-
-	@Valid
-
-	public GeographicSubAddressType getGeographicSubAddress() {
-		return geographicSubAddress;
-	}
-
-	public void setGeographicSubAddress(GeographicSubAddressType geographicSubAddress) {
-		this.geographicSubAddress = geographicSubAddress;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		GeographicAddressType geographicAddressType = (GeographicAddressType) o;
-		return Objects.equals(this.streetNr, geographicAddressType.streetNr)
-				&& Objects.equals(this.streetNrSuffix, geographicAddressType.streetNrSuffix)
-				&& Objects.equals(this.streetNrLast, geographicAddressType.streetNrLast)
-				&& Objects.equals(this.streetNrLastSuffix, geographicAddressType.streetNrLastSuffix)
-				&& Objects.equals(this.streetName, geographicAddressType.streetName)
-				&& Objects.equals(this.streetType, geographicAddressType.streetType)
-				&& Objects.equals(this.streetSuffix, geographicAddressType.streetSuffix)
-				&& Objects.equals(this.postcode, geographicAddressType.postcode)
-				&& Objects.equals(this.locality, geographicAddressType.locality)
-				&& Objects.equals(this.city, geographicAddressType.city)
-				&& Objects.equals(this.stateOrProvince, geographicAddressType.stateOrProvince)
-				&& Objects.equals(this.country, geographicAddressType.country)
-				&& Objects.equals(this.geographicLocation, geographicAddressType.geographicLocation)
-				&& Objects.equals(this.geographicSubAddress, geographicAddressType.geographicSubAddress)
-				&& Objects.equals(this.type, geographicAddressType.type)
-				&& Objects.equals(this.schemaLocation, geographicAddressType.schemaLocation);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class GeographicAddressType {\n");
-
-		sb.append("    streetNr: ").append(toIndentedString(streetNr)).append("\n");
-		sb.append("    streetNrSuffix: ").append(toIndentedString(streetNrSuffix)).append("\n");
-		sb.append("    streetNrLast: ").append(toIndentedString(streetNrLast)).append("\n");
-		sb.append("    streetNrLastSuffix: ").append(toIndentedString(streetNrLastSuffix)).append("\n");
-		sb.append("    streetName: ").append(toIndentedString(streetName)).append("\n");
-		sb.append("    streetType: ").append(toIndentedString(streetType)).append("\n");
-		sb.append("    streetSuffix: ").append(toIndentedString(streetSuffix)).append("\n");
-		sb.append("    postcode: ").append(toIndentedString(postcode)).append("\n");
-		sb.append("    locality: ").append(toIndentedString(locality)).append("\n");
-		sb.append("    city: ").append(toIndentedString(city)).append("\n");
-		sb.append("    stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");
-		sb.append("    country: ").append(toIndentedString(country)).append("\n");
-		sb.append("    geographicLocation: ").append(toIndentedString(geographicLocation)).append("\n");
-		sb.append("    geographicSubAddress: ").append(toIndentedString(geographicSubAddress)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicLocationRefOrValueType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicLocationRefOrValueType.java
deleted file mode 100644
index d705b6b4d32af0357f5b9ebf46339179f66b63ec..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicLocationRefOrValueType.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * GeographicLocationRefOrValueType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "GeographicLocationRefOrValueType")
-public class GeographicLocationRefOrValueType extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("geographicPoint")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(referencedColumnName = "uuid")
-	private GeographicPointType geographicPoint = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	public GeographicLocationRefOrValueType id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the location entity within the server
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the location entity within the server")
-
-	public String getId() {
-		return uuid;
-	}
-
-	public GeographicLocationRefOrValueType geographicPoint(GeographicPointType geographicPoint) {
-		this.geographicPoint = geographicPoint;
-		return this;
-	}
-
-	/**
-	 * A list of geo points. A GeoPoint defines a geographic point through
-	 * coordinates
-	 * 
-	 * @return geographicPoint
-	 **/
-	@Schema(description = "A list of geo points. A GeoPoint defines a geographic point through coordinates")
-
-	@Valid
-
-	public GeographicPointType getGeographicPoint() {
-		return geographicPoint;
-	}
-
-	public void setGeographicPoint(GeographicPointType geographicPoint) {
-		this.geographicPoint = geographicPoint;
-	}
-
-	public GeographicLocationRefOrValueType schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A Link to the schema describing this REST Resource
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A Link to the schema describing this REST Resource")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		GeographicLocationRefOrValueType geographicLocationRefOrValueType = (GeographicLocationRefOrValueType) o;
-		return Objects.equals(this.id, geographicLocationRefOrValueType.id)
-				&& Objects.equals(this.href, geographicLocationRefOrValueType.href)
-				&& Objects.equals(this.name, geographicLocationRefOrValueType.name)
-				&& Objects.equals(this.type, geographicLocationRefOrValueType.type)
-				&& Objects.equals(this.geographicPoint, geographicLocationRefOrValueType.geographicPoint)
-				&& Objects.equals(this.type, geographicLocationRefOrValueType.type)
-				&& Objects.equals(this.schemaLocation, geographicLocationRefOrValueType.schemaLocation);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class GeographicLocationRefOrValueType {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    geographicPoint: ").append(toIndentedString(geographicPoint)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicPointType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicPointType.java
deleted file mode 100644
index 0cbd0e447b36a684c2f72a5b0c8274449d0e34c0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicPointType.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * GeographicPointType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "GeographicPointType")
-public class GeographicPointType   extends BaseRootNamedEntity {
-  @JsonProperty("accuracy")
-  private String accuracy = null;
-
-  @JsonProperty("spatialRef")
-  private String spatialRef = null;
-
-  @JsonProperty("x")
-  private String x = null;
-
-  @JsonProperty("y")
-  private String y = null;
-
-  @JsonProperty("z")
-  private String z = null;
-
-  public GeographicPointType accuracy(String accuracy) {
-    this.accuracy = accuracy;
-    return this;
-  }
-
-  /**
-   * Accuracy of the coordinate specified
-   * @return accuracy
-  **/
-  @Schema(description = "Accuracy of the coordinate specified")
-  @NotNull
-
-
-  public String getAccuracy() {
-    return accuracy;
-  }
-
-  public void setAccuracy(String accuracy) {
-    this.accuracy = accuracy;
-  }
-
-  public GeographicPointType spatialRef(String spatialRef) {
-    this.spatialRef = spatialRef;
-    return this;
-  }
-
-  /**
-   * Geocoding referential
-   * @return spatialRef
-  **/
-  @Schema(description = "Geocoding referential")
-  @NotNull
-
-
-  public String getSpatialRef() {
-    return spatialRef;
-  }
-
-  public void setSpatialRef(String spatialRef) {
-    this.spatialRef = spatialRef;
-  }
-
-  public GeographicPointType x(String x) {
-    this.x = x;
-    return this;
-  }
-
-  /**
-   * . x coordinate (usually latitude)
-   * @return x
-  **/
-  @Schema(description = ". x coordinate (usually latitude)")
-  @NotNull
-
-
-  public String getX() {
-    return x;
-  }
-
-  public void setX(String x) {
-    this.x = x;
-  }
-
-  public GeographicPointType y(String y) {
-    this.y = y;
-    return this;
-  }
-
-  /**
-   * y coordinate (usually longitude)
-   * @return y
-  **/
-  @Schema(description = "y coordinate (usually longitude)")
-  @NotNull
-
-
-  public String getY() {
-    return y;
-  }
-
-  public void setY(String y) {
-    this.y = y;
-  }
-
-  public GeographicPointType z(String z) {
-    this.z = z;
-    return this;
-  }
-
-  /**
-   * z coordinate (usually elevation)
-   * @return z
-  **/
-  @Schema(description = "z coordinate (usually elevation)")
-
-
-  public String getZ() {
-    return z;
-  }
-
-  public void setZ(String z) {
-    this.z = z;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GeographicPointType geographicPointType = (GeographicPointType) o;
-    return Objects.equals(this.accuracy, geographicPointType.accuracy) &&
-        Objects.equals(this.spatialRef, geographicPointType.spatialRef) &&
-        Objects.equals(this.x, geographicPointType.x) &&
-        Objects.equals(this.y, geographicPointType.y) &&
-        Objects.equals(this.z, geographicPointType.z);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(accuracy, spatialRef, x, y, z);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GeographicPointType {\n");
-    
-    sb.append("    accuracy: ").append(toIndentedString(accuracy)).append("\n");
-    sb.append("    spatialRef: ").append(toIndentedString(spatialRef)).append("\n");
-    sb.append("    x: ").append(toIndentedString(x)).append("\n");
-    sb.append("    y: ").append(toIndentedString(y)).append("\n");
-    sb.append("    z: ").append(toIndentedString(z)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicSubAddressType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicSubAddressType.java
deleted file mode 100644
index ffdee87f8bdc12204b3a324aec96f65bf5b66191..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/GeographicSubAddressType.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * GeographicSubAddressType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "GeographicSubAddressType")
-public class GeographicSubAddressType extends BaseRootNamedEntity {
- 
-
-  @JsonProperty("subUnitType")
-  private String subUnitType = null;
-
-  @JsonProperty("subUnitNumber")
-  private String subUnitNumber = null;
-
-  @JsonProperty("levelType")
-  private String levelType = null;
-
-  @JsonProperty("levelNumber")
-  private String levelNumber = null;
-
-  @JsonProperty("buildingName")
-  private String buildingName = null;
-
-  @JsonProperty("privateStreetName")
-  private String privateStreetName = null;
-
-  @JsonProperty("privateStreetNumber")
-  private String privateStreetNumber = null;
-
-
-
-  public GeographicSubAddressType subUnitType(String subUnitType) {
-    this.subUnitType = subUnitType;
-    return this;
-  }
-
-  /**
-   * the type of subunit (e.g.: BERTH, FLAT, PIER, SUITE, SHOP, TOWER, UNIT, WHARF)
-   * @return subUnitType
-  **/
-  @Schema(description = "the type of subunit (e.g.: BERTH, FLAT, PIER, SUITE, SHOP, TOWER, UNIT, WHARF)")
-
-
-  public String getSubUnitType() {
-    return subUnitType;
-  }
-
-  public void setSubUnitType(String subUnitType) {
-    this.subUnitType = subUnitType;
-  }
-
-  public GeographicSubAddressType subUnitNumber(String subUnitNumber) {
-    this.subUnitNumber = subUnitNumber;
-    return this;
-  }
-
-  /**
-   * the discriminator used for the subunit often just a simple number (e.g.: 5 for FLAT 5), may also be a range
-   * @return subUnitNumber
-  **/
-  @Schema(description = "the discriminator used for the subunit often just a simple number (e.g.: 5 for FLAT 5), may also be a range")
-
-
-  public String getSubUnitNumber() {
-    return subUnitNumber;
-  }
-
-  public void setSubUnitNumber(String subUnitNumber) {
-    this.subUnitNumber = subUnitNumber;
-  }
-
-  public GeographicSubAddressType levelType(String levelType) {
-    this.levelType = levelType;
-    return this;
-  }
-
-  /**
-   * Describes level types within a building (e.g.: BASEMENT) 
-   * @return levelType
-  **/
-  @Schema(description = "Describes level types within a building (e.g.: BASEMENT) ")
-
-
-  public String getLevelType() {
-    return levelType;
-  }
-
-  public void setLevelType(String levelType) {
-    this.levelType = levelType;
-  }
-
-  public GeographicSubAddressType levelNumber(String levelNumber) {
-    this.levelNumber = levelNumber;
-    return this;
-  }
-
-  /**
-   * used where a level type may be repeated (e.g.: BASEMENT 1, BASEMENT 2)
-   * @return levelNumber
-  **/
-  @Schema(description = "used where a level type may be repeated (e.g.: BASEMENT 1, BASEMENT 2)")
-
-
-  public String getLevelNumber() {
-    return levelNumber;
-  }
-
-  public void setLevelNumber(String levelNumber) {
-    this.levelNumber = levelNumber;
-  }
-
-  public GeographicSubAddressType buildingName(String buildingName) {
-    this.buildingName = buildingName;
-    return this;
-  }
-
-  /**
-   * Allows for buildings that have well-known names
-   * @return buildingName
-  **/
-  @Schema(description = "Allows for buildings that have well-known names")
-
-
-  public String getBuildingName() {
-    return buildingName;
-  }
-
-  public void setBuildingName(String buildingName) {
-    this.buildingName = buildingName;
-  }
-
-  public GeographicSubAddressType privateStreetName(String privateStreetName) {
-    this.privateStreetName = privateStreetName;
-    return this;
-  }
-
-  /**
-   * private streets internal to a property (e.g. a university) may have internal names that are not recorded by the land title office
-   * @return privateStreetName
-  **/
-  @Schema(description = "private streets internal to a property (e.g. a university) may have internal names that are not recorded by the land title office")
-
-
-  public String getPrivateStreetName() {
-    return privateStreetName;
-  }
-
-  public void setPrivateStreetName(String privateStreetName) {
-    this.privateStreetName = privateStreetName;
-  }
-
-  public GeographicSubAddressType privateStreetNumber(String privateStreetNumber) {
-    this.privateStreetNumber = privateStreetNumber;
-    return this;
-  }
-
-  /**
-   * Private streets numbers internal to a private street
-   * @return privateStreetNumber
-  **/
-  @Schema(description = "Private streets numbers internal to a private street")
-
-
-  public String getPrivateStreetNumber() {
-    return privateStreetNumber;
-  }
-
-  public void setPrivateStreetNumber(String privateStreetNumber) {
-    this.privateStreetNumber = privateStreetNumber;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GeographicSubAddressType geographicSubAddressType = (GeographicSubAddressType) o;
-    return Objects.equals(this.type, geographicSubAddressType.type) &&
-        Objects.equals(this.name, geographicSubAddressType.name) &&
-        Objects.equals(this.subUnitType, geographicSubAddressType.subUnitType) &&
-        Objects.equals(this.subUnitNumber, geographicSubAddressType.subUnitNumber) &&
-        Objects.equals(this.levelType, geographicSubAddressType.levelType) &&
-        Objects.equals(this.levelNumber, geographicSubAddressType.levelNumber) &&
-        Objects.equals(this.buildingName, geographicSubAddressType.buildingName) &&
-        Objects.equals(this.privateStreetName, geographicSubAddressType.privateStreetName) &&
-        Objects.equals(this.privateStreetNumber, geographicSubAddressType.privateStreetNumber) &&
-        Objects.equals(this.type, geographicSubAddressType.type) &&
-        Objects.equals(this.schemaLocation, geographicSubAddressType.schemaLocation);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GeographicSubAddressType {\n");
-    
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    subUnitType: ").append(toIndentedString(subUnitType)).append("\n");
-    sb.append("    subUnitNumber: ").append(toIndentedString(subUnitNumber)).append("\n");
-    sb.append("    levelType: ").append(toIndentedString(levelType)).append("\n");
-    sb.append("    levelNumber: ").append(toIndentedString(levelNumber)).append("\n");
-    sb.append("    buildingName: ").append(toIndentedString(buildingName)).append("\n");
-    sb.append("    privateStreetName: ").append(toIndentedString(privateStreetName)).append("\n");
-    sb.append("    privateStreetNumber: ").append(toIndentedString(privateStreetNumber)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/IdentificationType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/IdentificationType.java
deleted file mode 100644
index def627d1ee99325c7bc50c3625d59e9dc5376438..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/IdentificationType.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Somebody&#39;s national ID
- */
-@Schema(description = "Somebody's national ID")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "IdentificationType")
-public class IdentificationType  extends BaseRootEntity  {
- 
-
-  @JsonProperty("identificationId")
-  private String identificationId = null;
-
-  @JsonProperty("country")
-  private String country = null;
-
-  @JsonProperty("issuingAuthority")
-  private String issuingAuthority = null;
-
-  @JsonProperty("issuingDate")
-  private OffsetDateTime issuingDate = null;
-
-
-  public IdentificationType identificationId(String identificationId) {
-    this.identificationId = identificationId;
-    return this;
-  }
-
-  /**
-   * Identification number of the document
-   * @return identificationId
-  **/
-  @Schema(description = "Identification number of the document")
-  @NotNull
-
-
-  public String getIdentificationId() {
-    return identificationId;
-  }
-
-  public void setIdentificationId(String identificationId) {
-    this.identificationId = identificationId;
-  }
-
-  public IdentificationType country(String country) {
-    this.country = country;
-    return this;
-  }
-
-  /**
-   * Country that issued the document
-   * @return country
-  **/
-  @Schema(description = "Country that issued the document")
-  @NotNull
-
-
-  public String getCountry() {
-    return country;
-  }
-
-  public void setCountry(String country) {
-    this.country = country;
-  }
-
-  public IdentificationType issuingAuthority(String issuingAuthority) {
-    this.issuingAuthority = issuingAuthority;
-    return this;
-  }
-
-  /**
-   * Authority that issued the legal identification (e.g.: social security, town hall, ...)
-   * @return issuingAuthority
-  **/
-  @Schema(description = "Authority that issued the legal identification (e.g.: social security, town hall, ...)")
-
-
-  public String getIssuingAuthority() {
-    return issuingAuthority;
-  }
-
-  public void setIssuingAuthority(String issuingAuthority) {
-    this.issuingAuthority = issuingAuthority;
-  }
-
-  public IdentificationType issuingDate(OffsetDateTime issuingDate) {
-    this.issuingDate = issuingDate;
-    return this;
-  }
-
-  /**
-   * Date when identification was issued
-   * @return issuingDate
-  **/
-  @Schema(description = "Date when identification was issued")
-
-  @Valid
-
-  public OffsetDateTime getIssuingDate() {
-    return issuingDate;
-  }
-
-  public void setIssuingDate(OffsetDateTime issuingDate) {
-    this.issuingDate = issuingDate;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IdentificationType identificationType = (IdentificationType) o;
-    return Objects.equals(this.type, identificationType.type) &&
-        Objects.equals(this.identificationId, identificationType.identificationId) &&
-        Objects.equals(this.country, identificationType.country) &&
-        Objects.equals(this.issuingAuthority, identificationType.issuingAuthority) &&
-        Objects.equals(this.issuingDate, identificationType.issuingDate) &&
-        Objects.equals(this.schemaLocation, identificationType.schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IdentificationType {\n");
-    
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    identificationId: ").append(toIndentedString(identificationId)).append("\n");
-    sb.append("    country: ").append(toIndentedString(country)).append("\n");
-    sb.append("    issuingAuthority: ").append(toIndentedString(issuingAuthority)).append("\n");
-    sb.append("    issuingDate: ").append(toIndentedString(issuingDate)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/UserAssetType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/UserAssetType.java
deleted file mode 100644
index 30ed0dd8971e59ccc496e28094789d3e577c9810..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/UserAssetType.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * UserAssetType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "UserAssetType")
-public class UserAssetType extends BaseRootEntity {
-	/**
-	 * Type of managed entity (e.g.: product, resource, service, customer, account)
-	 */
-	public enum EntityTypeEnum {
-		CUSTOMER("customer"),
-
-		ACCOUNT("account"),
-
-		PRODUCT("product"),
-
-		SERVICE("service"),
-
-		RESOURCE("resource");
-
-		private String value;
-
-		EntityTypeEnum(String value) {
-			this.value = value;
-		}
-
-		@Override
-		@JsonValue
-		public String toString() {
-			return String.valueOf(value);
-		}
-
-		@JsonCreator
-		public static EntityTypeEnum fromValue(String text) {
-			for (EntityTypeEnum b : EntityTypeEnum.values()) {
-				if (String.valueOf(b.value).equals(text)) {
-					return b;
-				}
-			}
-			return null;
-		}
-	}
-
-	@JsonProperty("entityType")
-	private EntityTypeEnum entityType = null;
-
-	/**
-	 * Second level to define the type of managed element for
-	 * product/service/resource managed entities (e.g.: mobile line subscription,
-	 * video platform license, mobile equipment, etc). Allows identifying the
-	 * specific asset within the server referenced. Supported values are
-	 * implementation and application specific. Other values can be added if those
-	 * listed are not enough
-	 */
-	public enum AssetTypeEnum {
-		MOBILE("mobile"),
-
-		LANDLINE("landline"),
-
-		IPTV("iptv"),
-
-		BROADBAND("broadband"),
-
-		EMAIL("email"),
-
-		INVOICING("invoicing");
-
-		private String value;
-
-		AssetTypeEnum(String value) {
-			this.value = value;
-		}
-
-		@Override
-		@JsonValue
-		public String toString() {
-			return String.valueOf(value);
-		}
-
-		@JsonCreator
-		public static AssetTypeEnum fromValue(String text) {
-			for (AssetTypeEnum b : AssetTypeEnum.values()) {
-				if (String.valueOf(b.value).equals(text)) {
-					return b;
-				}
-			}
-			return null;
-		}
-	}
-
-	@JsonProperty("assetType")
-	private AssetTypeEnum assetType = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("entitlement")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<EntitlementType> entitlement = new HashSet<>();
-
-	public UserAssetType entityType(EntityTypeEnum entityType) {
-		this.entityType = entityType;
-		return this;
-	}
-
-	/**
-	 * Type of managed entity (e.g.: product, resource, service, customer, account)
-	 * 
-	 * @return entityType
-	 **/
-	@Schema(description = "Type of managed entity (e.g.: product, resource, service, customer, account)")
-	@NotNull
-
-	public EntityTypeEnum getEntityType() {
-		return entityType;
-	}
-
-	public void setEntityType(EntityTypeEnum entityType) {
-		this.entityType = entityType;
-	}
-
-	public UserAssetType assetType(AssetTypeEnum assetType) {
-		this.assetType = assetType;
-		return this;
-	}
-
-	/**
-	 * Second level to define the type of managed element for
-	 * product/service/resource managed entities (e.g.: mobile line subscription,
-	 * video platform license, mobile equipment, etc). Allows identifying the
-	 * specific asset within the server referenced. Supported values are
-	 * implementation and application specific. Other values can be added if those
-	 * listed are not enough
-	 * 
-	 * @return assetType
-	 **/
-	@Schema(description = "Second level to define the type of managed element for product/service/resource managed entities (e.g.: mobile line subscription, video platform license, mobile equipment, etc). Allows identifying the specific asset within the server referenced. Supported values are implementation and application specific. Other values can be added if those listed are not enough")
-
-	public AssetTypeEnum getAssetType() {
-		return assetType;
-	}
-
-	public void setAssetType(AssetTypeEnum assetType) {
-		this.assetType = assetType;
-	}
-
-	public UserAssetType id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of referenced entity within the entity/asset pair
-	 * (customerId, accountId, mobile line number, ...)
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of referenced entity within the entity/asset pair (customerId, accountId, mobile line number, ...)")
-	@NotNull
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public UserAssetType role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * Represents the part played by an individual in relation to being granted a
-	 * set of entitlements for manageable assets (e.g.: owner, user, viewer, ...)
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "Represents the part played by an individual in relation to being granted a set of entitlements for manageable assets (e.g.: owner, user, viewer, ...)")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public UserAssetType entitlement(Set<EntitlementType> entitlement) {
-		this.entitlement = entitlement;
-		return this;
-	}
-
-	public UserAssetType addEntitlementItem(EntitlementType entitlementItem) {
-		if (this.entitlement == null) {
-			this.entitlement = new HashSet<>();
-		}
-		this.entitlement.add(entitlementItem);
-		return this;
-	}
-
-	/**
-	 * information about individual entitlements to define access levels to operate
-	 * over different functions that can be defined in an asset
-	 * 
-	 * @return entitlement
-	 **/
-	@Schema(description = "information about individual entitlements to define access levels to operate over different functions that can be defined in an asset")
-
-	@Valid
-
-	public Set<EntitlementType> getEntitlement() {
-		return entitlement;
-	}
-
-	public void setEntitlement(Set<EntitlementType> entitlement) {
-		this.entitlement = entitlement;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		UserAssetType userAssetType = (UserAssetType) o;
-		return Objects.equals(this.entityType, userAssetType.entityType)
-				&& Objects.equals(this.assetType, userAssetType.assetType) && Objects.equals(this.id, userAssetType.id)
-				&& Objects.equals(this.role, userAssetType.role)
-				&& Objects.equals(this.entitlement, userAssetType.entitlement);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class UserAssetType {\n");
-
-		sb.append("    entityType: ").append(toIndentedString(entityType)).append("\n");
-		sb.append("    assetType: ").append(toIndentedString(assetType)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    entitlement: ").append(toIndentedString(entitlement)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/fi691/model/UserInfoType.java b/src/main/java/org/etsi/osl/tmf/fi691/model/UserInfoType.java
deleted file mode 100644
index 2d0e82e7648961e4d8cec1ecde8f3fa55ae77144..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/fi691/model/UserInfoType.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.fi691.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * UserInfoType
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-20T00:39:05.842+02:00")
-
-@Entity(name = "UserInfoType")
-public class UserInfoType extends BaseRootNamedEntity {
-	@JsonProperty("sub")
-	private String sub = null;
-
-	@JsonProperty("given_name")
-	private String givenName = null;
-
-	@JsonProperty("family_name")
-	private String familyName = null;
-
-	@JsonProperty("middle_name")
-	private String middleName = null;
-
-	@JsonProperty("nickname")
-	private String nickname = null;
-
-	@JsonProperty("preferred_username")
-	private String preferredUsername = null;
-
-	@JsonProperty("email")
-	private String email = null;
-
-	@JsonProperty("phone_number")
-	private String phoneNumber = null;
-
-	@JsonProperty("gender")
-	private String gender = null;
-
-	@JsonProperty("birthdate")
-	private String birthdate = null;
-
-	@JsonProperty("locale")
-	private String locale = null;
-
-	@JsonProperty("zoneinfo")
-	private String zoneinfo = null;
-
-	@JsonProperty("profile")
-	private String profile = null;
-
-	@JsonProperty("picture")
-	private String picture = null;
-
-	@JsonProperty("website")
-	private String website = null;
-
-	@JsonProperty("address")
-
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(referencedColumnName = "uuid")
-	private GeographicAddressType address = null;
-
-	@JsonProperty("legalId")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<IdentificationType> legalId = new HashSet<>();
-
-	@JsonProperty("userAssets")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<UserAssetType> userAssets =  new HashSet<>();
-
-	public UserInfoType sub(String sub) {
-		this.sub = sub;
-		return this;
-	}
-
-	/**
-	 * Subject - Unique Identifier for the End-User
-	 * 
-	 * @return sub
-	 **/
-	@Schema(description = "Subject - Unique Identifier for the End-User")
-	@NotNull
-
-	public String getSub() {
-		return sub;
-	}
-
-	public void setSub(String sub) {
-		this.sub = sub;
-	}
-
-	public UserInfoType givenName(String givenName) {
-		this.givenName = givenName;
-		return this;
-	}
-
-	/**
-	 * Given name(s) or first name(s) of the End-User. Note that in some cultures,
-	 * people can have multiple given names; all can be present, with the names
-	 * being separated by space characters
-	 * 
-	 * @return givenName
-	 **/
-	@Schema(description = "Given name(s) or first name(s) of the End-User. Note that in some cultures, people can have multiple given names; all can be present, with the names being separated by space characters")
-
-	public String getGivenName() {
-		return givenName;
-	}
-
-	public void setGivenName(String givenName) {
-		this.givenName = givenName;
-	}
-
-	public UserInfoType familyName(String familyName) {
-		this.familyName = familyName;
-		return this;
-	}
-
-	/**
-	 * Surname(s) or last name(s) of the End-User. Note that in some cultures,
-	 * people can have multiple family names or no family name; all can be present,
-	 * with the names being separated by space characters
-	 * 
-	 * @return familyName
-	 **/
-	@Schema(description = "Surname(s) or last name(s) of the End-User. Note that in some cultures, people can have multiple family names or no family name; all can be present, with the names being separated by space characters")
-
-	public String getFamilyName() {
-		return familyName;
-	}
-
-	public void setFamilyName(String familyName) {
-		this.familyName = familyName;
-	}
-
-	public UserInfoType middleName(String middleName) {
-		this.middleName = middleName;
-		return this;
-	}
-
-	/**
-	 * Middle name(s) of the End-User. Note that in some cultures, people can have
-	 * multiple middle names; all can be present, with the names being separated by
-	 * space characters. Also note that in some cultures, middle names are not used
-	 * 
-	 * @return middleName
-	 **/
-	@Schema(description = "Middle name(s) of the End-User. Note that in some cultures, people can have multiple middle names; all can be present, with the names being separated by space characters. Also note that in some cultures, middle names are not used")
-
-	public String getMiddleName() {
-		return middleName;
-	}
-
-	public void setMiddleName(String middleName) {
-		this.middleName = middleName;
-	}
-
-	public UserInfoType nickname(String nickname) {
-		this.nickname = nickname;
-		return this;
-	}
-
-	/**
-	 * Casual name of the End-User that may or may not be the same as the
-	 * given_name. For instance, a nickname value of Mike might be returned
-	 * alongside a given_name value of Michael
-	 * 
-	 * @return nickname
-	 **/
-	@Schema(description = "Casual name of the End-User that may or may not be the same as the given_name. For instance, a nickname value of Mike might be returned alongside a given_name value of Michael")
-
-	public String getNickname() {
-		return nickname;
-	}
-
-	public void setNickname(String nickname) {
-		this.nickname = nickname;
-	}
-
-	public UserInfoType preferredUsername(String preferredUsername) {
-		this.preferredUsername = preferredUsername;
-		return this;
-	}
-
-	/**
-	 * Shorthand name by which the End-User wishes to be referred to at the RP, such
-	 * as janedoe or j.doe. This value MAY be any valid JSON string including
-	 * special characters such as @, /, or whitespace
-	 * 
-	 * @return preferredUsername
-	 **/
-	@Schema(description = "Shorthand name by which the End-User wishes to be referred to at the RP, such as janedoe or j.doe. This value MAY be any valid JSON string including special characters such as @, /, or whitespace")
-
-	public String getPreferredUsername() {
-		return preferredUsername;
-	}
-
-	public void setPreferredUsername(String preferredUsername) {
-		this.preferredUsername = preferredUsername;
-	}
-
-	public UserInfoType email(String email) {
-		this.email = email;
-		return this;
-	}
-
-	/**
-	 * End-User's preferred e-mail address. Its value MUST conform to the [RFC5322]
-	 * addr-spec syntax
-	 * 
-	 * @return email
-	 **/
-	@Schema(description = "End-User's preferred e-mail address. Its value MUST conform to the [RFC5322] addr-spec syntax")
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public UserInfoType phoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-		return this;
-	}
-
-	/**
-	 * End-User's preferred telephone number. [E.164] is RECOMMENDED as the format
-	 * of this Claim, for example, +1 (425) 555-1212 or +56 82) 687 2400. If the
-	 * phone number contains an extension, it is RECOMMENDED that the extension be
-	 * represented using the [RFC3966] extension syntax, for example, +1 (604)
-	 * 555-1234;ext=5678
-	 * 
-	 * @return phoneNumber
-	 **/
-	@Schema(description = "End-User's preferred telephone number. [E.164] is RECOMMENDED as the format of this Claim, for example, +1 (425) 555-1212 or +56 82) 687 2400. If the phone number contains an extension, it is RECOMMENDED that the extension be represented using the [RFC3966] extension syntax, for example, +1 (604) 555-1234;ext=5678")
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public UserInfoType gender(String gender) {
-		this.gender = gender;
-		return this;
-	}
-
-	/**
-	 * End-User's gender. Values defined by this specification are female and male.
-	 * Other values MAY be used when neither of the defined values are applicable
-	 * 
-	 * @return gender
-	 **/
-	@Schema(description = "End-User's gender. Values defined by this specification are female and male. Other values MAY be used when neither of the defined values are applicable")
-
-	public String getGender() {
-		return gender;
-	}
-
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-
-	public UserInfoType birthdate(String birthdate) {
-		this.birthdate = birthdate;
-		return this;
-	}
-
-	/**
-	 * End-User's birthday, represented as an [ISO8601-2004] YYYY-MM-DD format. The
-	 * year MAY be 0000, indicating that it is omitted. To represent only the year,
-	 * YYYY format is allowed. Note that depending on the underlying platform's date
-	 * related function, providing just year can result in varying month and day, so
-	 * the implementers need to take this factor into account to correctly process
-	 * the dates
-	 * 
-	 * @return birthdate
-	 **/
-	@Schema(description = "End-User's birthday, represented as an [ISO8601-2004] YYYY-MM-DD format. The year MAY be 0000, indicating that it is omitted. To represent only the year, YYYY format is allowed. Note that depending on the underlying platform's date related function, providing just year can result in varying month and day, so the implementers need to take this factor into account to correctly process the dates")
-
-	public String getBirthdate() {
-		return birthdate;
-	}
-
-	public void setBirthdate(String birthdate) {
-		this.birthdate = birthdate;
-	}
-
-	public UserInfoType locale(String locale) {
-		this.locale = locale;
-		return this;
-	}
-
-	/**
-	 * End-User's locale, represented as a [RFC5646] language tag. This is typically
-	 * an [ISO639-1] language code in lowercase and an [ISO3166-1] country code in
-	 * uppercase, separated by a dash. For example, en-US or fr-CA. As a
-	 * compatibility note, some implementations have used an underscore as the
-	 * separator rather than a dash, for example, en_US
-	 * 
-	 * @return locale
-	 **/
-	@Schema(description = "End-User's locale, represented as a [RFC5646] language tag. This is typically an [ISO639-1] language code in lowercase and an [ISO3166-1] country code in uppercase, separated by a dash. For example, en-US or fr-CA. As a compatibility note, some implementations have used an underscore as the separator rather than a dash, for example, en_US")
-
-	public String getLocale() {
-		return locale;
-	}
-
-	public void setLocale(String locale) {
-		this.locale = locale;
-	}
-
-	public UserInfoType zoneinfo(String zoneinfo) {
-		this.zoneinfo = zoneinfo;
-		return this;
-	}
-
-	/**
-	 * String from zoneinfo time zone database representing the End-User's time
-	 * zone. For example, Europe/Paris or America/Los_Angeles
-	 * 
-	 * @return zoneinfo
-	 **/
-	@Schema(description = "String from zoneinfo time zone database representing the End-User's time zone. For example, Europe/Paris or America/Los_Angeles")
-
-	public String getZoneinfo() {
-		return zoneinfo;
-	}
-
-	public void setZoneinfo(String zoneinfo) {
-		this.zoneinfo = zoneinfo;
-	}
-
-	public UserInfoType profile(String profile) {
-		this.profile = profile;
-		return this;
-	}
-
-	/**
-	 * URL of the End-User's profile page. The contents of this Web page SHOULD be
-	 * about the End-User
-	 * 
-	 * @return profile
-	 **/
-	@Schema(description = "URL of the End-User's profile page. The contents of this Web page SHOULD be about the End-User")
-
-	public String getProfile() {
-		return profile;
-	}
-
-	public void setProfile(String profile) {
-		this.profile = profile;
-	}
-
-	public UserInfoType picture(String picture) {
-		this.picture = picture;
-		return this;
-	}
-
-	/**
-	 * URL of the End-User's profile picture. This URL MUST refer to an image file
-	 * (for example, a PNG, JPEG, or GIF image file), rather than to a Web page
-	 * containing an image. Note that this URL SHOULD specifically reference a
-	 * profile photo of the End-User suitable for displaying when describing the
-	 * End-User, rather than an arbitrary photo taken by the End-User
-	 * 
-	 * @return picture
-	 **/
-	@Schema(description = "URL of the End-User's profile picture. This URL MUST refer to an image file (for example, a PNG, JPEG, or GIF image file), rather than to a Web page containing an image. Note that this URL SHOULD specifically reference a profile photo of the End-User suitable for displaying when describing the End-User, rather than an arbitrary photo taken by the End-User")
-
-	public String getPicture() {
-		return picture;
-	}
-
-	public void setPicture(String picture) {
-		this.picture = picture;
-	}
-
-	public UserInfoType website(String website) {
-		this.website = website;
-		return this;
-	}
-
-	/**
-	 * URL of the End-User's Web page or blog. This Web page SHOULD contain
-	 * information published by the End-User or an organization that the End-User is
-	 * affiliated with
-	 * 
-	 * @return website
-	 **/
-	@Schema(description = "URL of the End-User's Web page or blog. This Web page SHOULD contain information published by the End-User or an organization that the End-User is affiliated with")
-
-	public String getWebsite() {
-		return website;
-	}
-
-	public void setWebsite(String website) {
-		this.website = website;
-	}
-
-	public UserInfoType address(GeographicAddressType address) {
-		this.address = address;
-		return this;
-	}
-
-	/**
-	 * Structure including the End-User's preferred postal address
-	 * 
-	 * @return address
-	 **/
-	@Schema(description = "Structure including the End-User's preferred postal address")
-
-	@Valid
-
-	public GeographicAddressType getAddress() {
-		return address;
-	}
-
-	public void setAddress(GeographicAddressType address) {
-		this.address = address;
-	}
-
-	public UserInfoType legalId(Set<IdentificationType> legalId) {
-		this.legalId = legalId;
-		return this;
-	}
-
-	public UserInfoType addLegalIdItem(IdentificationType legalIdItem) {
-		if (this.legalId == null) {
-			this.legalId = new HashSet<>();
-		}
-		this.legalId.add(legalIdItem);
-		return this;
-	}
-
-	/**
-	 * Identification documentation of the contact
-	 * 
-	 * @return legalId
-	 **/
-	@Schema(description = "Identification documentation of the contact")
-
-	@Valid
-
-	public Set<IdentificationType> getLegalId() {
-		return legalId;
-	}
-
-	public void setLegalId(Set<IdentificationType> legalId) {
-		this.legalId = legalId;
-	}
-
-	public UserInfoType userAssets(Set<UserAssetType> userAssets) {
-		this.userAssets = userAssets;
-		return this;
-	}
-
-	public UserInfoType addUserAssetsItem(UserAssetType userAssetsItem) {
-		if (this.userAssets == null) {
-			this.userAssets = new HashSet<>();
-		}
-		this.userAssets.add(userAssetsItem);
-		return this;
-	}
-
-	/**
-	 * List of additional profile information
-	 * 
-	 * @return userAssets
-	 **/
-	@Schema(description = "List of additional profile information")
-
-	@Valid
-
-	public Set<UserAssetType> getUserAssets() {
-		return userAssets;
-	}
-
-	public void setUserAssets(Set<UserAssetType> userAssets) {
-		this.userAssets = userAssets;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		UserInfoType userInfoType = (UserInfoType) o;
-		return Objects.equals(this.sub, userInfoType.sub) && Objects.equals(this.name, userInfoType.name)
-				&& Objects.equals(this.givenName, userInfoType.givenName)
-				&& Objects.equals(this.familyName, userInfoType.familyName)
-				&& Objects.equals(this.middleName, userInfoType.middleName)
-				&& Objects.equals(this.nickname, userInfoType.nickname)
-				&& Objects.equals(this.preferredUsername, userInfoType.preferredUsername)
-				&& Objects.equals(this.email, userInfoType.email)
-				&& Objects.equals(this.phoneNumber, userInfoType.phoneNumber)
-				&& Objects.equals(this.gender, userInfoType.gender)
-				&& Objects.equals(this.birthdate, userInfoType.birthdate)
-				&& Objects.equals(this.locale, userInfoType.locale)
-				&& Objects.equals(this.zoneinfo, userInfoType.zoneinfo)
-				&& Objects.equals(this.profile, userInfoType.profile)
-				&& Objects.equals(this.picture, userInfoType.picture)
-				&& Objects.equals(this.website, userInfoType.website)
-				&& Objects.equals(this.address, userInfoType.address)
-				&& Objects.equals(this.legalId, userInfoType.legalId)
-				&& Objects.equals(this.userAssets, userInfoType.userAssets)
-				&& Objects.equals(this.type, userInfoType.type) && Objects.equals(this.baseType, userInfoType.baseType)
-				&& Objects.equals(this.schemaLocation, userInfoType.schemaLocation);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class UserInfoType {\n");
-
-		sb.append("    sub: ").append(toIndentedString(sub)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
-		sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
-		sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-		sb.append("    nickname: ").append(toIndentedString(nickname)).append("\n");
-		sb.append("    preferredUsername: ").append(toIndentedString(preferredUsername)).append("\n");
-		sb.append("    email: ").append(toIndentedString(email)).append("\n");
-		sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-		sb.append("    gender: ").append(toIndentedString(gender)).append("\n");
-		sb.append("    birthdate: ").append(toIndentedString(birthdate)).append("\n");
-		sb.append("    locale: ").append(toIndentedString(locale)).append("\n");
-		sb.append("    zoneinfo: ").append(toIndentedString(zoneinfo)).append("\n");
-		sb.append("    profile: ").append(toIndentedString(profile)).append("\n");
-		sb.append("    picture: ").append(toIndentedString(picture)).append("\n");
-		sb.append("    website: ").append(toIndentedString(website)).append("\n");
-		sb.append("    address: ").append(toIndentedString(address)).append("\n");
-		sb.append("    legalId: ").append(toIndentedString(legalId)).append("\n");
-		sb.append("    userAssets: ").append(toIndentedString(userAssets)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/lcm/model/ELCMRulePhase.java b/src/main/java/org/etsi/osl/tmf/lcm/model/ELCMRulePhase.java
deleted file mode 100644
index 8497affae0fa269fcf47bbd8ddb16dc5d33cda74..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/lcm/model/ELCMRulePhase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.etsi.osl.tmf.lcm.model;
-
-
-public enum ELCMRulePhase {
-
-	PRE_PROVISION("PRE_PROVISION"),
-	AFTER_ACTIVATION("AFTER_ACTIVATION"),
-	SUPERVISION("SUPERVISION"),
-	AFTER_DEACTIVATION("AFTER_DEACTIVATION"),
-	CREATION("CREATION");
-	
-	private String value;
-	
-	ELCMRulePhase(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static ELCMRulePhase getEnum(String value) {
-        for(ELCMRulePhase v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecification.java b/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecification.java
deleted file mode 100644
index 11d70b632784fe1db2c78acb97104f04dd8c56e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecification.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.etsi.osl.tmf.lcm.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author ctranoris
- * 
- * A LCM RuleSpecification is an entity that describes a LCM rule to apply during the LCM of a service
- *
- */
-@Schema(description = "A LCM RuleSpecification is an entity that describes a LCM rule to apply during the LCM of a service.")
-@Validated
-@Entity(name = "LCMRuleSpec")
-@EqualsAndHashCode(callSuper=true)
-public class LCMRuleSpecification extends BaseEntity{	
-
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-	
-	@JsonProperty("lcmrulephase")
-	protected String lcmrulephase = ELCMRulePhase.PRE_PROVISION.getValue();	
-
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST,  CascadeType.DETACH, CascadeType.REFRESH })
-	@JsonIgnore
-	private Set<ServiceSpecificationRef > serviceSpecs = new HashSet<>();
-		
-
-	@Lob
-	@Column(name = "LCONTENT", columnDefinition = "LONGTEXT")
-	@JsonProperty("content")
-	protected String content = null;
-	
-
-	@Lob
-	@Column(name = "LCODE", columnDefinition = "LONGTEXT")
-	@JsonProperty("code")
-	protected String code = null;
-
-	@JsonProperty("priority")
-	protected int priority = 0;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if ( uuid != null ) {
-			id = uuid;
-		} 
-		return id;
-	}
-	
-	public void setId(String id) {
-		id = uuid;
-	}
-	
-
-//	@Override
-//	public String toString() {
-//		StringBuilder sb = new StringBuilder();
-//		sb.append("class Entity {\n");
-//
-//		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-//		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-//		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-//		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-//		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-//		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-//		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-//		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-//		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-//		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-//		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-//		sb.append("}");
-//		return sb.toString();
-//	}
-	
-	
-	
-	/**
-	 * List of service categories associated with this catalog
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of service specs associated with this rule")
-	@Transient
-	@JsonProperty("serviceSpecs")
-	@Valid
-	public Set<ServiceSpecificationRef> getServiceSpecs() {
-
-		return this.serviceSpecs;		
-	}
-	
-	public void addServiceSpecificationRef(ServiceSpecificationRef s) {
-		if (!this.serviceSpecs.contains(s) ) {
-			this.serviceSpecs.add(s);
-		}
-		
-	}
-
-
-	
-	/**
-	 * @param serviceSpecs the serviceSpecs to set
-	 */
-	public void setServiceSpecs(Set<ServiceSpecificationRef> serviceSpecs) {
-		this.serviceSpecs = serviceSpecs;
-	}
-
-	public void copyFromObj(BaseEntity be) {
-		super.copyFromObj(be);
-	}
-	
-	
-
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-
-	/**
-	 * @return the lcmrulephase
-	 */
-	public String getLcmrulephase() {
-		return lcmrulephase;
-	}
-
-
-	/**
-	 * @param lcmrulephase the lcmrulephase to set
-	 */
-	public void setLcmrulephase(String lcmrulephase) {
-		this.lcmrulephase = lcmrulephase;
-	}
-	
-	public void setLcmrulephase(ELCMRulePhase lcmrulephase) {
-		this.lcmrulephase = lcmrulephase.getValue();
-	}
-
-	/**
-	 * @return the content
-	 */
-	public String getContent() {
-		return content;
-	}
-
-	/**
-	 * @param content the content to set
-	 */
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * @param code the code to set
-	 */
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	/**
-	 * @return the priority
-	 */
-	public int getPriority() {
-		return priority;
-	}
-
-	/**
-	 * @param priority the priority to set
-	 */
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationCreate.java
deleted file mode 100644
index ada9b5b323c4b0c2e25fcba021412aa368983c6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationCreate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.etsi.osl.tmf.lcm.model;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author ctranoris
- * 
- * A LCM RuleSpecification is an entity that describes a LCM rule to apply during the LCM of a service
- *
- */
-@Schema(description = "A LCM RuleSpecification is an entity that describes a LCM rule to apply during the LCM of a service.")
-@Validated
-@Data
-@EqualsAndHashCode(callSuper=true)
-public class LCMRuleSpecificationCreate extends LCMRuleSpecificationUpdate {
-
-	
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationUpdate.java
deleted file mode 100644
index eb4b90a1c6b282e092eb1483db225e91762b4409..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/lcm/model/LCMRuleSpecificationUpdate.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.etsi.osl.tmf.lcm.model;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * @author ctranoris
- * 
- *         A LCM RuleSpecification is an entity that describes a LCM rule to
- *         apply during the LCM of a service
- *
- */
-@Schema(description = "A LCM RuleSpecification is an entity that describes a LCM rule to apply during the LCM of a service.")
-@Validated
-@Data
-public class LCMRuleSpecificationUpdate {
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("priority")
-	protected int priority = 0;
-
-	protected String lcmrulephase = ELCMRulePhase.PRE_PROVISION.getValue();
-
-	private List<ServiceSpecificationRef> serviceSpecs = null;
-
-	@JsonProperty("content")
-	protected String content = null;
-
-	@JsonProperty("code")
-	protected String code = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOffering.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOffering.java
deleted file mode 100644
index de172b7be82451a341d622c82fefa2ca486d19c6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOffering.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A type of ProductOffering that belongs to a grouping of ProductOfferings made
- * available to the market. It inherits of all attributes of ProductOffering.
- */
-@Schema(description = "A type of ProductOffering that belongs to a grouping of ProductOfferings made available to the market. It inherits of all attributes of ProductOffering.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@Entity(name = "BundledProductOffering")
-public class BundledProductOffering extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("bundledProductOfferingOption")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinColumn(referencedColumnName = "uuid")
-	private BundledProductOfferingOption bundledProductOfferingOption = null;
-
-	/**
-	 * Unique identifier of a related entity.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of a related entity.")
-	@NotNull
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * Unique reference of the BundledProductOffering
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Unique reference of the BundledProductOffering")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public BundledProductOffering lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public BundledProductOffering name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the BundledProductOffering
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the BundledProductOffering")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public BundledProductOffering bundledProductOfferingOption(
-			BundledProductOfferingOption bundledProductOfferingOption) {
-		this.bundledProductOfferingOption = bundledProductOfferingOption;
-		return this;
-	}
-
-	/**
-	 * A set of numbers that specifies the lower and upper limits for a
-	 * ProductOffering that can be procured as part of the related
-	 * BundledProductOffering. Values can range from 0 to unbounded.
-	 * 
-	 * @return bundledProductOfferingOption
-	 **/
-	@Schema(description = "A set of numbers that specifies the lower and upper limits for a ProductOffering that can be procured as part of the related BundledProductOffering. Values can range from 0 to unbounded.")
-
-	@Valid
-
-	public BundledProductOfferingOption getBundledProductOfferingOption() {
-		return bundledProductOfferingOption;
-	}
-
-	public void setBundledProductOfferingOption(BundledProductOfferingOption bundledProductOfferingOption) {
-		this.bundledProductOfferingOption = bundledProductOfferingOption;
-	}
-
-	public BundledProductOffering baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public BundledProductOffering schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public BundledProductOffering type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BundledProductOffering bundledProductOffering = (BundledProductOffering) o;
-		return Objects.equals(this.id, bundledProductOffering.id)
-				&& Objects.equals(this.href, bundledProductOffering.href)
-				&& Objects.equals(this.lifecycleStatus, bundledProductOffering.lifecycleStatus)
-				&& Objects.equals(this.name, bundledProductOffering.name)
-				&& Objects.equals(this.bundledProductOfferingOption,
-						bundledProductOffering.bundledProductOfferingOption)
-				&& Objects.equals(this.baseType, bundledProductOffering.baseType)
-				&& Objects.equals(this.schemaLocation, bundledProductOffering.schemaLocation)
-				&& Objects.equals(this.type, bundledProductOffering.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, lifecycleStatus, name, bundledProductOfferingOption, baseType, schemaLocation,
-//				type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class BundledProductOffering {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    bundledProductOfferingOption: ").append(toIndentedString(bundledProductOfferingOption))
-				.append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingOption.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingOption.java
deleted file mode 100644
index 35d7796166f07f8532f8fbcfe66cdb0d1745e3a2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingOption.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * A set of numbers that specifies the lower and upper limits for a
- * ProductOffering that can be procured as part of the related
- * BundledProductOffering. Values can range from 0 to unbounded
- */
-@Schema(description = "A set of numbers that specifies the lower and upper limits for a ProductOffering that can be procured as part of the related BundledProductOffering. Values can range from 0 to unbounded")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "BundledProductOfferingOption")
-public class BundledProductOfferingOption extends BaseRootEntity {
-	@JsonProperty("numberRelOfferDefault")
-	private Integer numberRelOfferDefault = null;
-
-	@JsonProperty("numberRelOfferLowerLimit")
-	private Integer numberRelOfferLowerLimit = null;
-
-	@JsonProperty("numberRelOfferUpperLimit")
-	private Integer numberRelOfferUpperLimit = null;
-
-	public BundledProductOfferingOption numberRelOfferDefault(Integer numberRelOfferDefault) {
-		this.numberRelOfferDefault = numberRelOfferDefault;
-		return this;
-	}
-
-	/**
-	 * Default number of produc offereings that should be procured as part of the
-	 * related BundledProductOffering
-	 * 
-	 * @return numberRelOfferDefault
-	 **/
-	@Schema(description = "Default number of produc offereings that should be procured as part of the related BundledProductOffering")
-
-	public Integer getNumberRelOfferDefault() {
-		return numberRelOfferDefault;
-	}
-
-	public void setNumberRelOfferDefault(Integer numberRelOfferDefault) {
-		this.numberRelOfferDefault = numberRelOfferDefault;
-	}
-
-	public BundledProductOfferingOption numberRelOfferLowerLimit(Integer numberRelOfferLowerLimit) {
-		this.numberRelOfferLowerLimit = numberRelOfferLowerLimit;
-		return this;
-	}
-
-	/**
-	 * lower limit for a product offering that can be procured as part of the
-	 * related BundledProductOffering
-	 * 
-	 * @return numberRelOfferLowerLimit
-	 **/
-	@Schema(description = "lower limit for a product offering that can be procured as part of the related BundledProductOffering")
-
-	public Integer getNumberRelOfferLowerLimit() {
-		return numberRelOfferLowerLimit;
-	}
-
-	public void setNumberRelOfferLowerLimit(Integer numberRelOfferLowerLimit) {
-		this.numberRelOfferLowerLimit = numberRelOfferLowerLimit;
-	}
-
-	public BundledProductOfferingOption numberRelOfferUpperLimit(Integer numberRelOfferUpperLimit) {
-		this.numberRelOfferUpperLimit = numberRelOfferUpperLimit;
-		return this;
-	}
-
-	/**
-	 * upper limit for a product offering that can be procured as part of the
-	 * related BundledProductOffering
-	 * 
-	 * @return numberRelOfferUpperLimit
-	 **/
-	@Schema(description = "upper limit for a product offering that can be procured as part of the related BundledProductOffering")
-
-	public Integer getNumberRelOfferUpperLimit() {
-		return numberRelOfferUpperLimit;
-	}
-
-	public void setNumberRelOfferUpperLimit(Integer numberRelOfferUpperLimit) {
-		this.numberRelOfferUpperLimit = numberRelOfferUpperLimit;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BundledProductOfferingOption bundledProductOfferingOption = (BundledProductOfferingOption) o;
-		return Objects.equals(this.numberRelOfferDefault, bundledProductOfferingOption.numberRelOfferDefault)
-				&& Objects.equals(this.numberRelOfferLowerLimit, bundledProductOfferingOption.numberRelOfferLowerLimit)
-				&& Objects.equals(this.numberRelOfferUpperLimit, bundledProductOfferingOption.numberRelOfferUpperLimit)
-				&& Objects.equals(this.baseType, bundledProductOfferingOption.baseType)
-				&& Objects.equals(this.schemaLocation, bundledProductOfferingOption.schemaLocation)
-				&& Objects.equals(this.type, bundledProductOfferingOption.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(numberRelOfferDefault, numberRelOfferLowerLimit, numberRelOfferUpperLimit, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class BundledProductOfferingOption {\n");
-
-		sb.append("    numberRelOfferDefault: ").append(toIndentedString(numberRelOfferDefault)).append("\n");
-		sb.append("    numberRelOfferLowerLimit: ").append(toIndentedString(numberRelOfferLowerLimit)).append("\n");
-		sb.append("    numberRelOfferUpperLimit: ").append(toIndentedString(numberRelOfferUpperLimit)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingPriceRelationship.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingPriceRelationship.java
deleted file mode 100644
index e6e756618387c180f4a8d2717c8c14907878fdfb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductOfferingPriceRelationship.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * This represents a bundling pricing relationship, allowing a price to be composed of multiple other prices (e.g. a recurring charge and a onetime charge).
- */
-@Schema(description = "This represents a bundling pricing relationship, allowing a price to be composed of multiple other prices (e.g. a recurring charge and a onetime charge).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@Entity
-public class BundledProductOfferingPriceRelationship   extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
- 
-
-  public BundledProductOfferingPriceRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the bundled product offering price
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the bundled product offering price")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BundledProductOfferingPriceRelationship bundledProductOfferingPriceRelationship = (BundledProductOfferingPriceRelationship) o;
-    return Objects.equals(this.id, bundledProductOfferingPriceRelationship.id) &&
-        Objects.equals(this.href, bundledProductOfferingPriceRelationship.href) &&
-        Objects.equals(this.name, bundledProductOfferingPriceRelationship.name) &&
-        Objects.equals(this.baseType, bundledProductOfferingPriceRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, bundledProductOfferingPriceRelationship.schemaLocation) &&
-        Objects.equals(this.type, bundledProductOfferingPriceRelationship.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BundledProductOfferingPriceRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductSpecification.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductSpecification.java
deleted file mode 100644
index ea63ae5578346c54034543eb815eb7384eba8e11..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/BundledProductSpecification.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * A type of ProductSpecification that belongs to a grouping of
- * ProductSpecifications made available to the market. It inherits of all
- * attributes of ProductSpecification.
- */
-@Schema(description = "A type of ProductSpecification that belongs to a grouping of ProductSpecifications made available to the market. It inherits of all attributes of ProductSpecification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class BundledProductSpecification extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-
-	@JsonProperty("lifecycleStatus")
-	private String lifecycleStatus = null;
-
-	public BundledProductSpecification() {
-		super();
-	}
-
-
-	public BundledProductSpecification(BundledProductSpecification bundledProdSpec) {
-		this();
-		this.name = bundledProdSpec.getName();
-		this.lifecycleStatus = bundledProdSpec.getLifecycleStatus();
-	}
-
-	public BundledProductSpecification id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the product specification
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the product specification")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public BundledProductSpecification href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Reference of the product specification
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Reference of the product specification")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public BundledProductSpecification lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public BundledProductSpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the product specification
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the product specification")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public BundledProductSpecification baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public BundledProductSpecification schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public BundledProductSpecification type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		BundledProductSpecification bundledProductSpecification = (BundledProductSpecification) o;
-		return Objects.equals(this.id, bundledProductSpecification.id)
-				&& Objects.equals(this.href, bundledProductSpecification.href)
-				&& Objects.equals(this.lifecycleStatus, bundledProductSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, bundledProductSpecification.name)
-				&& Objects.equals(this.baseType, bundledProductSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, bundledProductSpecification.schemaLocation)
-				&& Objects.equals(this.type, bundledProductSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, lifecycleStatus, name, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class BundledProductSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(BundledProductSpecification src) {
-		this.name = src.getName();
-		this.lifecycleStatus = src.getLifecycleStatus();
-
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/Catalog.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/Catalog.java
deleted file mode 100644
index 3ce243b3aee97bd85b94a4df97d425f43b01aab5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/Catalog.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * A collection of Product Offerings, intended for a specific
- * DistributionChannel, enhanced with additional information such as SLA
- * parameters, invoicing and shipping details
- */
-@Schema(description = "A collection of Product Offerings, intended for a specific DistributionChannel, enhanced with additional information such as SLA parameters, invoicing and shipping details")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductCatalog")
-@Table(name = "ProductCatalog")
-public class Catalog  extends BaseEntity {
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("catalogType")
-	private String catalogType = null;
-
-
-
-	
-	@ManyToMany(cascade = {  CascadeType.DETACH } )
-	@JoinTable()	
-	@JsonIgnore
-	private Set<Category> categoryObj = new HashSet<>();
-	
-
-	@Transient
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-	public Catalog id(String id) {
-		this.id = id;
-		return this;
-	}
-	
-	/**
-	 * List of service categories associated with this catalog
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of  categories associated with this catalog")
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<CategoryRef> getCategoryRefs() {
-
-		List<CategoryRef> category = new ArrayList<>();
-		
-		for (Category Category : categoryObj) {
-			CategoryRef scr = new CategoryRef();
-			scr.setId( Category.getId());
-			scr.setName( Category.getName());
-			scr.setBaseType( CategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	/**
-	 * @param crefs
-	 */
-	public void  setCategoryRefs( List<CategoryRef> crefs){
-		for (CategoryRef CategoryRef : crefs) {
-			Category e = new Category();
-			e.setUuid( CategoryRef.getId() );
-			e.setName(CategoryRef.getName());
-			categoryObj.add(e );
-		}
-	}
-	
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<Category> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<Category> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-
-	/**
-	 * Unique identifier of the Catalog
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the Catalog")
-
-	public String getId() {
-		return uuid;
-	}
-
-
-	public Catalog catalogType(String catalogType) {
-		this.catalogType = catalogType;
-		return this;
-	}
-
-	/**
-	 * Indicates if the catalog is a product, service or resource catalog
-	 * 
-	 * @return catalogType
-	 **/
-	@Schema(description = "Indicates if the catalog is a product, service or resource catalog")
-
-	public String getCatalogType() {
-		return catalogType;
-	}
-
-	public void setCatalogType(String catalogType) {
-		this.catalogType = catalogType;
-	}
-
-	
-
-
-
-	public Catalog relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Catalog addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * List of parties involved in this catalog
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "List of parties involved in this catalog")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Catalog catalog = (Catalog) o;
-		return Objects.equals(this.id, catalog.id) && Objects.equals(this.href, catalog.href)
-				&& Objects.equals(this.catalogType, catalog.catalogType)
-				&& Objects.equals(this.description, catalog.description)
-				&& Objects.equals(this.lastUpdate, catalog.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, catalog.lifecycleStatus)
-				&& Objects.equals(this.name, catalog.name) && Objects.equals(this.version, catalog.version)
-				&& Objects.equals(this.getCategoryRefs(), catalog.getCategoryRefs())
-				&& Objects.equals(this.relatedParty, catalog.relatedParty)
-				&& Objects.equals(this.validFor, catalog.validFor) && Objects.equals(this.baseType, catalog.baseType)
-				&& Objects.equals(this.schemaLocation, catalog.schemaLocation)
-				&& Objects.equals(this.type, catalog.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, catalogType, description, lastUpdate, lifecycleStatus, name, version, category,
-//				relatedParty, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Catalog {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    catalogType: ").append(toIndentedString(catalogType)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(this.getCategoryRefs())).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void addCategory(Category servcat) {
-		if (!categoryObj.contains(servcat) ) {
-			categoryObj.add(servcat);
-		}
-		
-		
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEvent.java
deleted file mode 100644
index 374e6ddbec2772f32695201bd840748fc01642da..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogBatchEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CatalogBatchEventPayload event = null;
-
-  public CatalogBatchEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CatalogBatchEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CatalogBatchEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CatalogBatchEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CatalogBatchEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CatalogBatchEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CatalogBatchEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CatalogBatchEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CatalogBatchEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CatalogBatchEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CatalogBatchEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CatalogBatchEvent event(CatalogBatchEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CatalogBatchEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CatalogBatchEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogBatchEvent catalogBatchEvent = (CatalogBatchEvent) o;
-    return Objects.equals(this.id, catalogBatchEvent.id) &&
-        Objects.equals(this.href, catalogBatchEvent.href) &&
-        Objects.equals(this.eventId, catalogBatchEvent.eventId) &&
-        Objects.equals(this.eventTime, catalogBatchEvent.eventTime) &&
-        Objects.equals(this.eventType, catalogBatchEvent.eventType) &&
-        Objects.equals(this.correlationId, catalogBatchEvent.correlationId) &&
-        Objects.equals(this.domain, catalogBatchEvent.domain) &&
-        Objects.equals(this.title, catalogBatchEvent.title) &&
-        Objects.equals(this.description, catalogBatchEvent.description) &&
-        Objects.equals(this.priority, catalogBatchEvent.priority) &&
-        Objects.equals(this.timeOcurred, catalogBatchEvent.timeOcurred) &&
-        Objects.equals(this.event, catalogBatchEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogBatchEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEventPayload.java
deleted file mode 100644
index 4fab481157935e360ab1f95c8dc378bec48e40ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogBatchEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogBatchEventPayload   {
-  @JsonProperty("catalog")
-  private Catalog catalog = null;
-
-  public CatalogBatchEventPayload catalog(Catalog catalog) {
-    this.catalog = catalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return catalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Catalog getCatalog() {
-    return catalog;
-  }
-
-  public void setCatalog(Catalog catalog) {
-    this.catalog = catalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogBatchEventPayload catalogBatchEventPayload = (CatalogBatchEventPayload) o;
-    return Objects.equals(this.catalog, catalogBatchEventPayload.catalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(catalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogBatchEventPayload {\n");
-    
-    sb.append("    catalog: ").append(toIndentedString(catalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreate.java
deleted file mode 100644
index 722f76bdf95de32ca358bbb4ee7eb007d02febe1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreate.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A collection of Product Offerings, intended for a specific DistributionChannel, enhanced with additional information such as SLA parameters, invoicing and shipping details Skipped properties: id,href
- */
-@Schema(description = "A collection of Product Offerings, intended for a specific DistributionChannel, enhanced with additional information such as SLA parameters, invoicing and shipping details Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogCreate  extends CatalogUpdate {
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogCreate catalogCreate = (CatalogCreate) o;
-    return Objects.equals(this.catalogType, catalogCreate.catalogType) &&
-        Objects.equals(this.description, catalogCreate.description) &&
-        Objects.equals(this.lastUpdate, catalogCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, catalogCreate.lifecycleStatus) &&
-        Objects.equals(this.name, catalogCreate.name) &&
-        Objects.equals(this.version, catalogCreate.version) &&
-        Objects.equals(this.category, catalogCreate.category) &&
-        Objects.equals(this.relatedParty, catalogCreate.relatedParty) &&
-        Objects.equals(this.validFor, catalogCreate.validFor) &&
-        Objects.equals(this.baseType, catalogCreate.baseType) &&
-        Objects.equals(this.schemaLocation, catalogCreate.schemaLocation) &&
-        Objects.equals(this.type, catalogCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(catalogType, description, lastUpdate, lifecycleStatus, name, version, category, relatedParty, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogCreate {\n");
-    
-    sb.append("    catalogType: ").append(toIndentedString(catalogType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEvent.java
deleted file mode 100644
index 25f8164f1c1dfe7b280f100783bb43d486de489a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CatalogCreateEventPayload event = null;
-
-  public CatalogCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CatalogCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CatalogCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CatalogCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CatalogCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CatalogCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CatalogCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CatalogCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CatalogCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CatalogCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CatalogCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CatalogCreateEvent event(CatalogCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CatalogCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CatalogCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogCreateEvent catalogCreateEvent = (CatalogCreateEvent) o;
-    return Objects.equals(this.id, catalogCreateEvent.id) &&
-        Objects.equals(this.href, catalogCreateEvent.href) &&
-        Objects.equals(this.eventId, catalogCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, catalogCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, catalogCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, catalogCreateEvent.correlationId) &&
-        Objects.equals(this.domain, catalogCreateEvent.domain) &&
-        Objects.equals(this.title, catalogCreateEvent.title) &&
-        Objects.equals(this.description, catalogCreateEvent.description) &&
-        Objects.equals(this.priority, catalogCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, catalogCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, catalogCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEventPayload.java
deleted file mode 100644
index c571ed91a015a6193b2cbabbf3266f32b5f4ba61..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogCreateEventPayload   {
-  @JsonProperty("catalog")
-  private Catalog catalog = null;
-
-  public CatalogCreateEventPayload catalog(Catalog catalog) {
-    this.catalog = catalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return catalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Catalog getCatalog() {
-    return catalog;
-  }
-
-  public void setCatalog(Catalog catalog) {
-    this.catalog = catalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogCreateEventPayload catalogCreateEventPayload = (CatalogCreateEventPayload) o;
-    return Objects.equals(this.catalog, catalogCreateEventPayload.catalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(catalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogCreateEventPayload {\n");
-    
-    sb.append("    catalog: ").append(toIndentedString(catalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEvent.java
deleted file mode 100644
index fe8761643c627ff12f0b24246f1aeee81a2f7704..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CatalogDeleteEventPayload event = null;
-
-  public CatalogDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CatalogDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CatalogDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CatalogDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CatalogDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CatalogDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CatalogDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CatalogDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CatalogDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CatalogDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CatalogDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CatalogDeleteEvent event(CatalogDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CatalogDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CatalogDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogDeleteEvent catalogDeleteEvent = (CatalogDeleteEvent) o;
-    return Objects.equals(this.id, catalogDeleteEvent.id) &&
-        Objects.equals(this.href, catalogDeleteEvent.href) &&
-        Objects.equals(this.eventId, catalogDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, catalogDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, catalogDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, catalogDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, catalogDeleteEvent.domain) &&
-        Objects.equals(this.title, catalogDeleteEvent.title) &&
-        Objects.equals(this.description, catalogDeleteEvent.description) &&
-        Objects.equals(this.priority, catalogDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, catalogDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, catalogDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEventPayload.java
deleted file mode 100644
index ec5f0791a5508d3140aa1fc0deadeb62b2471b12..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogDeleteEventPayload   {
-  @JsonProperty("catalog")
-  private Catalog catalog = null;
-
-  public CatalogDeleteEventPayload catalog(Catalog catalog) {
-    this.catalog = catalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return catalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Catalog getCatalog() {
-    return catalog;
-  }
-
-  public void setCatalog(Catalog catalog) {
-    this.catalog = catalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogDeleteEventPayload catalogDeleteEventPayload = (CatalogDeleteEventPayload) o;
-    return Objects.equals(this.catalog, catalogDeleteEventPayload.catalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(catalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogDeleteEventPayload {\n");
-    
-    sb.append("    catalog: ").append(toIndentedString(catalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogUpdate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogUpdate.java
deleted file mode 100644
index d7de4020940b6baa00220309cfa3797521182c30..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CatalogUpdate.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A collection of Product Offerings, intended for a specific DistributionChannel, enhanced with additional information such as SLA parameters, invoicing and shipping details Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "A collection of Product Offerings, intended for a specific DistributionChannel, enhanced with additional information such as SLA parameters, invoicing and shipping details Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CatalogUpdate   {
-  @JsonProperty("catalogType")
-  protected String catalogType = null;
-
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<CategoryRef> category = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  protected CatalogUpdate catalogType(String catalogType) {
-    this.catalogType = catalogType;
-    return this;
-  }
-
-  /**
-   * Indicates if the catalog is a product, service or resource catalog
-   * @return catalogType
-  **/
-  @Schema(description = "Indicates if the catalog is a product, service or resource catalog")
-
-
-  public String getCatalogType() {
-    return catalogType;
-  }
-
-  public void setCatalogType(String catalogType) {
-    this.catalogType = catalogType;
-  }
-
-  public CatalogUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of this catalog
-   * @return description
-  **/
-  @Schema(description = "Description of this catalog")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CatalogUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public CatalogUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the catalog
-   * @return name
-  **/
-  @Schema(description = "Name of the catalog")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public CatalogUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Catalog version
-   * @return version
-  **/
-  @Schema(description = "Catalog version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public CatalogUpdate category(List<CategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public CatalogUpdate addCategoryItem(CategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * List of root categories contained in this catalog
-   * @return category
-  **/
-  @Schema(description = "List of root categories contained in this catalog")
-
-  @Valid
-
-  public List<CategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<CategoryRef> category) {
-    this.category = category;
-  }
-
-  public CatalogUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public CatalogUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * List of parties involved in this catalog
-   * @return relatedParty
-  **/
-  @Schema(description = "List of parties involved in this catalog")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public CatalogUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the catalog is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the catalog is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CatalogUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CatalogUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CatalogUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatalogUpdate catalogUpdate = (CatalogUpdate) o;
-    return Objects.equals(this.catalogType, catalogUpdate.catalogType) &&
-        Objects.equals(this.description, catalogUpdate.description) &&
-        Objects.equals(this.lifecycleStatus, catalogUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, catalogUpdate.name) &&
-        Objects.equals(this.version, catalogUpdate.version) &&
-        Objects.equals(this.category, catalogUpdate.category) &&
-        Objects.equals(this.relatedParty, catalogUpdate.relatedParty) &&
-        Objects.equals(this.validFor, catalogUpdate.validFor) &&
-        Objects.equals(this.baseType, catalogUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, catalogUpdate.schemaLocation) &&
-        Objects.equals(this.type, catalogUpdate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(catalogType, description, lifecycleStatus, name, version, category, relatedParty, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatalogUpdate {\n");
-    
-    sb.append("    catalogType: ").append(toIndentedString(catalogType)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/Category.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/Category.java
deleted file mode 100644
index 8ad60cb816257ad0ba62c45641391b1ccc5a3863..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/Category.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * The category resource is used to group product offerings, service and
- * resource candidates in logical containers. Categories can contain other
- * categories and/or product offerings, resource or service candidates.
- */
-@Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductCategory")
-@Table(name = "ProductCategory")
-public class Category extends BaseEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isRoot")
-	private Boolean isRoot = null;
-
-	@JsonProperty("parentId")
-	private String parentId = null;
-
-//	@JsonProperty("productOffering")
-//	@Valid
-//	private List<ProductOfferingRef> productOffering = null;
-
-
-	@ManyToMany(cascade = {  CascadeType.MERGE, CascadeType.DETACH } )
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ProductOffering> productOffObj = new HashSet<>();
-	
-	
-
-
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinTable()	
-	@JsonIgnore
-	private Set<Category> subCategoryObj = new HashSet<>();
-	
-	
-//	@JsonProperty("subCategory")
-//	@Valid
-//	private List<CategoryRef> subCategory = null;
-	
-
-	public Category id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the category
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the category")
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public Category isRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-		return this;
-	}
-
-	/**
-	 * If true, this Boolean indicates that the category is a root of categories
-	 * 
-	 * @return isRoot
-	 **/
-	@Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-	public Boolean isIsRoot() {
-		return isRoot;
-	}
-
-	public void setIsRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-	}
-
-	public Category parentId(String parentId) {
-		this.parentId = parentId;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the parent category
-	 * 
-	 * @return parentId
-	 **/
-	@Schema(description = "Unique identifier of the parent category")
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	
-
-	/**
-	 * A product offering represents entities that are orderable from the provider
-	 * of the catalog, this resource includes pricing information.
-	 * 
-	 * @return productOffering
-	 **/
-	@Schema(description = "A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-
-	@Valid
-	@JsonProperty("productOffering")
-
-	public List<ProductOfferingRef> getProductOfferingRefs() {
-		
-		List<ProductOfferingRef> scref = new ArrayList<>();
-		
-		for (ProductOffering sc : productOffObj) {
-			ProductOfferingRef scr = new ProductOfferingRef();
-			scr.setId( sc.getId());
-			scr.setName( sc.getName());
-			scr.setBaseType( ProductOfferingRef.class.getName() );
-			scref.add(scr);
-		}
-		
-		
-		return scref;
-	}
-
-	
-
-	@JsonIgnore
-	public Set<ProductOffering> getProductOfferingObj(){
-		return this.productOffObj;
-	}
-	
-	
-
-
-	/**
-	 * List of child categories in the tree for in this category
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of child categories in the tree for in this category")
-	@Transient
-	@JsonProperty("subCategory")
-	@Valid
-	public List<CategoryRef> getCategoryRefs() {
-
-		List<CategoryRef> category = new ArrayList<>();
-		
-		for (Category sCategory : subCategoryObj) {
-			CategoryRef scr = new CategoryRef();
-			scr.setId( sCategory.getId());
-			scr.setName( sCategory.getName());
-			scr.setBaseType( CategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	@JsonProperty("subCategory")
-	public void setCategoryObj(List<CategoryRef> alist) {
-		this.subCategoryObj.clear();
-		for (CategoryRef categoryRef : alist) {
-			Category sc = new Category();
-			sc.setUuid( categoryRef.getId());
-			sc.setName(categoryRef.getName());
-			sc.setBaseType(categoryRef.getBaseType());
-			this.subCategoryObj.add(sc);
-		}
-	}
-	
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<Category> getCategoryObj() {
-		return subCategoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set< Category> categoryObj) {
-		this.subCategoryObj = categoryObj;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Category category = (Category) o;
-		return Objects.equals(this.id, category.id) && Objects.equals(this.href, category.href)
-				&& Objects.equals(this.description, category.description)
-				&& Objects.equals(this.isRoot, category.isRoot) && Objects.equals(this.lastUpdate, category.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, category.lifecycleStatus)
-				&& Objects.equals(this.name, category.name) && Objects.equals(this.parentId, category.parentId)
-				&& Objects.equals(this.version, category.version)
-				&& Objects.equals(this.productOffObj , category.productOffObj)
-				&& Objects.equals(this.subCategoryObj, category.subCategoryObj)
-				&& Objects.equals(this.validFor, category.validFor) && Objects.equals(this.baseType, category.baseType)
-				&& Objects.equals(this.schemaLocation, category.schemaLocation)
-				&& Objects.equals(this.type, category.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, isRoot, lastUpdate, lifecycleStatus, name, parentId, version,
-//				productOffering, subCategory, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Category {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    productOffering: ").append(toIndentedString(productOffObj)).append("\n");
-		sb.append("    subCategory: ").append(toIndentedString(subCategoryObj)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreate.java
deleted file mode 100644
index 6a2329d9c3676da88edb75462f6b3f54ea534166..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreate.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates. Skipped properties: id,href
- */
-@Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryCreate extends CategoryUpdate  {
-
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
- 
-
-  public CategoryCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryCreate categoryCreate = (CategoryCreate) o;
-    return Objects.equals(this.description, categoryCreate.description) &&
-        Objects.equals(this.isRoot, categoryCreate.isRoot) &&
-        Objects.equals(this.lastUpdate, categoryCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, categoryCreate.lifecycleStatus) &&
-        Objects.equals(this.name, categoryCreate.name) &&
-        Objects.equals(this.parentId, categoryCreate.parentId) &&
-        Objects.equals(this.version, categoryCreate.version) &&
-        Objects.equals(this.productOffering, categoryCreate.productOffering) &&
-        Objects.equals(this.subCategory, categoryCreate.subCategory) &&
-        Objects.equals(this.validFor, categoryCreate.validFor) &&
-        Objects.equals(this.baseType, categoryCreate.baseType) &&
-        Objects.equals(this.schemaLocation, categoryCreate.schemaLocation) &&
-        Objects.equals(this.type, categoryCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, isRoot, lastUpdate, lifecycleStatus, name, parentId, version, productOffering, subCategory, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    subCategory: ").append(toIndentedString(subCategory)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEvent.java
deleted file mode 100644
index 8d444a441e0e0d90cba70ed75290390d21a02d00..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CategoryCreateEventPayload event = null;
-
-  public CategoryCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CategoryCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CategoryCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CategoryCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CategoryCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CategoryCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CategoryCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CategoryCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CategoryCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CategoryCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CategoryCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CategoryCreateEvent event(CategoryCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CategoryCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CategoryCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryCreateEvent categoryCreateEvent = (CategoryCreateEvent) o;
-    return Objects.equals(this.id, categoryCreateEvent.id) &&
-        Objects.equals(this.href, categoryCreateEvent.href) &&
-        Objects.equals(this.eventId, categoryCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, categoryCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, categoryCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, categoryCreateEvent.correlationId) &&
-        Objects.equals(this.domain, categoryCreateEvent.domain) &&
-        Objects.equals(this.title, categoryCreateEvent.title) &&
-        Objects.equals(this.description, categoryCreateEvent.description) &&
-        Objects.equals(this.priority, categoryCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, categoryCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, categoryCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEventPayload.java
deleted file mode 100644
index e9c941d67773f0bb63411529a2c9df46e493c506..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryCreateEventPayload   {
-  @JsonProperty("category")
-  private Category category = null;
-
-  public CategoryCreateEventPayload category(Category category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return category
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Category getCategory() {
-    return category;
-  }
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryCreateEventPayload categoryCreateEventPayload = (CategoryCreateEventPayload) o;
-    return Objects.equals(this.category, categoryCreateEventPayload.category);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(category);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryCreateEventPayload {\n");
-    
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEvent.java
deleted file mode 100644
index 5e6a138fa1121e9b1c264596c5e1aa2e4c7fe405..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CategoryDeleteEventPayload event = null;
-
-  public CategoryDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CategoryDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CategoryDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CategoryDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CategoryDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CategoryDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CategoryDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CategoryDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CategoryDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CategoryDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CategoryDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CategoryDeleteEvent event(CategoryDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public CategoryDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CategoryDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryDeleteEvent categoryDeleteEvent = (CategoryDeleteEvent) o;
-    return Objects.equals(this.id, categoryDeleteEvent.id) &&
-        Objects.equals(this.href, categoryDeleteEvent.href) &&
-        Objects.equals(this.eventId, categoryDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, categoryDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, categoryDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, categoryDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, categoryDeleteEvent.domain) &&
-        Objects.equals(this.title, categoryDeleteEvent.title) &&
-        Objects.equals(this.description, categoryDeleteEvent.description) &&
-        Objects.equals(this.priority, categoryDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, categoryDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, categoryDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEventPayload.java
deleted file mode 100644
index 3f3fa9c5e9d86df029f22d0a5ddc887b276b42cd..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryDeleteEventPayload   {
-  @JsonProperty("category")
-  private Category category = null;
-
-  public CategoryDeleteEventPayload category(Category category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return category
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Category getCategory() {
-    return category;
-  }
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryDeleteEventPayload categoryDeleteEventPayload = (CategoryDeleteEventPayload) o;
-    return Objects.equals(this.category, categoryDeleteEventPayload.category);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(category);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryDeleteEventPayload {\n");
-    
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryRef.java
deleted file mode 100644
index 4734101af9f2ba184bd94a93084574b17de31406..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryRef.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The category for grouping recommendations
- */
-@Schema(description = "The category for grouping recommendations")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@JsonIgnoreProperties({ "uuid" })
-@Entity(name = "CategoryRef")
-public class CategoryRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	public CategoryRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of a related entity.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of a related entity.")
-	@NotNull
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public CategoryRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CategoryRef categoryRef = (CategoryRef) o;
-		return Objects.equals(this.id, categoryRef.id) && Objects.equals(this.href, categoryRef.href)
-				&& Objects.equals(this.name, categoryRef.name) && Objects.equals(this.version, categoryRef.version)
-				&& Objects.equals(this.baseType, categoryRef.baseType)
-				&& Objects.equals(this.schemaLocation, categoryRef.schemaLocation)
-				&& Objects.equals(this.type, categoryRef.type)
-				&& Objects.equals(this.referredType, categoryRef.referredType);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CategoryRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryUpdate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryUpdate.java
deleted file mode 100644
index fa75560004b83371d66e16227fb31c609205e60e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/CategoryUpdate.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class CategoryUpdate   {
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("isRoot")
-  protected Boolean isRoot = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("parentId")
-  protected String parentId = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("productOffering")
-  @Valid
-  protected List<ProductOfferingRef> productOffering = null;
-
-  @JsonProperty("subCategory")
-  @Valid
-  protected List<CategoryRef> subCategory = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public CategoryUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the category
-   * @return description
-  **/
-  @Schema(description = "Description of the category")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CategoryUpdate isRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-    return this;
-  }
-
-  /**
-   * If true, this Boolean indicates that the category is a root of categories
-   * @return isRoot
-  **/
-  @Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-
-  public Boolean isIsRoot() {
-    return isRoot;
-  }
-
-  public void setIsRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-  }
-
-  public CategoryUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public CategoryUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the category
-   * @return name
-  **/
-  @Schema(description = "Name of the category")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public CategoryUpdate parentId(String parentId) {
-    this.parentId = parentId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the parent category
-   * @return parentId
-  **/
-  @Schema(description = "Unique identifier of the parent category")
-
-
-  public String getParentId() {
-    return parentId;
-  }
-
-  public void setParentId(String parentId) {
-    this.parentId = parentId;
-  }
-
-  public CategoryUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Category version
-   * @return version
-  **/
-  @Schema(description = "Category version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public CategoryUpdate productOffering(List<ProductOfferingRef> productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  public CategoryUpdate addProductOfferingItem(ProductOfferingRef productOfferingItem) {
-    if (this.productOffering == null) {
-      this.productOffering = new ArrayList<>();
-    }
-    this.productOffering.add(productOfferingItem);
-    return this;
-  }
-
-  /**
-   * A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.
-   * @return productOffering
-  **/
-  @Schema(description = "A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-
-  @Valid
-
-  public List<ProductOfferingRef> getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(List<ProductOfferingRef> productOffering) {
-    this.productOffering = productOffering;
-  }
-
-  public CategoryUpdate subCategory(List<CategoryRef> subCategory) {
-    this.subCategory = subCategory;
-    return this;
-  }
-
-  public CategoryUpdate addSubCategoryItem(CategoryRef subCategoryItem) {
-    if (this.subCategory == null) {
-      this.subCategory = new ArrayList<>();
-    }
-    this.subCategory.add(subCategoryItem);
-    return this;
-  }
-
-  /**
-   * The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other (sub-)categories and/or product offerings.
-   * @return subCategory
-  **/
-  @Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other (sub-)categories and/or product offerings.")
-
-  @Valid
-
-  public List<CategoryRef> getSubCategory() {
-    return subCategory;
-  }
-
-  public void setSubCategory(List<CategoryRef> subCategory) {
-    this.subCategory = subCategory;
-  }
-
-  public CategoryUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the category is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the category is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CategoryUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CategoryUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CategoryUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CategoryUpdate categoryUpdate = (CategoryUpdate) o;
-    return Objects.equals(this.description, categoryUpdate.description) &&
-        Objects.equals(this.isRoot, categoryUpdate.isRoot) &&
-        Objects.equals(this.lifecycleStatus, categoryUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, categoryUpdate.name) &&
-        Objects.equals(this.parentId, categoryUpdate.parentId) &&
-        Objects.equals(this.version, categoryUpdate.version) &&
-        Objects.equals(this.productOffering, categoryUpdate.productOffering) &&
-        Objects.equals(this.subCategory, categoryUpdate.subCategory) &&
-        Objects.equals(this.validFor, categoryUpdate.validFor) &&
-        Objects.equals(this.baseType, categoryUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, categoryUpdate.schemaLocation) &&
-        Objects.equals(this.type, categoryUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isRoot, lifecycleStatus, name, parentId, version, productOffering, subCategory, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    subCategory: ").append(toIndentedString(subCategory)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ChannelRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ChannelRef.java
deleted file mode 100644
index 01e10af5917b32f09f03bfd26c38e2186e0d9abf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ChannelRef.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The channel to which the resource reference to. e.g. channel for selling product offerings, channel for opening a trouble ticket etc..
- */
-@Schema(description = "The channel to which the resource reference to. e.g. channel for selling product offerings, channel for opening a trouble ticket etc..")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ChannelRef")
-public class ChannelRef extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-  }
-
-
-  public ChannelRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  
-
-  public ChannelRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ChannelRef channelRef = (ChannelRef) o;
-    return Objects.equals(this.id, channelRef.id) &&
-        Objects.equals(this.href, channelRef.href) &&
-        Objects.equals(this.name, channelRef.name) &&
-        Objects.equals(this.baseType, channelRef.baseType) &&
-        Objects.equals(this.schemaLocation, channelRef.schemaLocation) &&
-        Objects.equals(this.type, channelRef.type) &&
-        Objects.equals(this.referredType, channelRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ChannelRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ConstraintRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ConstraintRef.java
deleted file mode 100644
index b3f4c8ef4c54a767f88a5f3e2030d56706a85f06..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ConstraintRef.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.
- */
-@Schema(description = "Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class ConstraintRef  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ConstraintRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * reference id to the target constraint
-   * @return id
-  **/
-  @Schema(description = "reference id to the target constraint")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public ConstraintRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The (class) type of the referred constraint
-   * @return referredType
-  **/
-  @Schema(description = "The (class) type of the referred constraint")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ConstraintRef constraintRef = (ConstraintRef) o;
-    return Objects.equals(this.id, constraintRef.id) &&
-        Objects.equals(this.href, constraintRef.href) &&
-        Objects.equals(this.name, constraintRef.name) &&
-        Objects.equals(this.version, constraintRef.version) &&
-        Objects.equals(this.baseType, constraintRef.baseType) &&
-        Objects.equals(this.schemaLocation, constraintRef.schemaLocation) &&
-        Objects.equals(this.type, constraintRef.type) &&
-        Objects.equals(this.referredType, constraintRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ConstraintRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/EntityRef.java
deleted file mode 100644
index e37f9480548b9ba1e42a25beae40022094263740..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/EntityRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/Error.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/Error.java
deleted file mode 100644
index 9093e7d11169e191c9b0882d5ebd4e81e351dca9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscription.java
deleted file mode 100644
index aa61f7bc446d9b3ba90763ee9113300b215fdd02..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscriptionInput.java
deleted file mode 100644
index 5dd3bc2d42193774bc10663c230b735ce268ffee..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJob.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJob.java
deleted file mode 100644
index ec2887088cdc92703d7d6441b02553717e35e5cc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJob.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to export resources to a file
- */
-@Schema(description = "Represents a task used to export resources to a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ExportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ExportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the export job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the export job")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the export job
-   * @return href
-  **/
-  @Schema(description = "Reference of the export job")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ExportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJob query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJob status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the export job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the export job (not started, running, succeeded, failed)")
-
-  @Valid
-
-  public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ExportJob baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ExportJob schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ExportJob type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJob exportJob = (ExportJob) o;
-    return Objects.equals(this.id, exportJob.id) &&
-        Objects.equals(this.href, exportJob.href) &&
-        Objects.equals(this.completionDate, exportJob.completionDate) &&
-        Objects.equals(this.contentType, exportJob.contentType) &&
-        Objects.equals(this.creationDate, exportJob.creationDate) &&
-        Objects.equals(this.errorLog, exportJob.errorLog) &&
-        Objects.equals(this.path, exportJob.path) &&
-        Objects.equals(this.query, exportJob.query) &&
-        Objects.equals(this.url, exportJob.url) &&
-        Objects.equals(this.status, exportJob.status) &&
-        Objects.equals(this.baseType, exportJob.baseType) &&
-        Objects.equals(this.schemaLocation, exportJob.schemaLocation) &&
-        Objects.equals(this.type, exportJob.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, query, url, status, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJobCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJobCreate.java
deleted file mode 100644
index 3af6f09dc23fd8ab5ce3219ff3229458bf73b1eb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ExportJobCreate.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to export resources to a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to export resources to a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ExportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ExportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJobCreate query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-  @NotNull
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJobCreate status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the export job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the export job (not started, running, succeeded, failed)")
-
-  @Valid
-
-  public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ExportJobCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ExportJobCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ExportJobCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobCreate exportJobCreate = (ExportJobCreate) o;
-    return Objects.equals(this.completionDate, exportJobCreate.completionDate) &&
-        Objects.equals(this.contentType, exportJobCreate.contentType) &&
-        Objects.equals(this.creationDate, exportJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, exportJobCreate.errorLog) &&
-        Objects.equals(this.path, exportJobCreate.path) &&
-        Objects.equals(this.query, exportJobCreate.query) &&
-        Objects.equals(this.url, exportJobCreate.url) &&
-        Objects.equals(this.status, exportJobCreate.status) &&
-        Objects.equals(this.baseType, exportJobCreate.baseType) &&
-        Objects.equals(this.schemaLocation, exportJobCreate.schemaLocation) &&
-        Objects.equals(this.type, exportJobCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, query, url, status, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJob.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJob.java
deleted file mode 100644
index a0193ac4e387134acfa0cff67f8309a0dc64ba32..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJob.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to import resources from a file
- */
-@Schema(description = "Represents a task used to import resources from a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ImportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ImportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the import job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the import job")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ImportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the import job
-   * @return href
-  **/
-  @Schema(description = "Reference of the import job")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ImportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJob status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the import job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the import job (not started, running, succeeded, failed)")
-
-  @Valid
-
-  public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ImportJob baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ImportJob schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ImportJob type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJob importJob = (ImportJob) o;
-    return Objects.equals(this.id, importJob.id) &&
-        Objects.equals(this.href, importJob.href) &&
-        Objects.equals(this.completionDate, importJob.completionDate) &&
-        Objects.equals(this.contentType, importJob.contentType) &&
-        Objects.equals(this.creationDate, importJob.creationDate) &&
-        Objects.equals(this.errorLog, importJob.errorLog) &&
-        Objects.equals(this.path, importJob.path) &&
-        Objects.equals(this.url, importJob.url) &&
-        Objects.equals(this.status, importJob.status) &&
-        Objects.equals(this.baseType, importJob.baseType) &&
-        Objects.equals(this.schemaLocation, importJob.schemaLocation) &&
-        Objects.equals(this.type, importJob.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, url, status, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJobCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJobCreate.java
deleted file mode 100644
index 3ab2dcd6b4c4cf43a478ebe971194d090c2f968f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ImportJobCreate.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to import resources from a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to import resources from a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ImportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ImportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-  @NotNull
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJobCreate status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the import job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the import job (not started, running, succeeded, failed)")
-
-  @Valid
-
-  public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ImportJobCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ImportJobCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ImportJobCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobCreate importJobCreate = (ImportJobCreate) o;
-    return Objects.equals(this.completionDate, importJobCreate.completionDate) &&
-        Objects.equals(this.contentType, importJobCreate.contentType) &&
-        Objects.equals(this.creationDate, importJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, importJobCreate.errorLog) &&
-        Objects.equals(this.path, importJobCreate.path) &&
-        Objects.equals(this.url, importJobCreate.url) &&
-        Objects.equals(this.status, importJobCreate.status) &&
-        Objects.equals(this.baseType, importJobCreate.baseType) &&
-        Objects.equals(this.schemaLocation, importJobCreate.schemaLocation) &&
-        Objects.equals(this.type, importJobCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, url, status, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/JobStateType.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/JobStateType.java
deleted file mode 100644
index 9a6baf8e9cf97eacdf7d1f700c33ca3eafe72dbf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/JobStateType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Valid values for the state of a batch job (e.g. catalog import)
- */
-public enum JobStateType {
-  
-  NOT_STARTED("Not Started"),
-  
-  RUNNING("Running"),
-  
-  SUCCEEDED("Succeeded"),
-  
-  FAILED("Failed");
-
-  private String value;
-
-  JobStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static JobStateType fromValue(String text) {
-    for (JobStateType b : JobStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/MarketSegmentRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/MarketSegmentRef.java
deleted file mode 100644
index 6292dcd4f7c6688f08b3af4394066d240e41bb57..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/MarketSegmentRef.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * provides references to the corresponding market segment as target of product offerings. A market segment is grouping of Parties, GeographicAreas, SalesChannels, and so forth.
- */
-@Schema(description = "provides references to the corresponding market segment as target of product offerings. A market segment is grouping of Parties, GeographicAreas, SalesChannels, and so forth.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@Entity(name = "MarketSegmentRef")
-public class MarketSegmentRef  extends BaseRootNamedEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public MarketSegmentRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the market segment
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the market segment")
-  @NotNull
-
-
-  public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-  }
-
-
-
-  public MarketSegmentRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * (Class) type of the referred market segment
-   * @return referredType
-  **/
-  @Schema(description = "(Class) type of the referred market segment")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MarketSegmentRef marketSegmentRef = (MarketSegmentRef) o;
-    return Objects.equals(this.id, marketSegmentRef.id) &&
-        Objects.equals(this.href, marketSegmentRef.href) &&
-        Objects.equals(this.name, marketSegmentRef.name) &&
-        Objects.equals(this.baseType, marketSegmentRef.baseType) &&
-        Objects.equals(this.schemaLocation, marketSegmentRef.schemaLocation) &&
-        Objects.equals(this.type, marketSegmentRef.type) &&
-        Objects.equals(this.referredType, marketSegmentRef.referredType);
-  }
-//
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MarketSegmentRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/Money.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/Money.java
deleted file mode 100644
index 30abe3ba037fafbab3d9787f66e317b5f0e64b5b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/Money.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-
-/**
- * A base / value business entity used to represent money
- */
-@Schema(description = "A base / value business entity used to represent money")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Embeddable
-public class Money   {
-  @JsonProperty("unit")
-  private String unit = null;
-
-  @JsonProperty("value")
-  private Float value = null;
-
-  public Money unit(String unit) {
-    this.unit = unit;
-    return this;
-  }
-
-  /**
-   * Currency (ISO4217 norm uses 3 letters to define the currency)
-   * @return unit
-  **/
-  @Schema(description = "Currency (ISO4217 norm uses 3 letters to define the currency)")
-
-
-  public String getUnit() {
-    return unit;
-  }
-
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
-
-  public Money value(Float value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * A positive floating point number
-   * @return value
-  **/
-  @Schema(description = "A positive floating point number")
-
-
-  public Float getValue() {
-    return value;
-  }
-
-  public void setValue(Float value) {
-    this.value = value;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Money money = (Money) o;
-    return Objects.equals(this.unit, money.unit) &&
-        Objects.equals(this.value, money.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unit, value);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Money {\n");
-    
-    sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/PlaceRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/PlaceRef.java
deleted file mode 100644
index 2fb0b26b6e88de98d80d27881104747342a0aa89..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/PlaceRef.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Place reference. PlaceRef defines the placeRefs where the products are sold
- * or delivered.
- */
-@Schema(description = "Place reference. PlaceRef defines the placeRefs where the products are sold or delivered.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@Entity(name = "PlaceRef")
-public class PlaceRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	public PlaceRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of a related entity.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of a related entity.")
-	@NotNull
-
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public PlaceRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		PlaceRef placeRef = (PlaceRef) o;
-		return Objects.equals(this.id, placeRef.id) && Objects.equals(this.href, placeRef.href)
-				&& Objects.equals(this.name, placeRef.name) && Objects.equals(this.baseType, placeRef.baseType)
-				&& Objects.equals(this.schemaLocation, placeRef.schemaLocation)
-				&& Objects.equals(this.type, placeRef.type) && Objects.equals(this.referredType, placeRef.referredType);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class PlaceRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/PricingLogicAlgorithm.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/PricingLogicAlgorithm.java
deleted file mode 100644
index a86423974300767ffed7085f689b0c1719456adb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/PricingLogicAlgorithm.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * The PricingLogicAlgorithm entity represents an instantiation of an interface specification to external rating function (without a modeled bahavior in SID). Some of the parameters of the interface definiition may be already set (such as price per unit) and some may be gathered during the rating process from the event (such as call duration) or from ProductCharacteristicValues (such as assigned bandwidth)
- */
-@Schema(description = "The PricingLogicAlgorithm entity represents an instantiation of an interface specification to external rating function (without a modeled bahavior in SID). Some of the parameters of the interface definiition may be already set (such as price per unit) and some may be gathered during the rating process from the event (such as call duration) or from ProductCharacteristicValues (such as assigned bandwidth)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-
-@Entity
-public class PricingLogicAlgorithm  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("plaSpecId")
-  private String plaSpecId = null;
-
-
-
-  public PricingLogicAlgorithm id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * unique id of the PricingLogicAlgorithm
-   * @return id
-  **/
-  @Schema(description = "unique id of the PricingLogicAlgorithm")
-
-
-  public String getId() {
-		if ( uuid != null ) {
-			id = uuid;			
-		} 
-		return id;
-  }
-
-
-  public PricingLogicAlgorithm plaSpecId(String plaSpecId) {
-    this.plaSpecId = plaSpecId;
-    return this;
-  }
-
-  /**
-   * id of corresponding PricingLogicAlgorithm specification
-   * @return plaSpecId
-  **/
-  @Schema(description = "id of corresponding PricingLogicAlgorithm specification")
-
-
-  public String getPlaSpecId() {
-    return plaSpecId;
-  }
-
-  public void setPlaSpecId(String plaSpecId) {
-    this.plaSpecId = plaSpecId;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PricingLogicAlgorithm pricingLogicAlgorithm = (PricingLogicAlgorithm) o;
-    return Objects.equals(this.id, pricingLogicAlgorithm.id) &&
-        Objects.equals(this.href, pricingLogicAlgorithm.href) &&
-        Objects.equals(this.description, pricingLogicAlgorithm.description) &&
-        Objects.equals(this.name, pricingLogicAlgorithm.name) &&
-        Objects.equals(this.plaSpecId, pricingLogicAlgorithm.plaSpecId) &&
-        Objects.equals(this.validFor, pricingLogicAlgorithm.validFor) &&
-        Objects.equals(this.baseType, pricingLogicAlgorithm.baseType) &&
-        Objects.equals(this.schemaLocation, pricingLogicAlgorithm.schemaLocation) &&
-        Objects.equals(this.type, pricingLogicAlgorithm.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, name, plaSpecId, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PricingLogicAlgorithm {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    plaSpecId: ").append(toIndentedString(plaSpecId)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOffering.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOffering.java
deleted file mode 100644
index 1efa62fc6e8035777bc63d69cdf43c779505608e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOffering.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Represents entities that are orderable from the provider of the catalog, this
- * resource includes pricing information.
- */
-@Schema(description = "Represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductOffering")
-@Table(name = "ProductOffering")
-public class ProductOffering extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("isSellable")
-	private Boolean isSellable = null;
-
-	@JsonProperty("statusReason")
-	private String statusReason = null;
-
-	@JsonProperty("agreement")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AgreementRef> agreement =  new HashSet<>();
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AttachmentRefOrValue> attachment = new HashSet<>();
-
-	@JsonProperty("bundledProductOffering")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<BundledProductOffering> bundledProductOffering = new HashSet<>();
-
-	@JsonProperty("category")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CategoryRef> category = new HashSet<>();
-
-	@JsonProperty("channel")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ChannelRef> channel = new HashSet<>();
-
-	@JsonProperty("marketSegment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<MarketSegmentRef> marketSegment = new HashSet<>();
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PlaceRef> place = new HashSet<>();
-
-	@JsonProperty("prodSpecCharValueUse")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse = new HashSet<>();
-
-	@JsonProperty("productOfferingPrice")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductOfferingPriceRef> productOfferingPrice = new HashSet<>();
-
-	@JsonProperty("productOfferingTerm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductOfferingTerm> productOfferingTerm = new HashSet<>();
-
-	@JsonProperty("productSpecification")
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(referencedColumnName = "uuid")
-	private ProductSpecificationRef productSpecification = null;
-
-	@JsonProperty("resourceCandidate")
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(referencedColumnName = "uuid")
-	private ResourceCandidateRef resourceCandidate = null;
-
-	@JsonProperty("serviceCandidate")
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(referencedColumnName = "uuid")
-	private ServiceCandidateRef serviceCandidate = null;
-
-	@JsonProperty("serviceLevelAgreement")
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(referencedColumnName = "uuid")
-	private SLARef serviceLevelAgreement = null;
-
-	public ProductOffering id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the productOffering
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the productOffering")
-
-	public String getId() {
-		if ( uuid != null ) {
-			id = uuid;			
-		} 
-		return id;
-	}
-
-
-	
-
-	public ProductOffering isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether a productOffering represents a single
-	 * productOffering (false), or a bundle of productOfferings (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether a productOffering represents a single productOffering (false), or a bundle of productOfferings (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ProductOffering isSellable(Boolean isSellable) {
-		this.isSellable = isSellable;
-		return this;
-	}
-
-	/**
-	 * A flag indicating if this product offer can be sold stand-alone for sale or
-	 * not. If this flag is false it indicates that the offer can only be sold
-	 * within a bundle.
-	 * 
-	 * @return isSellable
-	 **/
-	@Schema(description = "A flag indicating if this product offer can be sold stand-alone for sale or not. If this flag is false it indicates that the offer can only be sold within a bundle.")
-
-	public Boolean isIsSellable() {
-		return isSellable;
-	}
-
-	public void setIsSellable(Boolean isSellable) {
-		this.isSellable = isSellable;
-	}
-
-
-
-
-
-	/**
-	 * A string providing a complementary information on the value of the lifecycle
-	 * status attribute.
-	 * 
-	 * @return statusReason
-	 **/
-	@Schema(description = "A string providing a complementary information on the value of the lifecycle status attribute.")
-
-	public String getStatusReason() {
-		return statusReason;
-	}
-
-	public void setStatusReason(String statusReason) {
-		this.statusReason = statusReason;
-	}
-
-	
-
-	public ProductOffering agreement(Set<AgreementRef> agreement) {
-		this.agreement = agreement;
-		return this;
-	}
-
-	public ProductOffering addAgreementItem(AgreementRef agreementItem) {
-		if (this.agreement == null) {
-			this.agreement = new HashSet<>();
-		}
-		this.agreement.add(agreementItem);
-		return this;
-	}
-
-	/**
-	 * An agreement represents a contract or arrangement, either written or verbal
-	 * and sometimes enforceable by law, such as a service level agreement or a
-	 * customer price agreement. An agreement involves a number of other business
-	 * entities, such as products, services, and resources and/or their
-	 * specifications.
-	 * 
-	 * @return agreement
-	 **/
-	@Schema(description = "An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-
-	@Valid
-
-	public Set<AgreementRef> getAgreement() {
-		return agreement;
-	}
-
-	public void setAgreement(Set<AgreementRef> agreement) {
-		this.agreement = agreement;
-	}
-
-	public ProductOffering attachment( Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ProductOffering addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Complements the description of an element (for instance a product) through
-	 * video, pictures...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Complements the description of an element (for instance a product) through video, pictures...")
-
-	@Valid
-
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ProductOffering bundledProductOffering(Set<BundledProductOffering> bundledProductOffering) {
-		this.bundledProductOffering = bundledProductOffering;
-		return this;
-	}
-
-	public ProductOffering addBundledProductOfferingItem(BundledProductOffering bundledProductOfferingItem) {
-		if (this.bundledProductOffering == null) {
-			this.bundledProductOffering = new HashSet<>();
-		}
-		this.bundledProductOffering.add(bundledProductOfferingItem);
-		return this;
-	}
-
-	/**
-	 * A type of ProductOffering that belongs to a grouping of ProductOfferings made
-	 * available to the market. It inherits of all attributes of ProductOffering.
-	 * 
-	 * @return bundledProductOffering
-	 **/
-	@Schema(description = "A type of ProductOffering that belongs to a grouping of ProductOfferings made available to the market. It inherits of all attributes of ProductOffering.")
-
-	@Valid
-
-	public Set<BundledProductOffering> getBundledProductOffering() {
-		return bundledProductOffering;
-	}
-
-	public void setBundledProductOffering(Set<BundledProductOffering> bundledProductOffering) {
-		this.bundledProductOffering = bundledProductOffering;
-	}
-
-	public ProductOffering category(Set<CategoryRef> category) {
-		this.category = category;
-		return this;
-	}
-
-	public ProductOffering addCategoryItem(CategoryRef categoryItem) {
-		if (this.category == null) {
-			this.category = new HashSet<>();
-		}
-		this.category.add(categoryItem);
-		return this;
-	}
-
-	/**
-	 * The category resource is used to group product offerings, service and
-	 * resource candidates in logical containers. Categories can contain other
-	 * categories and/or product offerings, resource or service candidates.
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.")
-
-	@Valid
-
-	public Set<CategoryRef> getCategory() {
-		return category;
-	}
-
-	public void setCategory(Set<CategoryRef> category) {
-		this.category = category;
-	}
-
-	public ProductOffering channel(Set<ChannelRef> channel) {
-		this.channel = channel;
-		return this;
-	}
-
-	public ProductOffering addChannelItem(ChannelRef channelItem) {
-		if (this.channel == null) {
-			this.channel = new HashSet<>();
-		}
-		this.channel.add(channelItem);
-		return this;
-	}
-
-	/**
-	 * The channel defines the channel for selling product offerings.
-	 * 
-	 * @return channel
-	 **/
-	@Schema(description = "The channel defines the channel for selling product offerings.")
-
-	@Valid
-
-	public Set<ChannelRef> getChannel() {
-		return channel;
-	}
-
-	public void setChannel(Set<ChannelRef> channel) {
-		this.channel = channel;
-	}
-
-	public ProductOffering marketSegment(Set<MarketSegmentRef> marketSegment) {
-		this.marketSegment = marketSegment;
-		return this;
-	}
-
-	public ProductOffering addMarketSegmentItem(MarketSegmentRef marketSegmentItem) {
-		if (this.marketSegment == null) {
-			this.marketSegment = new HashSet<>();
-		}
-		this.marketSegment.add(marketSegmentItem);
-		return this;
-	}
-
-	/**
-	 * provides references to the corresponding market segment as target of product
-	 * offerings. A market segment is grouping of Parties, GeographicAreas,
-	 * SalesChannels, and so forth.
-	 * 
-	 * @return marketSegment
-	 **/
-	@Schema(description = "provides references to the corresponding market segment as target of product offerings. A market segment is grouping of Parties, GeographicAreas, SalesChannels, and so forth.")
-
-	@Valid
-
-	public Set<MarketSegmentRef> getMarketSegment() {
-		return marketSegment;
-	}
-
-	public void setMarketSegment(Set<MarketSegmentRef> marketSegment) {
-		this.marketSegment = marketSegment;
-	}
-
-	public ProductOffering place(Set<PlaceRef> place) {
-		this.place = place;
-		return this;
-	}
-
-	public ProductOffering addPlaceItem(PlaceRef placeItem) {
-		if (this.place == null) {
-			this.place = new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * Place defines the places where the products are sold or delivered.
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "Place defines the places where the products are sold or delivered.")
-
-	@Valid
-
-	public Set<PlaceRef> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<PlaceRef> place) {
-		this.place = place;
-	}
-
-	public ProductOffering prodSpecCharValueUse( Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-		this.prodSpecCharValueUse = prodSpecCharValueUse;
-		return this;
-	}
-
-	public ProductOffering addProdSpecCharValueUseItem(
-			ProductSpecificationCharacteristicValueUse prodSpecCharValueUseItem) {
-		if (this.prodSpecCharValueUse == null) {
-			this.prodSpecCharValueUse = new HashSet<>();
-		}
-		this.prodSpecCharValueUse.add(prodSpecCharValueUseItem);
-		return this;
-	}
-
-	/**
-	 * A use of the ProductSpecificationCharacteristicValue by a ProductOffering to
-	 * which additional properties (attributes) apply or override the properties of
-	 * similar properties contained in ProductSpecificationCharacteristicValue. It
-	 * should be noted that characteristics which their value(s) addressed by this
-	 * object must exist in corresponding product specification. The available
-	 * characteristic values for a ProductSpecificationCharacteristic in a Product
-	 * specification can be modified at the ProductOffering level. For example, a
-	 * characteristic 'Color' might have values White, Blue, Green, and Red. But,
-	 * the list of values can be restricted to e.g. White and Blue in an associated
-	 * product offering. It should be noted that the list of values in
-	 * 'ProductSpecificationCharacteristicValueUse' is a strict subset of the list
-	 * of values as defined in the corresponding product specification
-	 * characteristics.
-	 * 
-	 * @return prodSpecCharValueUse
-	 **/
-	@Schema(description = "A use of the ProductSpecificationCharacteristicValue by a ProductOffering to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering level. For example, a characteristic 'Color' might have values White, Blue, Green, and Red. But, the list of values can be restricted to e.g. White and Blue in an associated product offering. It should be noted that the list of values in 'ProductSpecificationCharacteristicValueUse' is a strict subset of the list of values as defined in the corresponding product specification characteristics.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristicValueUse> getProdSpecCharValueUse() {
-		return prodSpecCharValueUse;
-	}
-
-	public void setProdSpecCharValueUse(Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-		this.prodSpecCharValueUse = prodSpecCharValueUse;
-	}
-
-	public ProductOffering productOfferingPrice(Set<ProductOfferingPriceRef> productOfferingPrice) {
-		this.productOfferingPrice = productOfferingPrice;
-		return this;
-	}
-
-	public ProductOffering addProductOfferingPriceItem(ProductOfferingPriceRef productOfferingPriceItem) {
-		if (this.productOfferingPrice == null) {
-			this.productOfferingPrice = new HashSet<>();
-		}
-		this.productOfferingPrice.add(productOfferingPriceItem);
-		return this;
-	}
-
-	/**
-	 * An amount, usually of money, that is asked for or allowed when a
-	 * ProductOffering is bought, rented, or leased. The price is valid for a
-	 * defined period of time and may not represent the actual price paid by a
-	 * customer.
-	 * 
-	 * @return productOfferingPrice
-	 **/
-	@Schema(description = "An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased. The price is valid for a defined period of time and may not represent the actual price paid by a customer.")
-
-	@Valid
-
-	public Set<ProductOfferingPriceRef> getProductOfferingPrice() {
-		return productOfferingPrice;
-	}
-
-	public void setProductOfferingPrice(Set<ProductOfferingPriceRef> productOfferingPrice) {
-		this.productOfferingPrice = productOfferingPrice;
-	}
-
-	public ProductOffering productOfferingTerm(Set<ProductOfferingTerm> productOfferingTerm) {
-		this.productOfferingTerm = productOfferingTerm;
-		return this;
-	}
-
-	public ProductOffering addProductOfferingTermItem(ProductOfferingTerm productOfferingTermItem) {
-		if (this.productOfferingTerm == null) {
-			this.productOfferingTerm = new HashSet<>();
-		}
-		this.productOfferingTerm.add(productOfferingTermItem);
-		return this;
-	}
-
-	/**
-	 * A condition under which a ProductOffering is made available to Customers. For
-	 * instance, a productOffering can be offered with multiple commitment periods.
-	 * 
-	 * @return productOfferingTerm
-	 **/
-	@Schema(description = "A condition under which a ProductOffering is made available to Customers. For instance, a productOffering can be offered with multiple commitment periods.")
-
-	@Valid
-
-	public Set<ProductOfferingTerm> getProductOfferingTerm() {
-		return productOfferingTerm;
-	}
-
-	public void setProductOfferingTerm(Set<ProductOfferingTerm> productOfferingTerm) {
-		this.productOfferingTerm = productOfferingTerm;
-	}
-
-	public ProductOffering productSpecification(ProductSpecificationRef productSpecification) {
-		this.productSpecification = productSpecification;
-		return this;
-	}
-
-	/**
-	 * A ProductSpecification is a detailed description of a tangible or intangible
-	 * object made available externally in the form of a ProductOffering to
-	 * customers or other parties playing a party role.
-	 * 
-	 * @return productSpecification
-	 **/
-	@Schema(description = "A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-
-	@Valid
-
-	public ProductSpecificationRef getProductSpecification() {
-		return productSpecification;
-	}
-
-	public void setProductSpecification(ProductSpecificationRef productSpecification) {
-		this.productSpecification = productSpecification;
-	}
-
-	public ProductOffering resourceCandidate(ResourceCandidateRef resourceCandidate) {
-		this.resourceCandidate = resourceCandidate;
-		return this;
-	}
-
-	/**
-	 * A resource candidate is an entity that makes a ResourceSpecification
-	 * available to a catalog.
-	 * 
-	 * @return resourceCandidate
-	 **/
-	@Schema(description = "A resource candidate is an entity that makes a ResourceSpecification available to a catalog.")
-
-	@Valid
-
-	public ResourceCandidateRef getResourceCandidate() {
-		return resourceCandidate;
-	}
-
-	public void setResourceCandidate(ResourceCandidateRef resourceCandidate) {
-		this.resourceCandidate = resourceCandidate;
-	}
-
-	public ProductOffering serviceCandidate(ServiceCandidateRef serviceCandidate) {
-		this.serviceCandidate = serviceCandidate;
-		return this;
-	}
-
-	/**
-	 * ServiceCandidate is an entity that makes a ServiceSpecification available to
-	 * a catalog.
-	 * 
-	 * @return serviceCandidate
-	 **/
-	@Schema(description = "ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.")
-
-	@Valid
-
-	public ServiceCandidateRef getServiceCandidate() {
-		return serviceCandidate;
-	}
-
-	public void setServiceCandidate(ServiceCandidateRef serviceCandidate) {
-		this.serviceCandidate = serviceCandidate;
-	}
-
-	public ProductOffering serviceLevelAgreement(SLARef serviceLevelAgreement) {
-		this.serviceLevelAgreement = serviceLevelAgreement;
-		return this;
-	}
-
-	/**
-	 * A service level agreement (SLA) is a type of agreement that represents a
-	 * formal negotiated agreement between two parties designed to create a common
-	 * understanding about products, services, priorities, responsibilities, and so
-	 * forth. The SLA is a set of appropriate procedures and targets formally or
-	 * informally agreed between parties in order to achieve and maintain specified
-	 * Quality of Service.
-	 * 
-	 * @return serviceLevelAgreement
-	 **/
-	@Schema(description = "A service level agreement (SLA) is a type of agreement that represents a formal negotiated agreement between two parties designed to create a common understanding about products, services, priorities, responsibilities, and so forth. The SLA is a set of appropriate procedures and targets formally or informally agreed between parties in order to achieve and maintain specified Quality of Service.")
-
-	@Valid
-
-	public SLARef getServiceLevelAgreement() {
-		return serviceLevelAgreement;
-	}
-
-	public void setServiceLevelAgreement(SLARef serviceLevelAgreement) {
-		this.serviceLevelAgreement = serviceLevelAgreement;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductOffering productOffering = (ProductOffering) o;
-		return Objects.equals(this.id, productOffering.id) && Objects.equals(this.href, productOffering.href)
-				&& Objects.equals(this.description, productOffering.description)
-				&& Objects.equals(this.isBundle, productOffering.isBundle)
-				&& Objects.equals(this.isSellable, productOffering.isSellable)
-				&& Objects.equals(this.lastUpdate, productOffering.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, productOffering.lifecycleStatus)
-				&& Objects.equals(this.name, productOffering.name)
-				&& Objects.equals(this.statusReason, productOffering.statusReason)
-				&& Objects.equals(this.version, productOffering.version)
-				&& Objects.equals(this.agreement, productOffering.agreement)
-				&& Objects.equals(this.attachment, productOffering.attachment)
-				&& Objects.equals(this.bundledProductOffering, productOffering.bundledProductOffering)
-				&& Objects.equals(this.category, productOffering.category)
-				&& Objects.equals(this.channel, productOffering.channel)
-				&& Objects.equals(this.marketSegment, productOffering.marketSegment)
-				&& Objects.equals(this.place, productOffering.place)
-				&& Objects.equals(this.prodSpecCharValueUse, productOffering.prodSpecCharValueUse)
-				&& Objects.equals(this.productOfferingPrice, productOffering.productOfferingPrice)
-				&& Objects.equals(this.productOfferingTerm, productOffering.productOfferingTerm)
-				&& Objects.equals(this.productSpecification, productOffering.productSpecification)
-				&& Objects.equals(this.resourceCandidate, productOffering.resourceCandidate)
-				&& Objects.equals(this.serviceCandidate, productOffering.serviceCandidate)
-				&& Objects.equals(this.serviceLevelAgreement, productOffering.serviceLevelAgreement)
-				&& Objects.equals(this.validFor, productOffering.validFor)
-				&& Objects.equals(this.baseType, productOffering.baseType)
-				&& Objects.equals(this.schemaLocation, productOffering.schemaLocation)
-				&& Objects.equals(this.type, productOffering.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, isBundle, isSellable, lastUpdate, lifecycleStatus, name, statusReason, version, agreement, attachment, bundledProductOffering, category, channel, marketSegment, place, prodSpecCharValueUse, productOfferingPrice, productOfferingTerm, productSpecification, resourceCandidate, serviceCandidate, serviceLevelAgreement, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductOffering {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    isSellable: ").append(toIndentedString(isSellable)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    bundledProductOffering: ").append(toIndentedString(bundledProductOffering)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-		sb.append("    marketSegment: ").append(toIndentedString(marketSegment)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-		sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-		sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-		sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-		sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-		sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-		sb.append("    serviceLevelAgreement: ").append(toIndentedString(serviceLevelAgreement)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEvent.java
deleted file mode 100644
index cbd8f595ae45745f6a0cc561dfaad5243792373b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ProductOfferingAttributeValueChangeEventPayload event = null;
-
-  public ProductOfferingAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ProductOfferingAttributeValueChangeEvent event(ProductOfferingAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingAttributeValueChangeEvent productOfferingAttributeValueChangeEvent = (ProductOfferingAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, productOfferingAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, productOfferingAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, productOfferingAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, productOfferingAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, productOfferingAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, productOfferingAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEventPayload.java
deleted file mode 100644
index 943b6be80f8c101dd37e225bd48f481172971b53..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingAttributeValueChangeEventPayload   {
-  @JsonProperty("productOffering")
-  private ProductOffering productOffering = null;
-
-  public ProductOfferingAttributeValueChangeEventPayload productOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOffering
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOffering getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingAttributeValueChangeEventPayload productOfferingAttributeValueChangeEventPayload = (ProductOfferingAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.productOffering, productOfferingAttributeValueChangeEventPayload.productOffering);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOffering);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreate.java
deleted file mode 100644
index 1e1061af73b36e853af305aee7595a96c61bb117..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreate.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents entities that are orderable from the provider of the catalog, this resource includes pricing information. Skipped properties: id,href
- */
-@Schema(description = "Represents entities that are orderable from the provider of the catalog, this resource includes pricing information. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingCreate extends ProductOfferingUpdate  {
-  
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingCreate productOfferingCreate = (ProductOfferingCreate) o;
-    return Objects.equals(this.description, productOfferingCreate.description) &&
-        Objects.equals(this.isBundle, productOfferingCreate.isBundle) &&
-        Objects.equals(this.isSellable, productOfferingCreate.isSellable) &&
-        Objects.equals(this.lastUpdate, productOfferingCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, productOfferingCreate.lifecycleStatus) &&
-        Objects.equals(this.name, productOfferingCreate.name) &&
-        Objects.equals(this.statusReason, productOfferingCreate.statusReason) &&
-        Objects.equals(this.version, productOfferingCreate.version) &&
-        Objects.equals(this.agreement, productOfferingCreate.agreement) &&
-        Objects.equals(this.attachment, productOfferingCreate.attachment) &&
-        Objects.equals(this.bundledProductOffering, productOfferingCreate.bundledProductOffering) &&
-        Objects.equals(this.category, productOfferingCreate.category) &&
-        Objects.equals(this.channel, productOfferingCreate.channel) &&
-        Objects.equals(this.marketSegment, productOfferingCreate.marketSegment) &&
-        Objects.equals(this.place, productOfferingCreate.place) &&
-        Objects.equals(this.prodSpecCharValueUse, productOfferingCreate.prodSpecCharValueUse) &&
-        Objects.equals(this.productOfferingPrice, productOfferingCreate.productOfferingPrice) &&
-        Objects.equals(this.productOfferingTerm, productOfferingCreate.productOfferingTerm) &&
-        Objects.equals(this.productSpecification, productOfferingCreate.productSpecification) &&
-        Objects.equals(this.resourceCandidate, productOfferingCreate.resourceCandidate) &&
-        Objects.equals(this.serviceCandidate, productOfferingCreate.serviceCandidate) &&
-        Objects.equals(this.serviceLevelAgreement, productOfferingCreate.serviceLevelAgreement) &&
-        Objects.equals(this.validFor, productOfferingCreate.validFor) &&
-        Objects.equals(this.baseType, productOfferingCreate.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingCreate.schemaLocation) &&
-        Objects.equals(this.type, productOfferingCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, isBundle, isSellable, lastUpdate, lifecycleStatus, name, statusReason, version, agreement, attachment, bundledProductOffering, category, channel, marketSegment, place, prodSpecCharValueUse, productOfferingPrice, productOfferingTerm, productSpecification, resourceCandidate, serviceCandidate, serviceLevelAgreement, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    isSellable: ").append(toIndentedString(isSellable)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    bundledProductOffering: ").append(toIndentedString(bundledProductOffering)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-    sb.append("    marketSegment: ").append(toIndentedString(marketSegment)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("    serviceLevelAgreement: ").append(toIndentedString(serviceLevelAgreement)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEvent.java
deleted file mode 100644
index fdfacd40adc72b0bcdc198950d53ac3453d96a92..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingCreateEventPayload event = null;
-
-  public ProductOfferingCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingCreateEvent event(ProductOfferingCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingCreateEvent productOfferingCreateEvent = (ProductOfferingCreateEvent) o;
-    return Objects.equals(this.id, productOfferingCreateEvent.id) &&
-        Objects.equals(this.href, productOfferingCreateEvent.href) &&
-        Objects.equals(this.eventId, productOfferingCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingCreateEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingCreateEvent.domain) &&
-        Objects.equals(this.title, productOfferingCreateEvent.title) &&
-        Objects.equals(this.description, productOfferingCreateEvent.description) &&
-        Objects.equals(this.priority, productOfferingCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEventPayload.java
deleted file mode 100644
index 6adc38717f1ede7a52faac4adb80dd5e9594599d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingCreateEventPayload   {
-  @JsonProperty("productOffering")
-  private ProductOffering productOffering = null;
-
-  public ProductOfferingCreateEventPayload productOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOffering
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOffering getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingCreateEventPayload productOfferingCreateEventPayload = (ProductOfferingCreateEventPayload) o;
-    return Objects.equals(this.productOffering, productOfferingCreateEventPayload.productOffering);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOffering);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingCreateEventPayload {\n");
-    
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEvent.java
deleted file mode 100644
index 3dfd02c6edc1861437f8525940a879626044b6bc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingDeleteEventPayload event = null;
-
-  public ProductOfferingDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingDeleteEvent event(ProductOfferingDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingDeleteEvent productOfferingDeleteEvent = (ProductOfferingDeleteEvent) o;
-    return Objects.equals(this.id, productOfferingDeleteEvent.id) &&
-        Objects.equals(this.href, productOfferingDeleteEvent.href) &&
-        Objects.equals(this.eventId, productOfferingDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingDeleteEvent.domain) &&
-        Objects.equals(this.title, productOfferingDeleteEvent.title) &&
-        Objects.equals(this.description, productOfferingDeleteEvent.description) &&
-        Objects.equals(this.priority, productOfferingDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEventPayload.java
deleted file mode 100644
index 932b8ea0b9710236e5264426da3a2d224c352365..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingDeleteEventPayload   {
-  @JsonProperty("productOffering")
-  private ProductOffering productOffering = null;
-
-  public ProductOfferingDeleteEventPayload productOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOffering
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOffering getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingDeleteEventPayload productOfferingDeleteEventPayload = (ProductOfferingDeleteEventPayload) o;
-    return Objects.equals(this.productOffering, productOfferingDeleteEventPayload.productOffering);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOffering);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingDeleteEventPayload {\n");
-    
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPrice.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPrice.java
deleted file mode 100644
index 1c654931c105b4c22dd4db95aadf1801e14a4c23..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPrice.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.Quantity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Is based on both the basic cost to develop and produce products and the
- * enterprises policy on revenue targets. This price may be further revised
- * through discounting (productOfferPriceAlteration). The price, applied for a
- * productOffering may also be influenced by the productOfferingTerm, the
- * customer selected, eg: a productOffering can be offered with multiple terms,
- * like commitment periods for the contract. The price may be influenced by this
- * productOfferingTerm. A productOffering may be cheaper with a 24 month
- * commitment than with a 12 month commitment.
- */
-@Schema(description = "Is based on both the basic cost to develop and produce products and the enterprises policy on revenue targets. This price may be further revised through discounting (productOfferPriceAlteration). The price, applied for a productOffering may also be influenced by the productOfferingTerm, the customer selected, eg: a productOffering can be offered with multiple terms, like commitment periods for the contract. The price may be influenced by this productOfferingTerm. A productOffering may be cheaper with a 24 month commitment than with a 12 month commitment.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductOfferingPrice")
-@Table(name = "ProductOfferingPrice")
-public class ProductOfferingPrice extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("percentage")
-	private Float percentage = null;
-
-	@JsonProperty("priceType")
-	private String priceType = null;
-
-	@JsonProperty("recurringChargePeriodLength")
-	private Integer recurringChargePeriodLength = null;
-
-	@JsonProperty("recurringChargePeriodType")
-	private String recurringChargePeriodType = null;
-
-	@JsonProperty("bundledPopRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<BundledProductOfferingPriceRelationship> bundledPopRelationship = new HashSet<>();
-
-	@JsonProperty("constraint")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConstraintRef> constraint = new HashSet<>();
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PlaceRef> place = new HashSet<>();
-
-	@JsonProperty("popRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductOfferingPriceRelationship> popRelationship = new HashSet<>();
-
-	@JsonProperty("price")
-	private Money price = null;
-
-	@JsonProperty("pricingLogicAlgorithm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PricingLogicAlgorithm> pricingLogicAlgorithm = new HashSet<>();
-
-	@JsonProperty("prodSpecCharValueUse")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse = new HashSet<>();
-
-	@JsonProperty("productOfferingTerm")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductOfferingTerm> productOfferingTerm = new HashSet<>();
-
-	@JsonProperty("tax")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TaxItem> tax = new HashSet<>();
-
-	@JsonProperty("unitOfMeasure")
-	private Quantity unitOfMeasure = null;
-
-	public ProductOfferingPrice id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique id of this resource
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique id of this resource")
-
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public ProductOfferingPrice href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	public ProductOfferingPrice isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * A flag indicating if this ProductOfferingPrice is composite (bundle) or not
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "A flag indicating if this ProductOfferingPrice is composite (bundle) or not")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ProductOfferingPrice percentage(Float percentage) {
-		this.percentage = percentage;
-		return this;
-	}
-
-	/**
-	 * Percentage to apply for ProductOfferPriceAlteration (Discount)
-	 * 
-	 * @return percentage
-	 **/
-	@Schema(description = "Percentage to apply for ProductOfferPriceAlteration (Discount)")
-
-	public Float getPercentage() {
-		return percentage;
-	}
-
-	public void setPercentage(Float percentage) {
-		this.percentage = percentage;
-	}
-
-	public ProductOfferingPrice priceType(String priceType) {
-		this.priceType = priceType;
-		return this;
-	}
-
-	/**
-	 * A category that describes the price, such as recurring, discount, allowance,
-	 * penalty, and so forth.
-	 * 
-	 * @return priceType
-	 **/
-	@Schema(description = "A category that describes the price, such as recurring, discount, allowance, penalty, and so forth.")
-
-	public String getPriceType() {
-		return priceType;
-	}
-
-	public void setPriceType(String priceType) {
-		this.priceType = priceType;
-	}
-
-	public ProductOfferingPrice recurringChargePeriodLength(Integer recurringChargePeriodLength) {
-		this.recurringChargePeriodLength = recurringChargePeriodLength;
-		return this;
-	}
-
-	/**
-	 * the period of the recurring charge: 1, 2, ... .It sets to zero if it is not
-	 * applicable
-	 * 
-	 * @return recurringChargePeriodLength
-	 **/
-	@Schema(description = "the period of the recurring charge:  1, 2, ... .It sets to zero if it is not applicable")
-
-	public Integer getRecurringChargePeriodLength() {
-		return recurringChargePeriodLength;
-	}
-
-	public void setRecurringChargePeriodLength(Integer recurringChargePeriodLength) {
-		this.recurringChargePeriodLength = recurringChargePeriodLength;
-	}
-
-	public ProductOfferingPrice recurringChargePeriodType(String recurringChargePeriodType) {
-		this.recurringChargePeriodType = recurringChargePeriodType;
-		return this;
-	}
-
-	/**
-	 * The period to repeat the application of the price Could be month, week...
-	 * 
-	 * @return recurringChargePeriodType
-	 **/
-	@Schema(description = "The period to repeat the application of the price Could be month, week...")
-
-	public String getRecurringChargePeriodType() {
-		return recurringChargePeriodType;
-	}
-
-	public void setRecurringChargePeriodType(String recurringChargePeriodType) {
-		this.recurringChargePeriodType = recurringChargePeriodType;
-	}
-
-	public ProductOfferingPrice bundledPopRelationship(
-			Set<BundledProductOfferingPriceRelationship> bundledPopRelationship) {
-		this.bundledPopRelationship = bundledPopRelationship;
-		return this;
-	}
-
-	public ProductOfferingPrice addBundledPopRelationshipItem(
-			BundledProductOfferingPriceRelationship bundledPopRelationshipItem) {
-		if (this.bundledPopRelationship == null) {
-			this.bundledPopRelationship = new HashSet<>();
-		}
-		this.bundledPopRelationship.add(bundledPopRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * this object represents a bundle relationship from a bundle product offering
-	 * price (parent) to a simple product offering price (child). A simple product
-	 * offering price may participate in more than one bundle relationship.
-	 * 
-	 * @return bundledPopRelationship
-	 **/
-	@Schema(description = "this object represents a bundle relationship from a bundle product offering price (parent) to a simple product offering price (child). A simple product offering price may participate in more than one bundle relationship.")
-
-	@Valid
-
-	public Set<BundledProductOfferingPriceRelationship> getBundledPopRelationship() {
-		return bundledPopRelationship;
-	}
-
-	public void setBundledPopRelationship(Set<BundledProductOfferingPriceRelationship> bundledPopRelationship) {
-		this.bundledPopRelationship = bundledPopRelationship;
-	}
-
-	public ProductOfferingPrice constraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public ProductOfferingPrice addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new HashSet<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * The Constraint resource represents a policy/rule applied to
-	 * ProductOfferingPrice.
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "The Constraint resource represents a policy/rule applied to ProductOfferingPrice.")
-
-	@Valid
-
-	public Set<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public ProductOfferingPrice place(Set<PlaceRef> place) {
-		this.place = place;
-		return this;
-	}
-
-	public ProductOfferingPrice addPlaceItem(PlaceRef placeItem) {
-		if (this.place == null) {
-			this.place = new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * Place defines the places where the products are sold or delivered.
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "Place defines the places where the products are sold or delivered.")
-
-	@Valid
-
-	public Set<PlaceRef> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<PlaceRef> place) {
-		this.place = place;
-	}
-
-	public ProductOfferingPrice popRelationship(Set<ProductOfferingPriceRelationship> popRelationship) {
-		this.popRelationship = popRelationship;
-		return this;
-	}
-
-	public ProductOfferingPrice addPopRelationshipItem(ProductOfferingPriceRelationship popRelationshipItem) {
-		if (this.popRelationship == null) {
-			this.popRelationship = new HashSet<>();
-		}
-		this.popRelationship.add(popRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Product Offering Prices related to this Product Offering Price, for example a
-	 * price alteration such as allowance or discount
-	 * 
-	 * @return popRelationship
-	 **/
-	@Schema(description = "Product Offering Prices related to this Product Offering Price, for example a price alteration such as allowance or discount")
-
-	@Valid
-
-	public Set<ProductOfferingPriceRelationship> getPopRelationship() {
-		return popRelationship;
-	}
-
-	public void setPopRelationship(Set<ProductOfferingPriceRelationship> popRelationship) {
-		this.popRelationship = popRelationship;
-	}
-
-	public ProductOfferingPrice price(Money price) {
-		this.price = price;
-		return this;
-	}
-
-	/**
-	 * The amount of money that characterizes the price.
-	 * 
-	 * @return price
-	 **/
-	@Schema(description = "The amount of money that characterizes the price.")
-
-	@Valid
-
-	public Money getPrice() {
-		return price;
-	}
-
-	public void setPrice(Money price) {
-		this.price = price;
-	}
-
-	public ProductOfferingPrice pricingLogicAlgorithm(Set<PricingLogicAlgorithm> pricingLogicAlgorithm) {
-		this.pricingLogicAlgorithm = pricingLogicAlgorithm;
-		return this;
-	}
-
-	public ProductOfferingPrice addPricingLogicAlgorithmItem(PricingLogicAlgorithm pricingLogicAlgorithmItem) {
-		if (this.pricingLogicAlgorithm == null) {
-			this.pricingLogicAlgorithm = new HashSet<>();
-		}
-		this.pricingLogicAlgorithm.add(pricingLogicAlgorithmItem);
-		return this;
-	}
-
-	/**
-	 * The PricingLogicAlgorithm entity represents an instantiation of an interface
-	 * specification to external rating function (without a modeled behavior in
-	 * SID). Some of the parameters of the interface definition may be already set
-	 * (such as price per unit) and some may be gathered during the rating process
-	 * from the event (such as call duration) or from ProductCharacteristicValues
-	 * (such as assigned bandwidth).
-	 * 
-	 * @return pricingLogicAlgorithm
-	 **/
-	@Schema(description = "The PricingLogicAlgorithm entity represents an instantiation of an interface specification to external rating function (without a modeled behavior in SID). Some of the parameters of the interface definition may be already set (such as price per unit) and some may be gathered during the rating process from the event (such as call duration) or from ProductCharacteristicValues (such as assigned bandwidth).")
-
-	@Valid
-
-	public Set<PricingLogicAlgorithm> getPricingLogicAlgorithm() {
-		return pricingLogicAlgorithm;
-	}
-
-	public void setPricingLogicAlgorithm(Set<PricingLogicAlgorithm> pricingLogicAlgorithm) {
-		this.pricingLogicAlgorithm = pricingLogicAlgorithm;
-	}
-
-	public ProductOfferingPrice prodSpecCharValueUse(
-			Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-		this.prodSpecCharValueUse = prodSpecCharValueUse;
-		return this;
-	}
-
-	public ProductOfferingPrice addProdSpecCharValueUseItem(
-			ProductSpecificationCharacteristicValueUse prodSpecCharValueUseItem) {
-		if (this.prodSpecCharValueUse == null) {
-			this.prodSpecCharValueUse = new HashSet<>();
-		}
-		this.prodSpecCharValueUse.add(prodSpecCharValueUseItem);
-		return this;
-	}
-
-	/**
-	 * A use of the ProductSpecificationCharacteristicValue by a
-	 * ProductOfferingPrice to which additional properties (attributes) apply or
-	 * override the properties of similar properties contained in
-	 * ProductSpecificationCharacteristicValue. It should be noted that
-	 * characteristics which their value(s) addressed by this object must exist in
-	 * corresponding product specification. The available characteristic values for
-	 * a ProductSpecificationCharacteristic in a Product specification can be
-	 * modified at the ProductOffering and ProcuctOfferingPrice level. The list of
-	 * values in ProductSpecificationCharacteristicValueUse is a strict subset of
-	 * the list of values as defined in the corresponding product specification
-	 * characteristics.
-	 * 
-	 * @return prodSpecCharValueUse
-	 **/
-	@Schema(description = "A use of the ProductSpecificationCharacteristicValue by a ProductOfferingPrice to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering and ProcuctOfferingPrice level. The list of values in ProductSpecificationCharacteristicValueUse is a strict subset of the list of values as defined in the corresponding product specification characteristics.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristicValueUse> getProdSpecCharValueUse() {
-		return prodSpecCharValueUse;
-	}
-
-	public void setProdSpecCharValueUse(Set<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-		this.prodSpecCharValueUse = prodSpecCharValueUse;
-	}
-
-	public ProductOfferingPrice productOfferingTerm(Set<ProductOfferingTerm> productOfferingTerm) {
-		this.productOfferingTerm = productOfferingTerm;
-		return this;
-	}
-
-	public ProductOfferingPrice addProductOfferingTermItem(ProductOfferingTerm productOfferingTermItem) {
-		if (this.productOfferingTerm == null) {
-			this.productOfferingTerm = new HashSet<>();
-		}
-		this.productOfferingTerm.add(productOfferingTermItem);
-		return this;
-	}
-
-	/**
-	 * A list of conditions under which a ProductOfferingPrice is made available to
-	 * Customers. For instance, a Product Offering Price can be offered with
-	 * multiple commitment periods.
-	 * 
-	 * @return productOfferingTerm
-	 **/
-	@Schema(description = "A list of conditions under which a ProductOfferingPrice is made available to Customers. For instance, a Product Offering Price can be offered with multiple commitment periods.")
-
-	@Valid
-
-	public Set<ProductOfferingTerm> getProductOfferingTerm() {
-		return productOfferingTerm;
-	}
-
-	public void setProductOfferingTerm(Set<ProductOfferingTerm> productOfferingTerm) {
-		this.productOfferingTerm = productOfferingTerm;
-	}
-
-	public ProductOfferingPrice tax(Set<TaxItem> tax) {
-		this.tax = tax;
-		return this;
-	}
-
-	public ProductOfferingPrice addTaxItem(TaxItem taxItem) {
-		if (this.tax == null) {
-			this.tax = new HashSet<>();
-		}
-		this.tax.add(taxItem);
-		return this;
-	}
-
-	/**
-	 * An amount of money levied on the price of a Product by a legislative body.
-	 * 
-	 * @return tax
-	 **/
-	@Schema(description = "An amount of money levied on the price of a Product by a legislative body.")
-
-	@Valid
-
-	public Set<TaxItem> getTax() {
-		return tax;
-	}
-
-	public void setTax(Set<TaxItem> tax) {
-		this.tax = tax;
-	}
-
-	public ProductOfferingPrice unitOfMeasure(Quantity unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * A number and unit representing how many (for instance 1 dozen) of an
-	 * ProductOffering is available at the offered price. Its meaning depends on the
-	 * priceType. It could be a price, a rate, or a discount.
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "A number and unit representing how many (for instance 1 dozen) of an ProductOffering is available at the offered price. Its meaning depends on the priceType. It could be a price, a rate, or a discount.")
-
-	@Valid
-
-	public Quantity getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(Quantity unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductOfferingPrice productOfferingPrice = (ProductOfferingPrice) o;
-		return Objects.equals(this.id, productOfferingPrice.id) && Objects.equals(this.href, productOfferingPrice.href)
-				&& Objects.equals(this.description, productOfferingPrice.description)
-				&& Objects.equals(this.isBundle, productOfferingPrice.isBundle)
-				&& Objects.equals(this.lastUpdate, productOfferingPrice.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, productOfferingPrice.lifecycleStatus)
-				&& Objects.equals(this.name, productOfferingPrice.name)
-				&& Objects.equals(this.percentage, productOfferingPrice.percentage)
-				&& Objects.equals(this.priceType, productOfferingPrice.priceType)
-				&& Objects.equals(this.recurringChargePeriodLength, productOfferingPrice.recurringChargePeriodLength)
-				&& Objects.equals(this.recurringChargePeriodType, productOfferingPrice.recurringChargePeriodType)
-				&& Objects.equals(this.version, productOfferingPrice.version)
-				&& Objects.equals(this.bundledPopRelationship, productOfferingPrice.bundledPopRelationship)
-				&& Objects.equals(this.constraint, productOfferingPrice.constraint)
-				&& Objects.equals(this.place, productOfferingPrice.place)
-				&& Objects.equals(this.popRelationship, productOfferingPrice.popRelationship)
-				&& Objects.equals(this.price, productOfferingPrice.price)
-				&& Objects.equals(this.pricingLogicAlgorithm, productOfferingPrice.pricingLogicAlgorithm)
-				&& Objects.equals(this.prodSpecCharValueUse, productOfferingPrice.prodSpecCharValueUse)
-				&& Objects.equals(this.productOfferingTerm, productOfferingPrice.productOfferingTerm)
-				&& Objects.equals(this.tax, productOfferingPrice.tax)
-				&& Objects.equals(this.unitOfMeasure, productOfferingPrice.unitOfMeasure)
-				&& Objects.equals(this.validFor, productOfferingPrice.validFor)
-				&& Objects.equals(this.baseType, productOfferingPrice.baseType)
-				&& Objects.equals(this.schemaLocation, productOfferingPrice.schemaLocation)
-				&& Objects.equals(this.type, productOfferingPrice.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, isBundle, lastUpdate, lifecycleStatus, name, percentage, priceType,
-//				recurringChargePeriodLength, recurringChargePeriodType, version, bundledPopRelationship, constraint,
-//				place, popRelationship, price, pricingLogicAlgorithm, prodSpecCharValueUse, productOfferingTerm, tax,
-//				unitOfMeasure, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductOfferingPrice {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    percentage: ").append(toIndentedString(percentage)).append("\n");
-		sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-		sb.append("    recurringChargePeriodLength: ").append(toIndentedString(recurringChargePeriodLength))
-				.append("\n");
-		sb.append("    recurringChargePeriodType: ").append(toIndentedString(recurringChargePeriodType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    bundledPopRelationship: ").append(toIndentedString(bundledPopRelationship)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    popRelationship: ").append(toIndentedString(popRelationship)).append("\n");
-		sb.append("    price: ").append(toIndentedString(price)).append("\n");
-		sb.append("    pricingLogicAlgorithm: ").append(toIndentedString(pricingLogicAlgorithm)).append("\n");
-		sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-		sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-		sb.append("    tax: ").append(toIndentedString(tax)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEvent.java
deleted file mode 100644
index df133d1de6cbc6e8a7f71782b64f176d9774ea7f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ProductOfferingPriceAttributeValueChangeEventPayload event = null;
-
-  public ProductOfferingPriceAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ProductOfferingPriceAttributeValueChangeEvent event(ProductOfferingPriceAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingPriceAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingPriceAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceAttributeValueChangeEvent productOfferingPriceAttributeValueChangeEvent = (ProductOfferingPriceAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, productOfferingPriceAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingPriceAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingPriceAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingPriceAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingPriceAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, productOfferingPriceAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, productOfferingPriceAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, productOfferingPriceAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingPriceAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, productOfferingPriceAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, productOfferingPriceAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEventPayload.java
deleted file mode 100644
index 690a1e53bd10cb54988befd454e7f47c1fc73adf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceAttributeValueChangeEventPayload   {
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPrice productOfferingPrice = null;
-
-  public ProductOfferingPriceAttributeValueChangeEventPayload productOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOfferingPrice getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceAttributeValueChangeEventPayload productOfferingPriceAttributeValueChangeEventPayload = (ProductOfferingPriceAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.productOfferingPrice, productOfferingPriceAttributeValueChangeEventPayload.productOfferingPrice);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOfferingPrice);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreate.java
deleted file mode 100644
index 59d2a37855a2ace42688017860ae2517446fd63b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreate.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Is based on both the basic cost to develop and produce products and the enterprises policy on revenue targets. This price may be further revised through discounting (productOfferPriceAlteration). The price, applied for a productOffering may also be influenced by the productOfferingTerm, the customer selected, eg: a productOffering can be offered with multiple terms, like commitment periods for the contract. The price may be influenced by this productOfferingTerm. A productOffering may be cheaper with a 24 month commitment than with a 12 month commitment. Skipped properties: id,href
- */
-@Schema(description = "Is based on both the basic cost to develop and produce products and the enterprises policy on revenue targets. This price may be further revised through discounting (productOfferPriceAlteration). The price, applied for a productOffering may also be influenced by the productOfferingTerm, the customer selected, eg: a productOffering can be offered with multiple terms, like commitment periods for the contract. The price may be influenced by this productOfferingTerm. A productOffering may be cheaper with a 24 month commitment than with a 12 month commitment. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceCreate  extends ProductOfferingPriceUpdate {
- 
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
- 
-
-  public ProductOfferingPriceCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * the last update time of this ProductOfferingPrice
-   * @return lastUpdate
-  **/
-  @Schema(description = "the last update time of this ProductOfferingPrice")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceCreate productOfferingPriceCreate = (ProductOfferingPriceCreate) o;
-    return Objects.equals(this.description, productOfferingPriceCreate.description) &&
-        Objects.equals(this.isBundle, productOfferingPriceCreate.isBundle) &&
-        Objects.equals(this.lastUpdate, productOfferingPriceCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, productOfferingPriceCreate.lifecycleStatus) &&
-        Objects.equals(this.name, productOfferingPriceCreate.name) &&
-        Objects.equals(this.percentage, productOfferingPriceCreate.percentage) &&
-        Objects.equals(this.priceType, productOfferingPriceCreate.priceType) &&
-        Objects.equals(this.recurringChargePeriodLength, productOfferingPriceCreate.recurringChargePeriodLength) &&
-        Objects.equals(this.recurringChargePeriodType, productOfferingPriceCreate.recurringChargePeriodType) &&
-        Objects.equals(this.version, productOfferingPriceCreate.version) &&
-        Objects.equals(this.bundledPopRelationship, productOfferingPriceCreate.bundledPopRelationship) &&
-        Objects.equals(this.constraint, productOfferingPriceCreate.constraint) &&
-        Objects.equals(this.place, productOfferingPriceCreate.place) &&
-        Objects.equals(this.popRelationship, productOfferingPriceCreate.popRelationship) &&
-        Objects.equals(this.price, productOfferingPriceCreate.price) &&
-        Objects.equals(this.pricingLogicAlgorithm, productOfferingPriceCreate.pricingLogicAlgorithm) &&
-        Objects.equals(this.prodSpecCharValueUse, productOfferingPriceCreate.prodSpecCharValueUse) &&
-        Objects.equals(this.productOfferingTerm, productOfferingPriceCreate.productOfferingTerm) &&
-        Objects.equals(this.tax, productOfferingPriceCreate.tax) &&
-        Objects.equals(this.unitOfMeasure, productOfferingPriceCreate.unitOfMeasure) &&
-        Objects.equals(this.validFor, productOfferingPriceCreate.validFor) &&
-        Objects.equals(this.baseType, productOfferingPriceCreate.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingPriceCreate.schemaLocation) &&
-        Objects.equals(this.type, productOfferingPriceCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, percentage, priceType, recurringChargePeriodLength, recurringChargePeriodType, version, bundledPopRelationship, constraint, place, popRelationship, price, pricingLogicAlgorithm, prodSpecCharValueUse, productOfferingTerm, tax, unitOfMeasure, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    percentage: ").append(toIndentedString(percentage)).append("\n");
-    sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-    sb.append("    recurringChargePeriodLength: ").append(toIndentedString(recurringChargePeriodLength)).append("\n");
-    sb.append("    recurringChargePeriodType: ").append(toIndentedString(recurringChargePeriodType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    bundledPopRelationship: ").append(toIndentedString(bundledPopRelationship)).append("\n");
-    sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    popRelationship: ").append(toIndentedString(popRelationship)).append("\n");
-    sb.append("    price: ").append(toIndentedString(price)).append("\n");
-    sb.append("    pricingLogicAlgorithm: ").append(toIndentedString(pricingLogicAlgorithm)).append("\n");
-    sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-    sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-    sb.append("    tax: ").append(toIndentedString(tax)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEvent.java
deleted file mode 100644
index 00f3edba68118a5ce9da69af47a089d2a44ff97b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingPriceCreateEventPayload event = null;
-
-  public ProductOfferingPriceCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingPriceCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingPriceCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingPriceCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingPriceCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingPriceCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingPriceCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingPriceCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingPriceCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingPriceCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingPriceCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingPriceCreateEvent event(ProductOfferingPriceCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingPriceCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingPriceCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceCreateEvent productOfferingPriceCreateEvent = (ProductOfferingPriceCreateEvent) o;
-    return Objects.equals(this.id, productOfferingPriceCreateEvent.id) &&
-        Objects.equals(this.href, productOfferingPriceCreateEvent.href) &&
-        Objects.equals(this.eventId, productOfferingPriceCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingPriceCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingPriceCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingPriceCreateEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingPriceCreateEvent.domain) &&
-        Objects.equals(this.title, productOfferingPriceCreateEvent.title) &&
-        Objects.equals(this.description, productOfferingPriceCreateEvent.description) &&
-        Objects.equals(this.priority, productOfferingPriceCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingPriceCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingPriceCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEventPayload.java
deleted file mode 100644
index 11c5bb1ed50c895958e19c208d93ede736170ac1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceCreateEventPayload   {
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPrice productOfferingPrice = null;
-
-  public ProductOfferingPriceCreateEventPayload productOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOfferingPrice getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceCreateEventPayload productOfferingPriceCreateEventPayload = (ProductOfferingPriceCreateEventPayload) o;
-    return Objects.equals(this.productOfferingPrice, productOfferingPriceCreateEventPayload.productOfferingPrice);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOfferingPrice);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceCreateEventPayload {\n");
-    
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEvent.java
deleted file mode 100644
index d68d797208836296670b246e417626c1aecdd02b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingPriceDeleteEventPayload event = null;
-
-  public ProductOfferingPriceDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingPriceDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingPriceDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingPriceDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingPriceDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingPriceDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingPriceDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingPriceDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingPriceDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingPriceDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingPriceDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingPriceDeleteEvent event(ProductOfferingPriceDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingPriceDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingPriceDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceDeleteEvent productOfferingPriceDeleteEvent = (ProductOfferingPriceDeleteEvent) o;
-    return Objects.equals(this.id, productOfferingPriceDeleteEvent.id) &&
-        Objects.equals(this.href, productOfferingPriceDeleteEvent.href) &&
-        Objects.equals(this.eventId, productOfferingPriceDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingPriceDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingPriceDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingPriceDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingPriceDeleteEvent.domain) &&
-        Objects.equals(this.title, productOfferingPriceDeleteEvent.title) &&
-        Objects.equals(this.description, productOfferingPriceDeleteEvent.description) &&
-        Objects.equals(this.priority, productOfferingPriceDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingPriceDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingPriceDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEventPayload.java
deleted file mode 100644
index f4e525e4cf334f8c259d4c1a8e8f35839e6d3910..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceDeleteEventPayload   {
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPrice productOfferingPrice = null;
-
-  public ProductOfferingPriceDeleteEventPayload productOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOfferingPrice getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceDeleteEventPayload productOfferingPriceDeleteEventPayload = (ProductOfferingPriceDeleteEventPayload) o;
-    return Objects.equals(this.productOfferingPrice, productOfferingPriceDeleteEventPayload.productOfferingPrice);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOfferingPrice);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceDeleteEventPayload {\n");
-    
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRef.java
deleted file mode 100644
index 4b04761105c443ba08538bccd55339fb43475359..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductPriceOffering reference. An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased
- */
-@Schema(description = "ProductPriceOffering reference. An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@Entity(name = "ProductOfferingPriceRef")
-public class ProductOfferingPriceRef extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ProductOfferingPriceRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-  public String getId() {
-		return id;
-  }
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-	
-  public ProductOfferingPriceRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceRef productOfferingPriceRef = (ProductOfferingPriceRef) o;
-    return Objects.equals(this.id, productOfferingPriceRef.id) &&
-        Objects.equals(this.href, productOfferingPriceRef.href) &&
-        Objects.equals(this.name, productOfferingPriceRef.name) &&
-        Objects.equals(this.baseType, productOfferingPriceRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingPriceRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingPriceRef.type) &&
-        Objects.equals(this.referredType, productOfferingPriceRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRelationship.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRelationship.java
deleted file mode 100644
index 87035dc3178e2a858cc6bc1235f5d80cae15e840..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceRelationship.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Describes a non-composite relationship between product offering prices. For example one price might be an discount alteration for another price.
- */
-@Schema(description = "Describes a non-composite relationship between product offering prices. For example one price might be an discount alteration for another price.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class ProductOfferingPriceRelationship  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-
-  public ProductOfferingPriceRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the associated product offering price
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the associated product offering price")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public ProductOfferingPriceRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * type of the relationship, for example override, discount, etc.
-   * @return relationshipType
-  **/
-  @Schema(description = "type of the relationship, for example override, discount, etc.")
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceRelationship productOfferingPriceRelationship = (ProductOfferingPriceRelationship) o;
-    return Objects.equals(this.id, productOfferingPriceRelationship.id) &&
-        Objects.equals(this.href, productOfferingPriceRelationship.href) &&
-        Objects.equals(this.name, productOfferingPriceRelationship.name) &&
-        Objects.equals(this.relationshipType, productOfferingPriceRelationship.relationshipType) &&
-        Objects.equals(this.baseType, productOfferingPriceRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingPriceRelationship.schemaLocation) &&
-        Objects.equals(this.type, productOfferingPriceRelationship.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, relationshipType, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEvent.java
deleted file mode 100644
index 3ffa0796e03faba3f6849116eff0c12fb9dc82ca..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingPriceStateChangeEventPayload event = null;
-
-  public ProductOfferingPriceStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingPriceStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingPriceStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingPriceStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingPriceStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingPriceStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingPriceStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingPriceStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingPriceStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingPriceStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingPriceStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingPriceStateChangeEvent event(ProductOfferingPriceStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingPriceStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingPriceStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceStateChangeEvent productOfferingPriceStateChangeEvent = (ProductOfferingPriceStateChangeEvent) o;
-    return Objects.equals(this.id, productOfferingPriceStateChangeEvent.id) &&
-        Objects.equals(this.href, productOfferingPriceStateChangeEvent.href) &&
-        Objects.equals(this.eventId, productOfferingPriceStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingPriceStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingPriceStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingPriceStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingPriceStateChangeEvent.domain) &&
-        Objects.equals(this.title, productOfferingPriceStateChangeEvent.title) &&
-        Objects.equals(this.description, productOfferingPriceStateChangeEvent.description) &&
-        Objects.equals(this.priority, productOfferingPriceStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingPriceStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingPriceStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEventPayload.java
deleted file mode 100644
index e35614b075b564df272a2cedb9d749f58d75f438..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceStateChangeEventPayload   {
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPrice productOfferingPrice = null;
-
-  public ProductOfferingPriceStateChangeEventPayload productOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOfferingPrice getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPrice productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceStateChangeEventPayload productOfferingPriceStateChangeEventPayload = (ProductOfferingPriceStateChangeEventPayload) o;
-    return Objects.equals(this.productOfferingPrice, productOfferingPriceStateChangeEventPayload.productOfferingPrice);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOfferingPrice);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceStateChangeEventPayload {\n");
-    
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceUpdate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceUpdate.java
deleted file mode 100644
index 49bf84b203ca7537153e5d0d762028a6994cfbf2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingPriceUpdate.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Quantity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Is based on both the basic cost to develop and produce products and the enterprises policy on revenue targets. This price may be further revised through discounting (productOfferPriceAlteration). The price, applied for a productOffering may also be influenced by the productOfferingTerm, the customer selected, eg: a productOffering can be offered with multiple terms, like commitment periods for the contract. The price may be influenced by this productOfferingTerm. A productOffering may be cheaper with a 24 month commitment than with a 12 month commitment. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "Is based on both the basic cost to develop and produce products and the enterprises policy on revenue targets. This price may be further revised through discounting (productOfferPriceAlteration). The price, applied for a productOffering may also be influenced by the productOfferingTerm, the customer selected, eg: a productOffering can be offered with multiple terms, like commitment periods for the contract. The price may be influenced by this productOfferingTerm. A productOffering may be cheaper with a 24 month commitment than with a 12 month commitment. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingPriceUpdate   {
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("isBundle")
-  protected Boolean isBundle = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("percentage")
-  protected Float percentage = null;
-
-  @JsonProperty("priceType")
-  protected String priceType = null;
-
-  @JsonProperty("recurringChargePeriodLength")
-  protected Integer recurringChargePeriodLength = null;
-
-  @JsonProperty("recurringChargePeriodType")
-  protected String recurringChargePeriodType = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("bundledPopRelationship")
-  @Valid
-  protected List<BundledProductOfferingPriceRelationship> bundledPopRelationship = null;
-
-  @JsonProperty("constraint")
-  @Valid
-  protected List<ConstraintRef> constraint = null;
-
-  @JsonProperty("place")
-  @Valid
-  protected List<PlaceRef> place = null;
-
-  @JsonProperty("popRelationship")
-  @Valid
-  protected List<ProductOfferingPriceRelationship> popRelationship = null;
-
-  @JsonProperty("price")
-  protected Money price = null;
-
-  @JsonProperty("pricingLogicAlgorithm")
-  @Valid
-  protected List<PricingLogicAlgorithm> pricingLogicAlgorithm = null;
-
-  @JsonProperty("prodSpecCharValueUse")
-  @Valid
-  protected List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse = null;
-
-  @JsonProperty("productOfferingTerm")
-  @Valid
-  protected List<ProductOfferingTerm> productOfferingTerm = null;
-
-  @JsonProperty("tax")
-  @Valid
-  protected List<TaxItem> tax = null;
-
-  @JsonProperty("unitOfMeasure")
-  protected Quantity unitOfMeasure = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public ProductOfferingPriceUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the productOfferingPrice
-   * @return description
-  **/
-  @Schema(description = "Description of the productOfferingPrice")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingPriceUpdate isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * A flag indicating if this ProductOfferingPrice is composite (bundle) or not
-   * @return isBundle
-  **/
-  @Schema(description = "A flag indicating if this ProductOfferingPrice is composite (bundle) or not")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public ProductOfferingPriceUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * the lifecycle status of this ProductOfferingPrice
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "the lifecycle status of this ProductOfferingPrice")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ProductOfferingPriceUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the productOfferingPrice
-   * @return name
-  **/
-  @Schema(description = "Name of the productOfferingPrice")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingPriceUpdate percentage(Float percentage) {
-    this.percentage = percentage;
-    return this;
-  }
-
-  /**
-   * Percentage to apply for ProductOfferPriceAlteration (Discount)
-   * @return percentage
-  **/
-  @Schema(description = "Percentage to apply for ProductOfferPriceAlteration (Discount)")
-
-
-  public Float getPercentage() {
-    return percentage;
-  }
-
-  public void setPercentage(Float percentage) {
-    this.percentage = percentage;
-  }
-
-  public ProductOfferingPriceUpdate priceType(String priceType) {
-    this.priceType = priceType;
-    return this;
-  }
-
-  /**
-   * A category that describes the price, such as recurring, discount, allowance, penalty, and so forth.
-   * @return priceType
-  **/
-  @Schema(description = "A category that describes the price, such as recurring, discount, allowance, penalty, and so forth.")
-
-
-  public String getPriceType() {
-    return priceType;
-  }
-
-  public void setPriceType(String priceType) {
-    this.priceType = priceType;
-  }
-
-  public ProductOfferingPriceUpdate recurringChargePeriodLength(Integer recurringChargePeriodLength) {
-    this.recurringChargePeriodLength = recurringChargePeriodLength;
-    return this;
-  }
-
-  /**
-   * the period of the recurring charge:  1, 2, ... .It sets to zero if it is not applicable
-   * @return recurringChargePeriodLength
-  **/
-  @Schema(description = "the period of the recurring charge:  1, 2, ... .It sets to zero if it is not applicable")
-
-
-  public Integer getRecurringChargePeriodLength() {
-    return recurringChargePeriodLength;
-  }
-
-  public void setRecurringChargePeriodLength(Integer recurringChargePeriodLength) {
-    this.recurringChargePeriodLength = recurringChargePeriodLength;
-  }
-
-  public ProductOfferingPriceUpdate recurringChargePeriodType(String recurringChargePeriodType) {
-    this.recurringChargePeriodType = recurringChargePeriodType;
-    return this;
-  }
-
-  /**
-   * The period to repeat the application of the price Could be month, week...
-   * @return recurringChargePeriodType
-  **/
-  @Schema(description = "The period to repeat the application of the price Could be month, week...")
-
-
-  public String getRecurringChargePeriodType() {
-    return recurringChargePeriodType;
-  }
-
-  public void setRecurringChargePeriodType(String recurringChargePeriodType) {
-    this.recurringChargePeriodType = recurringChargePeriodType;
-  }
-
-  public ProductOfferingPriceUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * ProductOffering version
-   * @return version
-  **/
-  @Schema(description = "ProductOffering version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ProductOfferingPriceUpdate bundledPopRelationship(List<BundledProductOfferingPriceRelationship> bundledPopRelationship) {
-    this.bundledPopRelationship = bundledPopRelationship;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addBundledPopRelationshipItem(BundledProductOfferingPriceRelationship bundledPopRelationshipItem) {
-    if (this.bundledPopRelationship == null) {
-      this.bundledPopRelationship = new ArrayList<>();
-    }
-    this.bundledPopRelationship.add(bundledPopRelationshipItem);
-    return this;
-  }
-
-  /**
-   * this object represents a bundle relationship from a bundle product offering price (parent) to a simple product offering price (child). A simple product offering price may participate in more than one bundle relationship.
-   * @return bundledPopRelationship
-  **/
-  @Schema(description = "this object represents a bundle relationship from a bundle product offering price (parent) to a simple product offering price (child). A simple product offering price may participate in more than one bundle relationship.")
-
-  @Valid
-
-  public List<BundledProductOfferingPriceRelationship> getBundledPopRelationship() {
-    return bundledPopRelationship;
-  }
-
-  public void setBundledPopRelationship(List<BundledProductOfferingPriceRelationship> bundledPopRelationship) {
-    this.bundledPopRelationship = bundledPopRelationship;
-  }
-
-  public ProductOfferingPriceUpdate constraint(List<ConstraintRef> constraint) {
-    this.constraint = constraint;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addConstraintItem(ConstraintRef constraintItem) {
-    if (this.constraint == null) {
-      this.constraint = new ArrayList<>();
-    }
-    this.constraint.add(constraintItem);
-    return this;
-  }
-
-  /**
-   * The Constraint resource represents a policy/rule applied to ProductOfferingPrice.
-   * @return constraint
-  **/
-  @Schema(description = "The Constraint resource represents a policy/rule applied to ProductOfferingPrice.")
-
-  @Valid
-
-  public List<ConstraintRef> getConstraint() {
-    return constraint;
-  }
-
-  public void setConstraint(List<ConstraintRef> constraint) {
-    this.constraint = constraint;
-  }
-
-  public ProductOfferingPriceUpdate place(List<PlaceRef> place) {
-    this.place = place;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addPlaceItem(PlaceRef placeItem) {
-    if (this.place == null) {
-      this.place = new ArrayList<>();
-    }
-    this.place.add(placeItem);
-    return this;
-  }
-
-  /**
-   * Place defines the places where the products are sold or delivered.
-   * @return place
-  **/
-  @Schema(description = "Place defines the places where the products are sold or delivered.")
-
-  @Valid
-
-  public List<PlaceRef> getPlace() {
-    return place;
-  }
-
-  public void setPlace(List<PlaceRef> place) {
-    this.place = place;
-  }
-
-  public ProductOfferingPriceUpdate popRelationship(List<ProductOfferingPriceRelationship> popRelationship) {
-    this.popRelationship = popRelationship;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addPopRelationshipItem(ProductOfferingPriceRelationship popRelationshipItem) {
-    if (this.popRelationship == null) {
-      this.popRelationship = new ArrayList<>();
-    }
-    this.popRelationship.add(popRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Product Offering Prices related to this Product Offering Price, for example a price alteration such as allowance or discount
-   * @return popRelationship
-  **/
-  @Schema(description = "Product Offering Prices related to this Product Offering Price, for example a price alteration such as allowance or discount")
-
-  @Valid
-
-  public List<ProductOfferingPriceRelationship> getPopRelationship() {
-    return popRelationship;
-  }
-
-  public void setPopRelationship(List<ProductOfferingPriceRelationship> popRelationship) {
-    this.popRelationship = popRelationship;
-  }
-
-  public ProductOfferingPriceUpdate price(Money price) {
-    this.price = price;
-    return this;
-  }
-
-  /**
-   * The amount of money that characterizes the price.
-   * @return price
-  **/
-  @Schema(description = "The amount of money that characterizes the price.")
-
-  @Valid
-
-  public Money getPrice() {
-    return price;
-  }
-
-  public void setPrice(Money price) {
-    this.price = price;
-  }
-
-  public ProductOfferingPriceUpdate pricingLogicAlgorithm(List<PricingLogicAlgorithm> pricingLogicAlgorithm) {
-    this.pricingLogicAlgorithm = pricingLogicAlgorithm;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addPricingLogicAlgorithmItem(PricingLogicAlgorithm pricingLogicAlgorithmItem) {
-    if (this.pricingLogicAlgorithm == null) {
-      this.pricingLogicAlgorithm = new ArrayList<>();
-    }
-    this.pricingLogicAlgorithm.add(pricingLogicAlgorithmItem);
-    return this;
-  }
-
-  /**
-   * The PricingLogicAlgorithm entity represents an instantiation of an interface specification to external rating function (without a modeled behavior in SID). Some of the parameters of the interface definition may be already set (such as price per unit) and some may be gathered during the rating process from the event (such as call duration) or from ProductCharacteristicValues (such as assigned bandwidth).
-   * @return pricingLogicAlgorithm
-  **/
-  @Schema(description = "The PricingLogicAlgorithm entity represents an instantiation of an interface specification to external rating function (without a modeled behavior in SID). Some of the parameters of the interface definition may be already set (such as price per unit) and some may be gathered during the rating process from the event (such as call duration) or from ProductCharacteristicValues (such as assigned bandwidth).")
-
-  @Valid
-
-  public List<PricingLogicAlgorithm> getPricingLogicAlgorithm() {
-    return pricingLogicAlgorithm;
-  }
-
-  public void setPricingLogicAlgorithm(List<PricingLogicAlgorithm> pricingLogicAlgorithm) {
-    this.pricingLogicAlgorithm = pricingLogicAlgorithm;
-  }
-
-  public ProductOfferingPriceUpdate prodSpecCharValueUse(List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-    this.prodSpecCharValueUse = prodSpecCharValueUse;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addProdSpecCharValueUseItem(ProductSpecificationCharacteristicValueUse prodSpecCharValueUseItem) {
-    if (this.prodSpecCharValueUse == null) {
-      this.prodSpecCharValueUse = new ArrayList<>();
-    }
-    this.prodSpecCharValueUse.add(prodSpecCharValueUseItem);
-    return this;
-  }
-
-  /**
-   * A use of the ProductSpecificationCharacteristicValue by a ProductOfferingPrice to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering and ProcuctOfferingPrice level. The list of values in ProductSpecificationCharacteristicValueUse is a strict subset of the list of values as defined in the corresponding product specification characteristics.
-   * @return prodSpecCharValueUse
-  **/
-  @Schema(description = "A use of the ProductSpecificationCharacteristicValue by a ProductOfferingPrice to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering and ProcuctOfferingPrice level. The list of values in ProductSpecificationCharacteristicValueUse is a strict subset of the list of values as defined in the corresponding product specification characteristics.")
-
-  @Valid
-
-  public List<ProductSpecificationCharacteristicValueUse> getProdSpecCharValueUse() {
-    return prodSpecCharValueUse;
-  }
-
-  public void setProdSpecCharValueUse(List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-    this.prodSpecCharValueUse = prodSpecCharValueUse;
-  }
-
-  public ProductOfferingPriceUpdate productOfferingTerm(List<ProductOfferingTerm> productOfferingTerm) {
-    this.productOfferingTerm = productOfferingTerm;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addProductOfferingTermItem(ProductOfferingTerm productOfferingTermItem) {
-    if (this.productOfferingTerm == null) {
-      this.productOfferingTerm = new ArrayList<>();
-    }
-    this.productOfferingTerm.add(productOfferingTermItem);
-    return this;
-  }
-
-  /**
-   * A list of conditions under which a ProductOfferingPrice is made available to Customers. For instance, a Product Offering Price can be offered with multiple commitment periods.
-   * @return productOfferingTerm
-  **/
-  @Schema(description = "A list of conditions under which a ProductOfferingPrice is made available to Customers. For instance, a Product Offering Price can be offered with multiple commitment periods.")
-
-  @Valid
-
-  public List<ProductOfferingTerm> getProductOfferingTerm() {
-    return productOfferingTerm;
-  }
-
-  public void setProductOfferingTerm(List<ProductOfferingTerm> productOfferingTerm) {
-    this.productOfferingTerm = productOfferingTerm;
-  }
-
-  public ProductOfferingPriceUpdate tax(List<TaxItem> tax) {
-    this.tax = tax;
-    return this;
-  }
-
-  public ProductOfferingPriceUpdate addTaxItem(TaxItem taxItem) {
-    if (this.tax == null) {
-      this.tax = new ArrayList<>();
-    }
-    this.tax.add(taxItem);
-    return this;
-  }
-
-  /**
-   * An amount of money levied on the price of a Product by a legislative body.
-   * @return tax
-  **/
-  @Schema(description = "An amount of money levied on the price of a Product by a legislative body.")
-
-  @Valid
-
-  public List<TaxItem> getTax() {
-    return tax;
-  }
-
-  public void setTax(List<TaxItem> tax) {
-    this.tax = tax;
-  }
-
-  public ProductOfferingPriceUpdate unitOfMeasure(Quantity unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * A number and unit representing how many (for instance 1 dozen) of an ProductOffering is available at the offered price. Its meaning depends on the priceType. It could be a price, a rate, or a discount.
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "A number and unit representing how many (for instance 1 dozen) of an ProductOffering is available at the offered price. Its meaning depends on the priceType. It could be a price, a rate, or a discount.")
-
-  @Valid
-
-  public Quantity getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(Quantity unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public ProductOfferingPriceUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the productOfferingPrice is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the productOfferingPrice is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ProductOfferingPriceUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * the immediate base class type of this product offering
-   * @return baseType
-  **/
-  @Schema(description = "the immediate base class type of this product offering")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingPriceUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * hyperlink reference to the schema describing this resource
-   * @return schemaLocation
-  **/
-  @Schema(description = "hyperlink reference to the schema describing this resource")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingPriceUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of this Product offering
-   * @return type
-  **/
-  @Schema(description = "The class type of this Product offering")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceUpdate productOfferingPriceUpdate = (ProductOfferingPriceUpdate) o;
-    return Objects.equals(this.description, productOfferingPriceUpdate.description) &&
-        Objects.equals(this.isBundle, productOfferingPriceUpdate.isBundle) &&
-        Objects.equals(this.lifecycleStatus, productOfferingPriceUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, productOfferingPriceUpdate.name) &&
-        Objects.equals(this.percentage, productOfferingPriceUpdate.percentage) &&
-        Objects.equals(this.priceType, productOfferingPriceUpdate.priceType) &&
-        Objects.equals(this.recurringChargePeriodLength, productOfferingPriceUpdate.recurringChargePeriodLength) &&
-        Objects.equals(this.recurringChargePeriodType, productOfferingPriceUpdate.recurringChargePeriodType) &&
-        Objects.equals(this.version, productOfferingPriceUpdate.version) &&
-        Objects.equals(this.bundledPopRelationship, productOfferingPriceUpdate.bundledPopRelationship) &&
-        Objects.equals(this.constraint, productOfferingPriceUpdate.constraint) &&
-        Objects.equals(this.place, productOfferingPriceUpdate.place) &&
-        Objects.equals(this.popRelationship, productOfferingPriceUpdate.popRelationship) &&
-        Objects.equals(this.price, productOfferingPriceUpdate.price) &&
-        Objects.equals(this.pricingLogicAlgorithm, productOfferingPriceUpdate.pricingLogicAlgorithm) &&
-        Objects.equals(this.prodSpecCharValueUse, productOfferingPriceUpdate.prodSpecCharValueUse) &&
-        Objects.equals(this.productOfferingTerm, productOfferingPriceUpdate.productOfferingTerm) &&
-        Objects.equals(this.tax, productOfferingPriceUpdate.tax) &&
-        Objects.equals(this.unitOfMeasure, productOfferingPriceUpdate.unitOfMeasure) &&
-        Objects.equals(this.validFor, productOfferingPriceUpdate.validFor) &&
-        Objects.equals(this.baseType, productOfferingPriceUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingPriceUpdate.schemaLocation) &&
-        Objects.equals(this.type, productOfferingPriceUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isBundle, lifecycleStatus, name, percentage, priceType, recurringChargePeriodLength, recurringChargePeriodType, version, bundledPopRelationship, constraint, place, popRelationship, price, pricingLogicAlgorithm, prodSpecCharValueUse, productOfferingTerm, tax, unitOfMeasure, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    percentage: ").append(toIndentedString(percentage)).append("\n");
-    sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-    sb.append("    recurringChargePeriodLength: ").append(toIndentedString(recurringChargePeriodLength)).append("\n");
-    sb.append("    recurringChargePeriodType: ").append(toIndentedString(recurringChargePeriodType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    bundledPopRelationship: ").append(toIndentedString(bundledPopRelationship)).append("\n");
-    sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    popRelationship: ").append(toIndentedString(popRelationship)).append("\n");
-    sb.append("    price: ").append(toIndentedString(price)).append("\n");
-    sb.append("    pricingLogicAlgorithm: ").append(toIndentedString(pricingLogicAlgorithm)).append("\n");
-    sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-    sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-    sb.append("    tax: ").append(toIndentedString(tax)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingRef.java
deleted file mode 100644
index dd47df1336aa92cf9a7754785c0a7872e7706f21..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingRef.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.
- */
-@Schema(description = "ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-@JsonIgnoreProperties( {"uuid"} )
-public class ProductOfferingRef extends BaseRootNamedEntity {
-	
-	
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ProductOfferingRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public ProductOfferingRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingRef productOfferingRef = (ProductOfferingRef) o;
-    return Objects.equals(this.id, productOfferingRef.id) &&
-        Objects.equals(this.href, productOfferingRef.href) &&
-        Objects.equals(this.name, productOfferingRef.name) &&
-        Objects.equals(this.baseType, productOfferingRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingRef.type) &&
-        Objects.equals(this.referredType, productOfferingRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEvent.java
deleted file mode 100644
index 4375e6cb51115c02248865fb7b8b1abac7ce3b76..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOfferingStateChangeEventPayload event = null;
-
-  public ProductOfferingStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOfferingStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOfferingStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOfferingStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOfferingStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOfferingStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOfferingStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOfferingStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOfferingStateChangeEvent event(ProductOfferingStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductOfferingStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOfferingStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingStateChangeEvent productOfferingStateChangeEvent = (ProductOfferingStateChangeEvent) o;
-    return Objects.equals(this.id, productOfferingStateChangeEvent.id) &&
-        Objects.equals(this.href, productOfferingStateChangeEvent.href) &&
-        Objects.equals(this.eventId, productOfferingStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOfferingStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOfferingStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOfferingStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOfferingStateChangeEvent.domain) &&
-        Objects.equals(this.title, productOfferingStateChangeEvent.title) &&
-        Objects.equals(this.description, productOfferingStateChangeEvent.description) &&
-        Objects.equals(this.priority, productOfferingStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOfferingStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, productOfferingStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEventPayload.java
deleted file mode 100644
index c18c46739921d3b1a2baddaadc255b2e36d9c6a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingStateChangeEventPayload   {
-  @JsonProperty("productOffering")
-  private ProductOffering productOffering = null;
-
-  public ProductOfferingStateChangeEventPayload productOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productOffering
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductOffering getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOffering productOffering) {
-    this.productOffering = productOffering;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingStateChangeEventPayload productOfferingStateChangeEventPayload = (ProductOfferingStateChangeEventPayload) o;
-    return Objects.equals(this.productOffering, productOfferingStateChangeEventPayload.productOffering);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOffering);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingStateChangeEventPayload {\n");
-    
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingTerm.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingTerm.java
deleted file mode 100644
index d41dace4b6b2d345012a74accc7f4a64d6ff0e0c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingTerm.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.Quantity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A condition under which a ProductOffering is made available to Customers. For instance, a productOffering can be offered with multiple commitment periods.
- */
-@Schema(description = "A condition under which a ProductOffering is made available to Customers. For instance, a productOffering can be offered with multiple commitment periods.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductOfferingTerm")
-public class ProductOfferingTerm   extends BaseEntity {
- 
-
-  @JsonProperty("duration")
-  private Quantity duration = null;
-
-
-  public ProductOfferingTerm description(String description) {
-    this.description = description;
-    return this;
-  }
-
- 
-
-  public ProductOfferingTerm duration(Quantity duration) {
-    this.duration = duration;
-    return this;
-  }
-
-  /**
-   * Duration of the productOfferingTerm
-   * @return duration
-  **/
-  @Schema(description = "Duration of the productOfferingTerm")
-
-  @Valid
-
-  public Quantity getDuration() {
-    return duration;
-  }
-
-  public void setDuration(Quantity duration) {
-    this.duration = duration;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingTerm productOfferingTerm = (ProductOfferingTerm) o;
-    return Objects.equals(this.description, productOfferingTerm.description) &&
-        Objects.equals(this.name, productOfferingTerm.name) &&
-        Objects.equals(this.duration, productOfferingTerm.duration) &&
-        Objects.equals(this.validFor, productOfferingTerm.validFor) &&
-        Objects.equals(this.baseType, productOfferingTerm.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingTerm.schemaLocation) &&
-        Objects.equals(this.type, productOfferingTerm.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, name, duration, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingTerm {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    duration: ").append(toIndentedString(duration)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingUpdate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingUpdate.java
deleted file mode 100644
index 88b943e6c2fcf19f5eab3a674fd3b93334fe54e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductOfferingUpdate.java
+++ /dev/null
@@ -1,809 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents entities that are orderable from the provider of the catalog, this resource includes pricing information. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "Represents entities that are orderable from the provider of the catalog, this resource includes pricing information. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductOfferingUpdate   {
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("isBundle")
-  protected Boolean isBundle = null;
-
-  @JsonProperty("isSellable")
-  protected Boolean isSellable = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("statusReason")
-  protected String statusReason = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  protected List<AgreementRef> agreement = null;
-
-  @JsonProperty("attachment")
-  @Valid
-  protected List<AttachmentRefOrValue> attachment = null;
-
-  @JsonProperty("bundledProductOffering")
-  @Valid
-  protected List<BundledProductOffering> bundledProductOffering = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<CategoryRef> category = null;
-
-  @JsonProperty("channel")
-  @Valid
-  protected List<ChannelRef> channel = null;
-
-  @JsonProperty("marketSegment")
-  @Valid
-  protected List<MarketSegmentRef> marketSegment = null;
-
-  @JsonProperty("place")
-  @Valid
-  protected List<PlaceRef> place = null;
-
-  @JsonProperty("prodSpecCharValueUse")
-  @Valid
-  protected List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse = null;
-
-  @JsonProperty("productOfferingPrice")
-  @Valid
-  protected List<ProductOfferingPriceRef> productOfferingPrice = null;
-
-  @JsonProperty("productOfferingTerm")
-  @Valid
-  protected List<ProductOfferingTerm> productOfferingTerm = null;
-
-  @JsonProperty("productSpecification")
-  protected ProductSpecificationRef productSpecification = null;
-
-  @JsonProperty("resourceCandidate")
-  protected ResourceCandidateRef resourceCandidate = null;
-
-  @JsonProperty("serviceCandidate")
-  protected ServiceCandidateRef serviceCandidate = null;
-
-  @JsonProperty("serviceLevelAgreement")
-  protected SLARef serviceLevelAgreement = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public ProductOfferingUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the productOffering
-   * @return description
-  **/
-  @Schema(description = "Description of the productOffering")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOfferingUpdate isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * isBundle determines whether a productOffering represents a single productOffering (false), or a bundle of productOfferings (true).
-   * @return isBundle
-  **/
-  @Schema(description = "isBundle determines whether a productOffering represents a single productOffering (false), or a bundle of productOfferings (true).")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public ProductOfferingUpdate isSellable(Boolean isSellable) {
-    this.isSellable = isSellable;
-    return this;
-  }
-
-  /**
-   * A flag indicating if this product offer can be sold stand-alone for sale or not. If this flag is false it indicates that the offer can only be sold within a bundle.
-   * @return isSellable
-  **/
-  @Schema(description = "A flag indicating if this product offer can be sold stand-alone for sale or not. If this flag is false it indicates that the offer can only be sold within a bundle.")
-
-
-  public Boolean isIsSellable() {
-    return isSellable;
-  }
-
-  public void setIsSellable(Boolean isSellable) {
-    this.isSellable = isSellable;
-  }
-
-  public ProductOfferingUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ProductOfferingUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the productOffering
-   * @return name
-  **/
-  @Schema(description = "Name of the productOffering")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingUpdate statusReason(String statusReason) {
-    this.statusReason = statusReason;
-    return this;
-  }
-
-  /**
-   * A string providing a complementary information on the value of the lifecycle status attribute.
-   * @return statusReason
-  **/
-  @Schema(description = "A string providing a complementary information on the value of the lifecycle status attribute.")
-
-
-  public String getStatusReason() {
-    return statusReason;
-  }
-
-  public void setStatusReason(String statusReason) {
-    this.statusReason = statusReason;
-  }
-
-  public ProductOfferingUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * ProductOffering version
-   * @return version
-  **/
-  @Schema(description = "ProductOffering version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ProductOfferingUpdate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public ProductOfferingUpdate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.
-   * @return agreement
-  **/
-  @Schema(description = "An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-
-  @Valid
-
-  public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public ProductOfferingUpdate attachment(List<AttachmentRefOrValue> attachment) {
-    this.attachment = attachment;
-    return this;
-  }
-
-  public ProductOfferingUpdate addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-    if (this.attachment == null) {
-      this.attachment = new ArrayList<>();
-    }
-    this.attachment.add(attachmentItem);
-    return this;
-  }
-
-  /**
-   * Complements the description of an element (for instance a product) through video, pictures...
-   * @return attachment
-  **/
-  @Schema(description = "Complements the description of an element (for instance a product) through video, pictures...")
-
-  @Valid
-
-  public List<AttachmentRefOrValue> getAttachment() {
-    return attachment;
-  }
-
-  public void setAttachment(List<AttachmentRefOrValue> attachment) {
-    this.attachment = attachment;
-  }
-
-  public ProductOfferingUpdate bundledProductOffering(List<BundledProductOffering> bundledProductOffering) {
-    this.bundledProductOffering = bundledProductOffering;
-    return this;
-  }
-
-  public ProductOfferingUpdate addBundledProductOfferingItem(BundledProductOffering bundledProductOfferingItem) {
-    if (this.bundledProductOffering == null) {
-      this.bundledProductOffering = new ArrayList<>();
-    }
-    this.bundledProductOffering.add(bundledProductOfferingItem);
-    return this;
-  }
-
-  /**
-   * A type of ProductOffering that belongs to a grouping of ProductOfferings made available to the market. It inherits of all attributes of ProductOffering.
-   * @return bundledProductOffering
-  **/
-  @Schema(description = "A type of ProductOffering that belongs to a grouping of ProductOfferings made available to the market. It inherits of all attributes of ProductOffering.")
-
-  @Valid
-
-  public List<BundledProductOffering> getBundledProductOffering() {
-    return bundledProductOffering;
-  }
-
-  public void setBundledProductOffering(List<BundledProductOffering> bundledProductOffering) {
-    this.bundledProductOffering = bundledProductOffering;
-  }
-
-  public ProductOfferingUpdate category(List<CategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public ProductOfferingUpdate addCategoryItem(CategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.
-   * @return category
-  **/
-  @Schema(description = "The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.")
-
-  @Valid
-
-  public List<CategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<CategoryRef> category) {
-    this.category = category;
-  }
-
-  public ProductOfferingUpdate channel(List<ChannelRef> channel) {
-    this.channel = channel;
-    return this;
-  }
-
-  public ProductOfferingUpdate addChannelItem(ChannelRef channelItem) {
-    if (this.channel == null) {
-      this.channel = new ArrayList<>();
-    }
-    this.channel.add(channelItem);
-    return this;
-  }
-
-  /**
-   * The channel defines the channel for selling product offerings.
-   * @return channel
-  **/
-  @Schema(description = "The channel defines the channel for selling product offerings.")
-
-  @Valid
-
-  public List<ChannelRef> getChannel() {
-    return channel;
-  }
-
-  public void setChannel(List<ChannelRef> channel) {
-    this.channel = channel;
-  }
-
-  public ProductOfferingUpdate marketSegment(List<MarketSegmentRef> marketSegment) {
-    this.marketSegment = marketSegment;
-    return this;
-  }
-
-  public ProductOfferingUpdate addMarketSegmentItem(MarketSegmentRef marketSegmentItem) {
-    if (this.marketSegment == null) {
-      this.marketSegment = new ArrayList<>();
-    }
-    this.marketSegment.add(marketSegmentItem);
-    return this;
-  }
-
-  /**
-   * provides references to the corresponding market segment as target of product offerings. A market segment is grouping of Parties, GeographicAreas, SalesChannels, and so forth.
-   * @return marketSegment
-  **/
-  @Schema(description = "provides references to the corresponding market segment as target of product offerings. A market segment is grouping of Parties, GeographicAreas, SalesChannels, and so forth.")
-
-  @Valid
-
-  public List<MarketSegmentRef> getMarketSegment() {
-    return marketSegment;
-  }
-
-  public void setMarketSegment(List<MarketSegmentRef> marketSegment) {
-    this.marketSegment = marketSegment;
-  }
-
-  public ProductOfferingUpdate place(List<PlaceRef> place) {
-    this.place = place;
-    return this;
-  }
-
-  public ProductOfferingUpdate addPlaceItem(PlaceRef placeItem) {
-    if (this.place == null) {
-      this.place = new ArrayList<>();
-    }
-    this.place.add(placeItem);
-    return this;
-  }
-
-  /**
-   * Place defines the places where the products are sold or delivered.
-   * @return place
-  **/
-  @Schema(description = "Place defines the places where the products are sold or delivered.")
-
-  @Valid
-
-  public List<PlaceRef> getPlace() {
-    return place;
-  }
-
-  public void setPlace(List<PlaceRef> place) {
-    this.place = place;
-  }
-
-  public ProductOfferingUpdate prodSpecCharValueUse(List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-    this.prodSpecCharValueUse = prodSpecCharValueUse;
-    return this;
-  }
-
-  public ProductOfferingUpdate addProdSpecCharValueUseItem(ProductSpecificationCharacteristicValueUse prodSpecCharValueUseItem) {
-    if (this.prodSpecCharValueUse == null) {
-      this.prodSpecCharValueUse = new ArrayList<>();
-    }
-    this.prodSpecCharValueUse.add(prodSpecCharValueUseItem);
-    return this;
-  }
-
-  /**
-   * A use of the ProductSpecificationCharacteristicValue by a ProductOffering to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering level. For example, a characteristic 'Color' might have values White, Blue, Green, and Red. But, the list of values can be restricted to e.g. White and Blue in an associated product offering. It should be noted that the list of values in 'ProductSpecificationCharacteristicValueUse' is a strict subset of the list of values as defined in the corresponding product specification characteristics.
-   * @return prodSpecCharValueUse
-  **/
-  @Schema(description = "A use of the ProductSpecificationCharacteristicValue by a ProductOffering to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering level. For example, a characteristic 'Color' might have values White, Blue, Green, and Red. But, the list of values can be restricted to e.g. White and Blue in an associated product offering. It should be noted that the list of values in 'ProductSpecificationCharacteristicValueUse' is a strict subset of the list of values as defined in the corresponding product specification characteristics.")
-
-  @Valid
-
-  public List<ProductSpecificationCharacteristicValueUse> getProdSpecCharValueUse() {
-    return prodSpecCharValueUse;
-  }
-
-  public void setProdSpecCharValueUse(List<ProductSpecificationCharacteristicValueUse> prodSpecCharValueUse) {
-    this.prodSpecCharValueUse = prodSpecCharValueUse;
-  }
-
-  public ProductOfferingUpdate productOfferingPrice(List<ProductOfferingPriceRef> productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  public ProductOfferingUpdate addProductOfferingPriceItem(ProductOfferingPriceRef productOfferingPriceItem) {
-    if (this.productOfferingPrice == null) {
-      this.productOfferingPrice = new ArrayList<>();
-    }
-    this.productOfferingPrice.add(productOfferingPriceItem);
-    return this;
-  }
-
-  /**
-   * An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased. The price is valid for a defined period of time and may not represent the actual price paid by a customer.
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased. The price is valid for a defined period of time and may not represent the actual price paid by a customer.")
-
-  @Valid
-
-  public List<ProductOfferingPriceRef> getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(List<ProductOfferingPriceRef> productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-  public ProductOfferingUpdate productOfferingTerm(List<ProductOfferingTerm> productOfferingTerm) {
-    this.productOfferingTerm = productOfferingTerm;
-    return this;
-  }
-
-  public ProductOfferingUpdate addProductOfferingTermItem(ProductOfferingTerm productOfferingTermItem) {
-    if (this.productOfferingTerm == null) {
-      this.productOfferingTerm = new ArrayList<>();
-    }
-    this.productOfferingTerm.add(productOfferingTermItem);
-    return this;
-  }
-
-  /**
-   * A condition under which a ProductOffering is made available to Customers. For instance, a productOffering can be offered with multiple commitment periods.
-   * @return productOfferingTerm
-  **/
-  @Schema(description = "A condition under which a ProductOffering is made available to Customers. For instance, a productOffering can be offered with multiple commitment periods.")
-
-  @Valid
-
-  public List<ProductOfferingTerm> getProductOfferingTerm() {
-    return productOfferingTerm;
-  }
-
-  public void setProductOfferingTerm(List<ProductOfferingTerm> productOfferingTerm) {
-    this.productOfferingTerm = productOfferingTerm;
-  }
-
-  public ProductOfferingUpdate productSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-    return this;
-  }
-
-  /**
-   * A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.
-   * @return productSpecification
-  **/
-  @Schema(description = "A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-
-  @Valid
-
-  public ProductSpecificationRef getProductSpecification() {
-    return productSpecification;
-  }
-
-  public void setProductSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-  }
-
-  public ProductOfferingUpdate resourceCandidate(ResourceCandidateRef resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-    return this;
-  }
-
-  /**
-   * A resource candidate is an entity that makes a ResourceSpecification available to a catalog.
-   * @return resourceCandidate
-  **/
-  @Schema(description = "A resource candidate is an entity that makes a ResourceSpecification available to a catalog.")
-
-  @Valid
-
-  public ResourceCandidateRef getResourceCandidate() {
-    return resourceCandidate;
-  }
-
-  public void setResourceCandidate(ResourceCandidateRef resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-  }
-
-  public ProductOfferingUpdate serviceCandidate(ServiceCandidateRef serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-    return this;
-  }
-
-  /**
-   * ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.
-   * @return serviceCandidate
-  **/
-  @Schema(description = "ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.")
-
-  @Valid
-
-  public ServiceCandidateRef getServiceCandidate() {
-    return serviceCandidate;
-  }
-
-  public void setServiceCandidate(ServiceCandidateRef serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-  }
-
-  public ProductOfferingUpdate serviceLevelAgreement(SLARef serviceLevelAgreement) {
-    this.serviceLevelAgreement = serviceLevelAgreement;
-    return this;
-  }
-
-  /**
-   * A service level agreement (SLA) is a type of agreement that represents a formal negotiated agreement between two parties designed to create a common understanding about products, services, priorities, responsibilities, and so forth. The SLA is a set of appropriate procedures and targets formally or informally agreed between parties in order to achieve and maintain specified Quality of Service.
-   * @return serviceLevelAgreement
-  **/
-  @Schema(description = "A service level agreement (SLA) is a type of agreement that represents a formal negotiated agreement between two parties designed to create a common understanding about products, services, priorities, responsibilities, and so forth. The SLA is a set of appropriate procedures and targets formally or informally agreed between parties in order to achieve and maintain specified Quality of Service.")
-
-  @Valid
-
-  public SLARef getServiceLevelAgreement() {
-    return serviceLevelAgreement;
-  }
-
-  public void setServiceLevelAgreement(SLARef serviceLevelAgreement) {
-    this.serviceLevelAgreement = serviceLevelAgreement;
-  }
-
-  public ProductOfferingUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the productOffering is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the productOffering is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ProductOfferingUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingUpdate productOfferingUpdate = (ProductOfferingUpdate) o;
-    return Objects.equals(this.description, productOfferingUpdate.description) &&
-        Objects.equals(this.isBundle, productOfferingUpdate.isBundle) &&
-        Objects.equals(this.isSellable, productOfferingUpdate.isSellable) &&
-        Objects.equals(this.lifecycleStatus, productOfferingUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, productOfferingUpdate.name) &&
-        Objects.equals(this.statusReason, productOfferingUpdate.statusReason) &&
-        Objects.equals(this.version, productOfferingUpdate.version) &&
-        Objects.equals(this.agreement, productOfferingUpdate.agreement) &&
-        Objects.equals(this.attachment, productOfferingUpdate.attachment) &&
-        Objects.equals(this.bundledProductOffering, productOfferingUpdate.bundledProductOffering) &&
-        Objects.equals(this.category, productOfferingUpdate.category) &&
-        Objects.equals(this.channel, productOfferingUpdate.channel) &&
-        Objects.equals(this.marketSegment, productOfferingUpdate.marketSegment) &&
-        Objects.equals(this.place, productOfferingUpdate.place) &&
-        Objects.equals(this.prodSpecCharValueUse, productOfferingUpdate.prodSpecCharValueUse) &&
-        Objects.equals(this.productOfferingPrice, productOfferingUpdate.productOfferingPrice) &&
-        Objects.equals(this.productOfferingTerm, productOfferingUpdate.productOfferingTerm) &&
-        Objects.equals(this.productSpecification, productOfferingUpdate.productSpecification) &&
-        Objects.equals(this.resourceCandidate, productOfferingUpdate.resourceCandidate) &&
-        Objects.equals(this.serviceCandidate, productOfferingUpdate.serviceCandidate) &&
-        Objects.equals(this.serviceLevelAgreement, productOfferingUpdate.serviceLevelAgreement) &&
-        Objects.equals(this.validFor, productOfferingUpdate.validFor) &&
-        Objects.equals(this.baseType, productOfferingUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingUpdate.schemaLocation) &&
-        Objects.equals(this.type, productOfferingUpdate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, isBundle, isSellable, lifecycleStatus, name, statusReason, version, agreement, attachment, bundledProductOffering, category, channel, marketSegment, place, prodSpecCharValueUse, productOfferingPrice, productOfferingTerm, productSpecification, resourceCandidate, serviceCandidate, serviceLevelAgreement, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    isSellable: ").append(toIndentedString(isSellable)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    bundledProductOffering: ").append(toIndentedString(bundledProductOffering)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-    sb.append("    marketSegment: ").append(toIndentedString(marketSegment)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    prodSpecCharValueUse: ").append(toIndentedString(prodSpecCharValueUse)).append("\n");
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("    productOfferingTerm: ").append(toIndentedString(productOfferingTerm)).append("\n");
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("    serviceLevelAgreement: ").append(toIndentedString(serviceLevelAgreement)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecification.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecification.java
deleted file mode 100644
index 3e0944658e7bd296b23d4b802a440dc86cdb3f44..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecification.java
+++ /dev/null
@@ -1,524 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Is a detailed description of a tangible or intangible object made available
- * externally in the form of a ProductOffering to customers or other parties
- * playing a party role.
- */
-@Schema(description = "Is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class ProductSpecification extends BaseEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("brand")
-	private String brand = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("productNumber")
-	private String productNumber = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AttachmentRefOrValue> attachment =  new HashSet<>();
-
-	@JsonProperty("bundledProductSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<BundledProductSpecification> bundledProductSpecification =  new HashSet<>();
-
-	@JsonProperty("productSpecCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristic> productSpecCharacteristic =  new HashSet<>();
-
-	@JsonProperty("productSpecificationRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationRelationship> productSpecificationRelationship =  new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty =  new HashSet<>();
-
-	@JsonProperty("resourceSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceSpecificationRef> resourceSpecification =  new HashSet<>();
-
-	@JsonProperty("serviceSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecificationRef> serviceSpecification =  new HashSet<>();
-
-	@JsonProperty("targetProductSchema")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinColumn(referencedColumnName = "uuid")
-	private TargetProductSchema targetProductSchema = null;
-
-	
-
-	public ProductSpecification id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the product specification
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the product specification")
-
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	
-
-	/**
-	 * The manufacturer or trademark of the specification
-	 * 
-	 * @return brand
-	 **/
-	@Schema(description = "The manufacturer or trademark of the specification")
-
-	public String getBrand() {
-		return brand;
-	}
-
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-
-	
-
-	public ProductSpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether a productSpecification represents a single
-	 * productSpecification (false), or a bundle of productSpecification (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether a productSpecification represents a single productSpecification (false), or a bundle of productSpecification (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-
-	public ProductSpecification productNumber(String productNumber) {
-		this.productNumber = productNumber;
-		return this;
-	}
-
-	/**
-	 * An identification number assigned to uniquely identity the specification
-	 * 
-	 * @return productNumber
-	 **/
-	@Schema(description = "An identification number assigned to uniquely identity the specification")
-
-	public String getProductNumber() {
-		return productNumber;
-	}
-
-	public void setProductNumber(String productNumber) {
-		this.productNumber = productNumber;
-	}
-
-
-	public ProductSpecification attachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ProductSpecification addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Complements the description of an element (for instance a product) through
-	 * video, pictures...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Complements the description of an element (for instance a product) through video, pictures...")
-
-	@Valid
-
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ProductSpecification bundledProductSpecification(
-			Set<BundledProductSpecification> bundledProductSpecification) {
-		this.bundledProductSpecification = bundledProductSpecification;
-		return this;
-	}
-
-	public ProductSpecification addBundledProductSpecificationItem(
-			BundledProductSpecification bundledProductSpecificationItem) {
-		if (this.bundledProductSpecification == null) {
-			this.bundledProductSpecification = new HashSet<>();
-		}
-		this.bundledProductSpecification.add(bundledProductSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A type of ProductSpecification that belongs to a grouping of
-	 * ProductSpecifications made available to the market. It inherits of all
-	 * attributes of ProductSpecification.
-	 * 
-	 * @return bundledProductSpecification
-	 **/
-	@Schema(description = "A type of ProductSpecification that belongs to a grouping of ProductSpecifications made available to the market. It inherits of all attributes of ProductSpecification.")
-
-	@Valid
-
-	public Set<BundledProductSpecification> getBundledProductSpecification() {
-		return bundledProductSpecification;
-	}
-
-	public void setBundledProductSpecification(Set<BundledProductSpecification> bundledProductSpecification) {
-		this.bundledProductSpecification = bundledProductSpecification;
-	}
-
-	public ProductSpecification productSpecCharacteristic(
-			Set<ProductSpecificationCharacteristic> productSpecCharacteristic) {
-		this.productSpecCharacteristic = productSpecCharacteristic;
-		return this;
-	}
-
-	public ProductSpecification addProductSpecCharacteristicItem(
-			ProductSpecificationCharacteristic productSpecCharacteristicItem) {
-		if (this.productSpecCharacteristic == null) {
-			this.productSpecCharacteristic = new HashSet<>();
-		}
-		this.productSpecCharacteristic.add(productSpecCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A characteristic quality or distinctive feature of a ProductSpecification.
-	 * The characteristic can be take on a discrete value, such as color, can take
-	 * on a range of values, (for example, sensitivity of 100-240 mV), or can be
-	 * derived from a formula (for example, usage time (hrs) = 30 - talk time *3).
-	 * Certain characteristics, such as color, may be configured during the ordering
-	 * or some other process.
-	 * 
-	 * @return productSpecCharacteristic
-	 **/
-	@Schema(description = "A characteristic quality or distinctive feature of a ProductSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristic> getProductSpecCharacteristic() {
-		return productSpecCharacteristic;
-	}
-
-	public void setProductSpecCharacteristic(Set<ProductSpecificationCharacteristic> productSpecCharacteristic) {
-		this.productSpecCharacteristic = productSpecCharacteristic;
-	}
-
-	public ProductSpecification productSpecificationRelationship(
-			Set<ProductSpecificationRelationship> productSpecificationRelationship) {
-		this.productSpecificationRelationship = productSpecificationRelationship;
-		return this;
-	}
-
-	public ProductSpecification addProductSpecificationRelationshipItem(
-			ProductSpecificationRelationship productSpecificationRelationshipItem) {
-		if (this.productSpecificationRelationship == null) {
-			this.productSpecificationRelationship = new HashSet<>();
-		}
-		this.productSpecificationRelationship.add(productSpecificationRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A migration, substitution, dependency or exclusivity relationship
-	 * between/among product specifications.
-	 * 
-	 * @return productSpecificationRelationship
-	 **/
-	@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among product specifications.")
-
-	@Valid
-
-	public Set<ProductSpecificationRelationship> getProductSpecificationRelationship() {
-		return productSpecificationRelationship;
-	}
-
-	public void setProductSpecificationRelationship(
-			Set<ProductSpecificationRelationship> productSpecificationRelationship) {
-		this.productSpecificationRelationship = productSpecificationRelationship;
-	}
-
-	public ProductSpecification relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ProductSpecification addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A related party defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A related party defines party or party role linked to a specific entity.")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ProductSpecification resourceSpecification(Set<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	public ProductSpecification addResourceSpecificationItem(ResourceSpecificationRef resourceSpecificationItem) {
-		if (this.resourceSpecification == null) {
-			this.resourceSpecification = new HashSet<>();
-		}
-		this.resourceSpecification.add(resourceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * The ResourceSpecification is required to realize a ProductSpecification.
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "The ResourceSpecification is required to realize a ProductSpecification.")
-
-	@Valid
-
-	public Set<ResourceSpecificationRef> getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(Set<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	public ProductSpecification serviceSpecification(Set<ServiceSpecificationRef> serviceSpecification) {
-		this.serviceSpecification = serviceSpecification;
-		return this;
-	}
-
-	public ProductSpecification addServiceSpecificationItem(ServiceSpecificationRef serviceSpecificationItem) {
-		if (this.serviceSpecification == null) {
-			this.serviceSpecification = new HashSet<>();
-		}
-		this.serviceSpecification.add(serviceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * ServiceSpecification(s) required to realize a ProductSpecification.
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "ServiceSpecification(s) required to realize a ProductSpecification.")
-
-	@Valid
-
-	public Set<ServiceSpecificationRef> getServiceSpecification() {
-		return serviceSpecification;
-	}
-
-	public void setServiceSpecification(Set<ServiceSpecificationRef> serviceSpecification) {
-		this.serviceSpecification = serviceSpecification;
-	}
-
-	public ProductSpecification targetProductSchema(TargetProductSchema targetProductSchema) {
-		this.targetProductSchema = targetProductSchema;
-		return this;
-	}
-
-	/**
-	 * A target product schema reference. The reference object to the schema and
-	 * type of target product which is described by product specification.
-	 * 
-	 * @return targetProductSchema
-	 **/
-	@Schema(description = "A target product schema reference. The reference object to the schema and type of target product which is described by product specification.")
-
-	@Valid
-
-	public TargetProductSchema getTargetProductSchema() {
-		return targetProductSchema;
-	}
-
-	public void setTargetProductSchema(TargetProductSchema targetProductSchema) {
-		this.targetProductSchema = targetProductSchema;
-	}
-
-	
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductSpecification productSpecification = (ProductSpecification) o;
-		return Objects.equals(this.id, productSpecification.id) && Objects.equals(this.href, productSpecification.href)
-				&& Objects.equals(this.brand, productSpecification.brand)
-				&& Objects.equals(this.description, productSpecification.description)
-				&& Objects.equals(this.isBundle, productSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, productSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, productSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, productSpecification.name)
-				&& Objects.equals(this.productNumber, productSpecification.productNumber)
-				&& Objects.equals(this.version, productSpecification.version)
-				&& Objects.equals(this.attachment, productSpecification.attachment)
-				&& Objects.equals(this.bundledProductSpecification, productSpecification.bundledProductSpecification)
-				&& Objects.equals(this.productSpecCharacteristic, productSpecification.productSpecCharacteristic)
-				&& Objects.equals(this.productSpecificationRelationship,
-						productSpecification.productSpecificationRelationship)
-				&& Objects.equals(this.relatedParty, productSpecification.relatedParty)
-				&& Objects.equals(this.resourceSpecification, productSpecification.resourceSpecification)
-				&& Objects.equals(this.serviceSpecification, productSpecification.serviceSpecification)
-				&& Objects.equals(this.targetProductSchema, productSpecification.targetProductSchema)
-				&& Objects.equals(this.validFor, productSpecification.validFor)
-				&& Objects.equals(this.baseType, productSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, productSpecification.schemaLocation)
-				&& Objects.equals(this.type, productSpecification.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, brand, description, isBundle, lastUpdate, lifecycleStatus, name, productNumber,
-//				version, attachment, bundledProductSpecification, productSpecCharacteristic,
-//				productSpecificationRelationship, relatedParty, resourceSpecification, serviceSpecification,
-//				targetProductSchema, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    brand: ").append(toIndentedString(brand)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    productNumber: ").append(toIndentedString(productNumber)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    bundledProductSpecification: ").append(toIndentedString(bundledProductSpecification))
-				.append("\n");
-		sb.append("    productSpecCharacteristic: ").append(toIndentedString(productSpecCharacteristic)).append("\n");
-		sb.append("    productSpecificationRelationship: ").append(toIndentedString(productSpecificationRelationship))
-				.append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-		sb.append("    targetProductSchema: ").append(toIndentedString(targetProductSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristic.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristic.java
deleted file mode 100644
index 9f5f3bd18d8f31ff88b90f92bf26e4aa937df72b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristic.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A characteristic quality or distinctive feature of a ProductSpecification.
- * The characteristic can be take on a discrete value, such as color, can take
- * on a range of values, (for example, sensitivity of 100-240 mV), or can be
- * derived from a formula (for example, usage time (hrs) &#x3D; 30 - talk time
- * *3). Certain characteristics, such as color, may be configured during the
- * ordering or some other process.
- */
-@Schema(description = "A characteristic quality or distinctive feature of a ProductSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-
-@Entity(name = "ProdSpecChar")
-@Table(name = "ProdSpecChar")
-public class ProductSpecificationCharacteristic extends BaseEntity {
-	@JsonProperty("configurable")
-	private Boolean configurable = null;
-
-	@JsonProperty("extensible")
-	private Boolean extensible = null;
-
-	@JsonProperty("isUnique")
-	private Boolean isUnique = null;
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("productSpecCharRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristicRelationship> productSpecCharRelationship = new HashSet<>();
-
-	@JsonProperty("productSpecCharacteristicValue")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue = new HashSet<>();
-
-
-	public ProductSpecificationCharacteristic configurable(Boolean configurable) {
-		this.configurable = configurable;
-		return this;
-	}
-
-	/**
-	 * If true, the Boolean indicates that the ProductSpecificationCharacteristic is
-	 * configurable
-	 * 
-	 * @return configurable
-	 **/
-	@Schema(description = "If true, the Boolean indicates that the ProductSpecificationCharacteristic is configurable")
-
-	public Boolean isConfigurable() {
-		return configurable;
-	}
-
-	public void setConfigurable(Boolean configurable) {
-		this.configurable = configurable;
-	}
-
-	
-
-	public ProductSpecificationCharacteristic extensible(Boolean extensible) {
-		this.extensible = extensible;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies that the values for the characteristic can be
-	 * extended by adding new values when instantiating a characteristic for a
-	 * product
-	 * 
-	 * @return extensible
-	 **/
-	@Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a product")
-
-	public Boolean isExtensible() {
-		return extensible;
-	}
-
-	public void setExtensible(Boolean extensible) {
-		this.extensible = extensible;
-	}
-
-	public ProductSpecificationCharacteristic isUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies if a value is unique for the specification.
-	 * Possible values are; \"unique while value is in effect\" and \"unique whether
-	 * value is in effect or not\"
-	 * 
-	 * @return isUnique
-	 **/
-	@Schema(description = "An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"")
-
-	public Boolean isIsUnique() {
-		return isUnique;
-	}
-
-	public void setIsUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-	}
-
-	public ProductSpecificationCharacteristic maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where five is
-	 * the value for the maxCardinality
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public ProductSpecificationCharacteristic minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where zero is
-	 * the value for the minCardinality
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-	public ProductSpecificationCharacteristic regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A rule or principle represented in regular expression used to derive the
-	 * value of a characteristic value
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ProductSpecificationCharacteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ProductSpecificationCharacteristic productSpecCharRelationship(
-			Set<ProductSpecificationCharacteristicRelationship> productSpecCharRelationship) {
-		this.productSpecCharRelationship = productSpecCharRelationship;
-		return this;
-	}
-
-	public ProductSpecificationCharacteristic addProductSpecCharRelationshipItem(
-			ProductSpecificationCharacteristicRelationship productSpecCharRelationshipItem) {
-		if (this.productSpecCharRelationship == null) {
-			this.productSpecCharRelationship = new HashSet<>();
-		}
-		this.productSpecCharRelationship.add(productSpecCharRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * An aggregation, migration, substitution, dependency or exclusivity
-	 * relationship between/among Specification Characteristics.
-	 * 
-	 * @return productSpecCharRelationship
-	 **/
-	@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among Specification Characteristics.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristicRelationship> getProductSpecCharRelationship() {
-		return productSpecCharRelationship;
-	}
-
-	public void setProductSpecCharRelationship(
-			Set<ProductSpecificationCharacteristicRelationship> productSpecCharRelationship) {
-		this.productSpecCharRelationship = productSpecCharRelationship;
-	}
-
-	public ProductSpecificationCharacteristic productSpecCharacteristicValue(
-			Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue) {
-		this.productSpecCharacteristicValue = productSpecCharacteristicValue;
-		return this;
-	}
-
-	public ProductSpecificationCharacteristic addProductSpecCharacteristicValueItem(
-			ProductSpecificationCharacteristicValue productSpecCharacteristicValueItem) {
-		if (this.productSpecCharacteristicValue == null) {
-			this.productSpecCharacteristicValue = new HashSet<>();
-		}
-		this.productSpecCharacteristicValue.add(productSpecCharacteristicValueItem);
-		return this;
-	}
-
-	/**
-	 * A ProductSpecificationCharacteristicValue object is used to define a set of
-	 * attributes, each of which can be assigned to a corresponding set of
-	 * attributes in a ProductSpecificationCharacteristic object. The values of the
-	 * attributes in the ProductSpecificationCharacteristicValue object describe the
-	 * values of the attributes that a corresponding
-	 * ProductSpecificationCharacteristic object can take on.
-	 * 
-	 * @return productSpecCharacteristicValue
-	 **/
-	@Schema(description = "A ProductSpecificationCharacteristicValue object is used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a ProductSpecificationCharacteristic object. The values of the attributes in the ProductSpecificationCharacteristicValue object describe the values of the attributes that a corresponding ProductSpecificationCharacteristic object can take on.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristicValue> getProductSpecCharacteristicValue() {
-		return productSpecCharacteristicValue;
-	}
-
-	public void setProductSpecCharacteristicValue(
-			Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue) {
-		this.productSpecCharacteristicValue = productSpecCharacteristicValue;
-	}
-
-	
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductSpecificationCharacteristic productSpecificationCharacteristic = (ProductSpecificationCharacteristic) o;
-		return Objects.equals(this.configurable, productSpecificationCharacteristic.configurable)
-				&& Objects.equals(this.description, productSpecificationCharacteristic.description)
-				&& Objects.equals(this.extensible, productSpecificationCharacteristic.extensible)
-				&& Objects.equals(this.isUnique, productSpecificationCharacteristic.isUnique)
-				&& Objects.equals(this.maxCardinality, productSpecificationCharacteristic.maxCardinality)
-				&& Objects.equals(this.minCardinality, productSpecificationCharacteristic.minCardinality)
-				&& Objects.equals(this.name, productSpecificationCharacteristic.name)
-				&& Objects.equals(this.regex, productSpecificationCharacteristic.regex)
-				&& Objects.equals(this.valueType, productSpecificationCharacteristic.valueType)
-				&& Objects.equals(this.productSpecCharRelationship,
-						productSpecificationCharacteristic.productSpecCharRelationship)
-				&& Objects.equals(this.productSpecCharacteristicValue,
-						productSpecificationCharacteristic.productSpecCharacteristicValue)
-				&& Objects.equals(this.validFor, productSpecificationCharacteristic.validFor)
-				&& Objects.equals(this.baseType, productSpecificationCharacteristic.baseType)
-				&& Objects.equals(this.schemaLocation, productSpecificationCharacteristic.schemaLocation)
-				&& Objects.equals(this.type, productSpecificationCharacteristic.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(configurable, description, extensible, isUnique, maxCardinality, minCardinality, name,
-//				regex, valueType, productSpecCharRelationship, productSpecCharacteristicValue, validFor, baseType,
-//				schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductSpecificationCharacteristic {\n");
-
-		sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-		sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    productSpecCharRelationship: ").append(toIndentedString(productSpecCharRelationship))
-				.append("\n");
-		sb.append("    productSpecCharacteristicValue: ").append(toIndentedString(productSpecCharacteristicValue))
-				.append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicRelationship.java
deleted file mode 100644
index a3408039d45aee5f1ce84e12b44944b84e94875b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicRelationship.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity relationship between/among productSpecificationCharacteristics.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among productSpecificationCharacteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-
-@Entity(name = "ProdSpecCharRelationship")
-@Table(name = "ProdSpecCharRelationship")
-public class ProductSpecificationCharacteristicRelationship   extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("charSpecSeq")
-  private Integer charSpecSeq = null;
-
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-
-  public ProductSpecificationCharacteristicRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * the identifier of the associated product specification
-   * @return id
-  **/
-  @Schema(description = "the identifier of the associated product specification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public ProductSpecificationCharacteristicRelationship charSpecSeq(Integer charSpecSeq) {
-    this.charSpecSeq = charSpecSeq;
-    return this;
-  }
-
-  /**
-   * The order in which a CharacteristicSpecification appears within another CharacteristicSpecification that defines a grouping of CharacteristicSpecifications.  For example, a grouping may represent the name of an individual. The given name is first, the middle name is second, and the last name is third.
-   * @return charSpecSeq
-  **/
-  @Schema(description = "The order in which a CharacteristicSpecification appears within another CharacteristicSpecification that defines a grouping of CharacteristicSpecifications.  For example, a grouping may represent the name of an individual. The given name is first, the middle name is second, and the last name is third.")
-
-
-  public Integer getCharSpecSeq() {
-    return charSpecSeq;
-  }
-
-  public void setCharSpecSeq(Integer charSpecSeq) {
-    this.charSpecSeq = charSpecSeq;
-  }
-
-
-  public ProductSpecificationCharacteristicRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as aggregation, migration, substitution, dependency, exclusivity
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship such as aggregation, migration, substitution, dependency, exclusivity")
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationCharacteristicRelationship productSpecificationCharacteristicRelationship = (ProductSpecificationCharacteristicRelationship) o;
-    return Objects.equals(this.id, productSpecificationCharacteristicRelationship.id) &&
-        Objects.equals(this.href, productSpecificationCharacteristicRelationship.href) &&
-        Objects.equals(this.charSpecSeq, productSpecificationCharacteristicRelationship.charSpecSeq) &&
-        Objects.equals(this.name, productSpecificationCharacteristicRelationship.name) &&
-        Objects.equals(this.relationshipType, productSpecificationCharacteristicRelationship.relationshipType) &&
-        Objects.equals(this.validFor, productSpecificationCharacteristicRelationship.validFor) &&
-        Objects.equals(this.baseType, productSpecificationCharacteristicRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, productSpecificationCharacteristicRelationship.schemaLocation) &&
-        Objects.equals(this.type, productSpecificationCharacteristicRelationship.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, charSpecSeq, name, relationshipType, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationCharacteristicRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    charSpecSeq: ").append(toIndentedString(charSpecSeq)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValue.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValue.java
deleted file mode 100644
index c8ecbe43dc9eaa1fcfcbc5d34fe957ba3bf674e2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValue.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A ProductSpecificationCharacteristicValue object is used to define a set of
- * attributes, each of which can be assigned to a corresponding set of
- * attributes in a ProductSpecificationCharacteristic object. The values of the
- * attributes in the ProductSpecificationCharacteristicValue object describe the
- * values of the attributes that a corresponding
- * ProductSpecificationCharacteristic object can take on.
- */
-@Schema(description = "A ProductSpecificationCharacteristicValue object is used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a ProductSpecificationCharacteristic object. The values of the attributes in the ProductSpecificationCharacteristicValue object describe the values of the attributes that a corresponding ProductSpecificationCharacteristic object can take on.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProdSpecCharValue")
-@Table(name = "ProdSpecCharValue")
-public class ProductSpecificationCharacteristicValue extends BaseRootEntity {
-	@JsonProperty("isDefault")
-	private Boolean isDefault = null;
-
-	@JsonProperty("rangeInterval")
-	private String rangeInterval = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("unitOfMeasure")
-	private String unitOfMeasure = null;
-
-	@JsonProperty("valueFrom")
-	private String valueFrom = null;
-
-	@JsonProperty("valueTo")
-	private String valueTo = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("value")
-	private Any value = null;
-	
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-	
-	
-	
-	public ProductSpecificationCharacteristicValue() {
-		
-	}
-
-	public ProductSpecificationCharacteristicValue(ProductSpecificationCharacteristicValue r) {
-		this();
-		isDefault = r.isDefault;
-		rangeInterval = r.rangeInterval;
-		regex = r.regex;
-		unitOfMeasure = r.unitOfMeasure;
-		valueFrom = r.valueFrom;
-		valueTo = r.valueTo;
-		valueType = r.valueType;
-		validFor = new TimePeriod( r.validFor );
-		value = new Any( r.value ) ;
-//		type = r.type;
-		baseType = r.baseType;
-	}
-
-	public ProductSpecificationCharacteristicValue isDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-		return this;
-	}
-
-	/**
-	 * Indicates if the value is the default value for a characteristic
-	 * 
-	 * @return isDefault
-	 **/
-	@Schema(description = "Indicates if the value is the default value for a characteristic")
-
-	public Boolean isIsDefault() {
-		return isDefault;
-	}
-
-	public void setIsDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-	}
-
-	public ProductSpecificationCharacteristicValue rangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies the inclusion or exclusion of the valueFrom and
-	 * valueTo attributes. If applicable, possible values are \"open\", \"closed\",
-	 * \"closedBottom\" and \"closedTop\".
-	 * 
-	 * @return rangeInterval
-	 **/
-	@Schema(description = "An indicator that specifies the inclusion or exclusion of the valueFrom and valueTo attributes. If applicable, possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-
-	public String getRangeInterval() {
-		return rangeInterval;
-	}
-
-	public void setRangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-	}
-
-	public ProductSpecificationCharacteristicValue regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * Regular expression to define constraint on the allowed value
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "Regular expression to define constraint on the allowed value")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ProductSpecificationCharacteristicValue unitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * A length, surface, volume, dry measure, liquid measure, money, weight, time,
-	 * and the like. In general, a determinate quantity or magnitude of the kind
-	 * designated, taken as a standard of comparison for others of the same kind, in
-	 * assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "A length, surface, volume, dry measure, liquid measure, money, weight, time, and the like. In general, a determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.")
-
-	public String getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	public ProductSpecificationCharacteristicValue valueFrom(String valueFrom) {
-		this.valueFrom = valueFrom;
-		return this;
-	}
-
-	/**
-	 * The low range value that a characteristic can take on
-	 * 
-	 * @return valueFrom
-	 **/
-	@Schema(description = "The low range value that a characteristic can take on")
-
-	public String getValueFrom() {
-		return valueFrom;
-	}
-
-	public void setValueFrom(String valueFrom) {
-		this.valueFrom = valueFrom;
-	}
-
-	public ProductSpecificationCharacteristicValue valueTo(String valueTo) {
-		this.valueTo = valueTo;
-		return this;
-	}
-	
-
-	/**
-	 * The period for which the entity is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the entity is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-
-
-	/**
-	 * The upper range value that a characteristic can take on
-	 * 
-	 * @return valueTo
-	 **/
-	@Schema(description = "The upper range value that a characteristic can take on")
-
-	public String getValueTo() {
-		return valueTo;
-	}
-
-	public void setValueTo(String valueTo) {
-		this.valueTo = valueTo;
-	}
-
-	public ProductSpecificationCharacteristicValue valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text,
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text, and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-
-
-	public ProductSpecificationCharacteristicValue value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * A discrete value that the characteristic can take on, or the actual value of
-	 * the characteristic
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "A discrete value that the characteristic can take on, or the actual value of the characteristic")
-
-	@Valid
-
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductSpecificationCharacteristicValue productSpecificationCharacteristicValue = (ProductSpecificationCharacteristicValue) o;
-		return Objects.equals(this.isDefault, productSpecificationCharacteristicValue.isDefault)
-				&& Objects.equals(this.rangeInterval, productSpecificationCharacteristicValue.rangeInterval)
-				&& Objects.equals(this.regex, productSpecificationCharacteristicValue.regex)
-				&& Objects.equals(this.unitOfMeasure, productSpecificationCharacteristicValue.unitOfMeasure)
-				&& Objects.equals(this.valueFrom, productSpecificationCharacteristicValue.valueFrom)
-				&& Objects.equals(this.valueTo, productSpecificationCharacteristicValue.valueTo)
-				&& Objects.equals(this.valueType, productSpecificationCharacteristicValue.valueType)
-				&& Objects.equals(this.validFor, productSpecificationCharacteristicValue.validFor)
-				&& Objects.equals(this.value, productSpecificationCharacteristicValue.value)
-				&& Objects.equals(this.baseType, productSpecificationCharacteristicValue.baseType)
-				&& Objects.equals(this.schemaLocation, productSpecificationCharacteristicValue.schemaLocation)
-				&& Objects.equals(this.type, productSpecificationCharacteristicValue.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(isDefault, rangeInterval, regex, unitOfMeasure, valueFrom, valueTo, valueType, validFor,
-//				value, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductSpecificationCharacteristicValue {\n");
-
-		sb.append("    isDefault: ").append(toIndentedString(isDefault)).append("\n");
-		sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-		sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValueUse.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValueUse.java
deleted file mode 100644
index 318a88f9ed49d743e095fc84ce99840efdf550d8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCharacteristicValueUse.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A use of the ProductSpecificationCharacteristicValue by a ProductOffering to
- * which additional properties (attributes) apply or override the properties of
- * similar properties contained in ProductSpecificationCharacteristicValue. It
- * should be noted that characteristics which their value(s) addressed by this
- * object must exist in corresponding product specification. The available
- * characteristic values for a ProductSpecificationCharacteristic in a Product
- * specification can be modified at the ProductOffering level. For example, a
- * characteristic &#39;Color&#39; might have values White, Blue, Green, and Red.
- * But, the list of values can be restricted to e.g. White and Blue in an
- * associated product offering. It should be noted that the list of values in
- * &#39;ProductSpecificationCharacteristicValueUse&#39; is a strict subset of
- * the list of values as defined in the corresponding product specification
- * characteristics.
- */
-@Schema(description = "A use of the ProductSpecificationCharacteristicValue by a ProductOffering to which additional properties (attributes) apply or override the properties of similar properties contained in ProductSpecificationCharacteristicValue. It should be noted that characteristics which their value(s) addressed by this object must exist in corresponding product specification. The available characteristic values for a ProductSpecificationCharacteristic in a Product specification can be modified at the ProductOffering level. For example, a characteristic 'Color' might have values White, Blue, Green, and Red. But, the list of values can be restricted to e.g. White and Blue in an associated product offering. It should be noted that the list of values in 'ProductSpecificationCharacteristicValueUse' is a strict subset of the list of values as defined in the corresponding product specification characteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProdSpecCharValueUse")
-@Table(name = "ProdSpecCharValueUse")
-public class ProductSpecificationCharacteristicValueUse extends BaseEntity {
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("productSpecCharacteristicValue")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue = new HashSet<>();
-
-	@JsonProperty("productSpecification")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinColumn(referencedColumnName = "uuid")
-	private ProductSpecificationRef productSpecification = null;
-
-	public ProductSpecificationCharacteristicValueUse() {
-		super();
-		this.baseType = "BaseEntity";
-		this.type = this.getClass().getName();
-	}
-	
-	public ProductSpecificationCharacteristicValueUse(ProductSpecificationCharacteristicValueUse src) {
-		this();
-		this.name = src.getName();
-		this.description = src.getDescription();
-		this.maxCardinality = src.getMaxCardinality();
-		this.minCardinality = src.getMinCardinality();		
-		this.valueType =src.valueType;
-		this.updateProductSpecCharacteristicValues(src.getProductSpecCharacteristicValue() );
-	}
-
-	public ProductSpecificationCharacteristicValueUse maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where five is
-	 * the value for the maxCardinality.
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public ProductSpecificationCharacteristicValueUse minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where zero is
-	 * the value for the minCardinality.
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-
-	public ProductSpecificationCharacteristicValueUse valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ProductSpecificationCharacteristicValueUse productSpecCharacteristicValue(
-			Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue) {
-		this.productSpecCharacteristicValue = productSpecCharacteristicValue;
-		return this;
-	}
-
-	public ProductSpecificationCharacteristicValueUse addProductSpecCharacteristicValueItem(
-			ProductSpecificationCharacteristicValue productSpecCharacteristicValueItem) {
-		if (this.productSpecCharacteristicValue == null) {
-			this.productSpecCharacteristicValue = new HashSet<>();
-		}
-		this.productSpecCharacteristicValue.add(productSpecCharacteristicValueItem);
-		return this;
-	}
-
-	/**
-	 * A number or text that can be assigned to a
-	 * ProductSpecificationCharacteristic.
-	 * 
-	 * @return productSpecCharacteristicValue
-	 **/
-	@Schema(description = "A number or text that can be assigned to a ProductSpecificationCharacteristic.")
-
-	@Valid
-
-	public Set<ProductSpecificationCharacteristicValue> getProductSpecCharacteristicValue() {
-		return productSpecCharacteristicValue;
-	}
-
-	public void setProductSpecCharacteristicValue(
-			Set<ProductSpecificationCharacteristicValue> productSpecCharacteristicValue) {
-		this.productSpecCharacteristicValue = productSpecCharacteristicValue;
-	}
-
-	public ProductSpecificationCharacteristicValueUse productSpecification(
-			ProductSpecificationRef productSpecification) {
-		this.productSpecification = productSpecification;
-		return this;
-	}
-
-	/**
-	 * A ProductSpecification is a detailed description of a tangible or intangible
-	 * object made available externally in the form of a ProductOffering to
-	 * customers or other parties playing a party role.
-	 * 
-	 * @return productSpecification
-	 **/
-	@Schema(description = "A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-
-	@Valid
-
-	public ProductSpecificationRef getProductSpecification() {
-		return productSpecification;
-	}
-
-	public void setProductSpecification(ProductSpecificationRef productSpecification) {
-		this.productSpecification = productSpecification;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductSpecificationCharacteristicValueUse productSpecificationCharacteristicValueUse = (ProductSpecificationCharacteristicValueUse) o;
-		return Objects.equals(this.description, productSpecificationCharacteristicValueUse.description)
-				&& Objects.equals(this.maxCardinality, productSpecificationCharacteristicValueUse.maxCardinality)
-				&& Objects.equals(this.minCardinality, productSpecificationCharacteristicValueUse.minCardinality)
-				&& Objects.equals(this.name, productSpecificationCharacteristicValueUse.name)
-				&& Objects.equals(this.valueType, productSpecificationCharacteristicValueUse.valueType)
-				&& Objects.equals(this.productSpecCharacteristicValue,
-						productSpecificationCharacteristicValueUse.productSpecCharacteristicValue)
-				&& Objects.equals(this.productSpecification,
-						productSpecificationCharacteristicValueUse.productSpecification)
-				&& Objects.equals(this.validFor, productSpecificationCharacteristicValueUse.validFor)
-				&& Objects.equals(this.baseType, productSpecificationCharacteristicValueUse.baseType)
-				&& Objects.equals(this.schemaLocation, productSpecificationCharacteristicValueUse.schemaLocation)
-				&& Objects.equals(this.type, productSpecificationCharacteristicValueUse.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, maxCardinality, minCardinality, name, valueType, productSpecCharacteristicValue, productSpecification, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductSpecificationCharacteristicValueUse {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    productSpecCharacteristicValue: ").append(toIndentedString(productSpecCharacteristicValue))
-				.append("\n");
-		sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(ProductSpecificationCharacteristicValueUse src) {
-		this.name = src.getName();
-		this.description = src.getDescription();
-		this.maxCardinality = src.getMaxCardinality();
-		this.minCardinality = src.getMinCardinality();		
-		this.updateProductSpecCharacteristicValues(src.getProductSpecCharacteristicValue() );
-		
-	}
-
-	private void updateProductSpecCharacteristicValues(
-			@Valid Set<ProductSpecificationCharacteristicValue> srcSet) {
-		Map<Integer, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (ProductSpecificationCharacteristicValue r : srcSet) {
-
-			boolean valueExists = false;
-			for (ProductSpecificationCharacteristicValue thisCharVal : this.productSpecCharacteristicValue) {
-				if ( thisCharVal.hashCode() == r.hashCode() ) {
-					valueExists = true;
-					idAddedUpdated.put(thisCharVal.hashCode(), true);
-					break;
-				}
-			}
-			
-			if (!valueExists) {
-				ProductSpecificationCharacteristicValue nr = new ProductSpecificationCharacteristicValue( r );
-				this.addProductSpecCharacteristicValueItem( nr );
-				idAddedUpdated.put( nr.hashCode(), true);
-			}
-			
-		}
-		
-		/**
-		 * remove those that don't exist anymore
-		 */
-		
-		List<ProductSpecificationCharacteristicValue> toRemove = new ArrayList<>();
-		for (ProductSpecificationCharacteristicValue ss : this.productSpecCharacteristicValue) {
-			if ( idAddedUpdated.get( ss.hashCode() ) == null ) {
-				toRemove.add(ss);
-			}
-		}
-		
-		for (ProductSpecificationCharacteristicValue r : toRemove) {
-			this.productSpecCharacteristicValue.remove(r);
-		}
-	}
-
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreate.java
deleted file mode 100644
index 9d5a9dbfbd6ad40f58e4cd1896bdb4a28f7a2dd5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreate.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role. Skipped properties: id,href
- */
-@Schema(description = "Is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationCreate extends ProductSpecificationUpdate  {
- 
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-  public ProductSpecificationCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationCreate productSpecificationCreate = (ProductSpecificationCreate) o;
-    return Objects.equals(this.brand, productSpecificationCreate.brand) &&
-        Objects.equals(this.description, productSpecificationCreate.description) &&
-        Objects.equals(this.isBundle, productSpecificationCreate.isBundle) &&
-        Objects.equals(this.lastUpdate, productSpecificationCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, productSpecificationCreate.lifecycleStatus) &&
-        Objects.equals(this.name, productSpecificationCreate.name) &&
-        Objects.equals(this.productNumber, productSpecificationCreate.productNumber) &&
-        Objects.equals(this.version, productSpecificationCreate.version) &&
-        Objects.equals(this.attachment, productSpecificationCreate.attachment) &&
-        Objects.equals(this.bundledProductSpecification, productSpecificationCreate.bundledProductSpecification) &&
-        Objects.equals(this.productSpecCharacteristic, productSpecificationCreate.productSpecCharacteristic) &&
-        Objects.equals(this.productSpecificationRelationship, productSpecificationCreate.productSpecificationRelationship) &&
-        Objects.equals(this.relatedParty, productSpecificationCreate.relatedParty) &&
-        Objects.equals(this.resourceSpecification, productSpecificationCreate.resourceSpecification) &&
-        Objects.equals(this.serviceSpecification, productSpecificationCreate.serviceSpecification) &&
-        Objects.equals(this.targetProductSchema, productSpecificationCreate.targetProductSchema) &&
-        Objects.equals(this.validFor, productSpecificationCreate.validFor) &&
-        Objects.equals(this.baseType, productSpecificationCreate.baseType) &&
-        Objects.equals(this.schemaLocation, productSpecificationCreate.schemaLocation) &&
-        Objects.equals(this.type, productSpecificationCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(brand, description, isBundle, lastUpdate, lifecycleStatus, name, productNumber, version, attachment, bundledProductSpecification, productSpecCharacteristic, productSpecificationRelationship, relatedParty, resourceSpecification, serviceSpecification, targetProductSchema, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationCreate {\n");
-    
-    sb.append("    brand: ").append(toIndentedString(brand)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    productNumber: ").append(toIndentedString(productNumber)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    bundledProductSpecification: ").append(toIndentedString(bundledProductSpecification)).append("\n");
-    sb.append("    productSpecCharacteristic: ").append(toIndentedString(productSpecCharacteristic)).append("\n");
-    sb.append("    productSpecificationRelationship: ").append(toIndentedString(productSpecificationRelationship)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("    targetProductSchema: ").append(toIndentedString(targetProductSchema)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEvent.java
deleted file mode 100644
index f63cad69e5895e2145e630ed270aa3fec813b889..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductSpecificationCreateEventPayload event = null;
-
-  public ProductSpecificationCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductSpecificationCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductSpecificationCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductSpecificationCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductSpecificationCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductSpecificationCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductSpecificationCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductSpecificationCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductSpecificationCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductSpecificationCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductSpecificationCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductSpecificationCreateEvent event(ProductSpecificationCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductSpecificationCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductSpecificationCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationCreateEvent productSpecificationCreateEvent = (ProductSpecificationCreateEvent) o;
-    return Objects.equals(this.id, productSpecificationCreateEvent.id) &&
-        Objects.equals(this.href, productSpecificationCreateEvent.href) &&
-        Objects.equals(this.eventId, productSpecificationCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, productSpecificationCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, productSpecificationCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, productSpecificationCreateEvent.correlationId) &&
-        Objects.equals(this.domain, productSpecificationCreateEvent.domain) &&
-        Objects.equals(this.title, productSpecificationCreateEvent.title) &&
-        Objects.equals(this.description, productSpecificationCreateEvent.description) &&
-        Objects.equals(this.priority, productSpecificationCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, productSpecificationCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, productSpecificationCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEventPayload.java
deleted file mode 100644
index f6456537ec1037bf8b5bba025639476b1e0c96bb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationCreateEventPayload   {
-  @JsonProperty("productSpecification")
-  private ProductSpecification productSpecification = null;
-
-  public ProductSpecificationCreateEventPayload productSpecification(ProductSpecification productSpecification) {
-    this.productSpecification = productSpecification;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productSpecification
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductSpecification getProductSpecification() {
-    return productSpecification;
-  }
-
-  public void setProductSpecification(ProductSpecification productSpecification) {
-    this.productSpecification = productSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationCreateEventPayload productSpecificationCreateEventPayload = (ProductSpecificationCreateEventPayload) o;
-    return Objects.equals(this.productSpecification, productSpecificationCreateEventPayload.productSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationCreateEventPayload {\n");
-    
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEvent.java
deleted file mode 100644
index dcb55a42295172300215bfc708b1efce1a4b2262..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductSpecificationDeleteEventPayload event = null;
-
-  public ProductSpecificationDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductSpecificationDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductSpecificationDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductSpecificationDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductSpecificationDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductSpecificationDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductSpecificationDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductSpecificationDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductSpecificationDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductSpecificationDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductSpecificationDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductSpecificationDeleteEvent event(ProductSpecificationDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public ProductSpecificationDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductSpecificationDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationDeleteEvent productSpecificationDeleteEvent = (ProductSpecificationDeleteEvent) o;
-    return Objects.equals(this.id, productSpecificationDeleteEvent.id) &&
-        Objects.equals(this.href, productSpecificationDeleteEvent.href) &&
-        Objects.equals(this.eventId, productSpecificationDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, productSpecificationDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, productSpecificationDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, productSpecificationDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, productSpecificationDeleteEvent.domain) &&
-        Objects.equals(this.title, productSpecificationDeleteEvent.title) &&
-        Objects.equals(this.description, productSpecificationDeleteEvent.description) &&
-        Objects.equals(this.priority, productSpecificationDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, productSpecificationDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, productSpecificationDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEventPayload.java
deleted file mode 100644
index 20c5e13ad064530e853ff79b2a763c5701841ad3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationDeleteEventPayload   {
-  @JsonProperty("productSpecification")
-  private ProductSpecification productSpecification = null;
-
-  public ProductSpecificationDeleteEventPayload productSpecification(ProductSpecification productSpecification) {
-    this.productSpecification = productSpecification;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return productSpecification
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ProductSpecification getProductSpecification() {
-    return productSpecification;
-  }
-
-  public void setProductSpecification(ProductSpecification productSpecification) {
-    this.productSpecification = productSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationDeleteEventPayload productSpecificationDeleteEventPayload = (ProductSpecificationDeleteEventPayload) o;
-    return Objects.equals(this.productSpecification, productSpecificationDeleteEventPayload.productSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationDeleteEventPayload {\n");
-    
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRef.java
deleted file mode 100644
index c29b5e60d9969298e220e955e6c974e36185b250..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRef.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Product specification reference: A ProductSpecification is a detailed
- * description of a tangible or intangible object made available externally in
- * the form of a ProductOffering to customers or other parties playing a party
- * role.
- */
-@Schema(description = "Product specification reference: A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ProductSpecificationRef")
-public class ProductSpecificationRef extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("targetProductSchema")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinColumn(referencedColumnName = "uuid")
-	private TargetProductSchema targetProductSchema = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	/**
-	 * Unique identifier of a related entity.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of a related entity.")
-	@NotNull
-
-	public String getId() {
-		return id;
-  }
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-	
-	
-	public ProductSpecificationRef schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ProductSpecificationRef type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public ProductSpecificationRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ProductSpecificationRef productSpecificationRef = (ProductSpecificationRef) o;
-		return Objects.equals(this.id, productSpecificationRef.id)
-				&& Objects.equals(this.href, productSpecificationRef.href)
-				&& Objects.equals(this.name, productSpecificationRef.name)
-				&& Objects.equals(this.version, productSpecificationRef.version)
-				&& Objects.equals(this.targetProductSchema, productSpecificationRef.targetProductSchema)
-				&& Objects.equals(this.baseType, productSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, productSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, productSpecificationRef.type)
-				&& Objects.equals(this.referredType, productSpecificationRef.referredType);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, targetProductSchema, baseType, schemaLocation, type, referredType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ProductSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    targetProductSchema: ").append(toIndentedString(targetProductSchema)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRelationship.java
deleted file mode 100644
index 2de594c4d93c782bbba64492b97f1b8cf3c513b9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationRelationship.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A migration, substitution, dependency or exclusivity relationship between/among product specifications.
- */
-@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among product specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class ProductSpecificationRelationship  extends BaseRootEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public ProductSpecificationRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the productSpecification
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the productSpecification")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  
-
-  public ProductSpecificationRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as migration, substitution, dependency, exclusivity
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship such as migration, substitution, dependency, exclusivity")
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public ProductSpecificationRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the productSpecificationRelationship is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the productSpecificationRelationship is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ProductSpecificationRelationship baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationRelationship productSpecificationRelationship = (ProductSpecificationRelationship) o;
-    return Objects.equals(this.id, productSpecificationRelationship.id) &&
-        Objects.equals(this.href, productSpecificationRelationship.href) &&
-        Objects.equals(this.relationshipType, productSpecificationRelationship.relationshipType) &&
-        Objects.equals(this.validFor, productSpecificationRelationship.validFor) &&
-        Objects.equals(this.baseType, productSpecificationRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, productSpecificationRelationship.schemaLocation) &&
-        Objects.equals(this.type, productSpecificationRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, relationshipType, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationUpdate.java
deleted file mode 100644
index 458f8d72db364ca0571144b4ad03bc1cfa3bf925..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ProductSpecificationUpdate.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "Is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class ProductSpecificationUpdate   {
-  @JsonProperty("brand")
-  protected String brand = null;
-
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("isBundle")
-  protected Boolean isBundle = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("productNumber")
-  protected String productNumber = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("attachment")
-  @Valid
-  protected List<AttachmentRefOrValue> attachment = null;
-
-  @JsonProperty("bundledProductSpecification")
-  @Valid
-  protected List<BundledProductSpecification> bundledProductSpecification = null;
-
-  @JsonProperty("productSpecCharacteristic")
-  @Valid
-  protected List<ProductSpecificationCharacteristic> productSpecCharacteristic = null;
-
-  @JsonProperty("productSpecificationRelationship")
-  @Valid
-  protected List<ProductSpecificationRelationship> productSpecificationRelationship = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("resourceSpecification")
-  @Valid
-  protected List<ResourceSpecificationRef> resourceSpecification = null;
-
-  @JsonProperty("serviceSpecification")
-  @Valid
-  protected List<ServiceSpecificationRef> serviceSpecification = null;
-
-  @JsonProperty("targetProductSchema")
-  protected TargetProductSchema targetProductSchema = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public ProductSpecificationUpdate brand(String brand) {
-    this.brand = brand;
-    return this;
-  }
-
-  /**
-   * The manufacturer or trademark of the specification
-   * @return brand
-  **/
-  @Schema(description = "The manufacturer or trademark of the specification")
-
-
-  public String getBrand() {
-    return brand;
-  }
-
-  public void setBrand(String brand) {
-    this.brand = brand;
-  }
-
-  public ProductSpecificationUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the product specification is
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the product specification is")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductSpecificationUpdate isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * isBundle determines whether a productSpecification represents a single productSpecification (false), or a bundle of productSpecification (true).
-   * @return isBundle
-  **/
-  @Schema(description = "isBundle determines whether a productSpecification represents a single productSpecification (false), or a bundle of productSpecification (true).")
-
-
-  public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public ProductSpecificationUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ProductSpecificationUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the product specification
-   * @return name
-  **/
-  @Schema(description = "Name of the product specification")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductSpecificationUpdate productNumber(String productNumber) {
-    this.productNumber = productNumber;
-    return this;
-  }
-
-  /**
-   * An identification number assigned to uniquely identity the specification
-   * @return productNumber
-  **/
-  @Schema(description = "An identification number assigned to uniquely identity the specification")
-
-
-  public String getProductNumber() {
-    return productNumber;
-  }
-
-  public void setProductNumber(String productNumber) {
-    this.productNumber = productNumber;
-  }
-
-  public ProductSpecificationUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Product specification version
-   * @return version
-  **/
-  @Schema(description = "Product specification version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ProductSpecificationUpdate attachment(List<AttachmentRefOrValue> attachment) {
-    this.attachment = attachment;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-    if (this.attachment == null) {
-      this.attachment = new ArrayList<>();
-    }
-    this.attachment.add(attachmentItem);
-    return this;
-  }
-
-  /**
-   * Complements the description of an element (for instance a product) through video, pictures...
-   * @return attachment
-  **/
-  @Schema(description = "Complements the description of an element (for instance a product) through video, pictures...")
-
-  @Valid
-
-  public List<AttachmentRefOrValue> getAttachment() {
-    return attachment;
-  }
-
-  public void setAttachment(List<AttachmentRefOrValue> attachment) {
-    this.attachment = attachment;
-  }
-
-  public ProductSpecificationUpdate bundledProductSpecification(List<BundledProductSpecification> bundledProductSpecification) {
-    this.bundledProductSpecification = bundledProductSpecification;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addBundledProductSpecificationItem(BundledProductSpecification bundledProductSpecificationItem) {
-    if (this.bundledProductSpecification == null) {
-      this.bundledProductSpecification = new ArrayList<>();
-    }
-    this.bundledProductSpecification.add(bundledProductSpecificationItem);
-    return this;
-  }
-
-  /**
-   * A type of ProductSpecification that belongs to a grouping of ProductSpecifications made available to the market. It inherits of all attributes of ProductSpecification.
-   * @return bundledProductSpecification
-  **/
-  @Schema(description = "A type of ProductSpecification that belongs to a grouping of ProductSpecifications made available to the market. It inherits of all attributes of ProductSpecification.")
-
-  @Valid
-
-  public List<BundledProductSpecification> getBundledProductSpecification() {
-    return bundledProductSpecification;
-  }
-
-  public void setBundledProductSpecification(List<BundledProductSpecification> bundledProductSpecification) {
-    this.bundledProductSpecification = bundledProductSpecification;
-  }
-
-  public ProductSpecificationUpdate productSpecCharacteristic(List<ProductSpecificationCharacteristic> productSpecCharacteristic) {
-    this.productSpecCharacteristic = productSpecCharacteristic;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addProductSpecCharacteristicItem(ProductSpecificationCharacteristic productSpecCharacteristicItem) {
-    if (this.productSpecCharacteristic == null) {
-      this.productSpecCharacteristic = new ArrayList<>();
-    }
-    this.productSpecCharacteristic.add(productSpecCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * A characteristic quality or distinctive feature of a ProductSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.
-   * @return productSpecCharacteristic
-  **/
-  @Schema(description = "A characteristic quality or distinctive feature of a ProductSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.")
-
-  @Valid
-
-  public List<ProductSpecificationCharacteristic> getProductSpecCharacteristic() {
-    return productSpecCharacteristic;
-  }
-
-  public void setProductSpecCharacteristic(List<ProductSpecificationCharacteristic> productSpecCharacteristic) {
-    this.productSpecCharacteristic = productSpecCharacteristic;
-  }
-
-  public ProductSpecificationUpdate productSpecificationRelationship(List<ProductSpecificationRelationship> productSpecificationRelationship) {
-    this.productSpecificationRelationship = productSpecificationRelationship;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addProductSpecificationRelationshipItem(ProductSpecificationRelationship productSpecificationRelationshipItem) {
-    if (this.productSpecificationRelationship == null) {
-      this.productSpecificationRelationship = new ArrayList<>();
-    }
-    this.productSpecificationRelationship.add(productSpecificationRelationshipItem);
-    return this;
-  }
-
-  /**
-   * A migration, substitution, dependency or exclusivity relationship between/among product specifications.
-   * @return productSpecificationRelationship
-  **/
-  @Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among product specifications.")
-
-  @Valid
-
-  public List<ProductSpecificationRelationship> getProductSpecificationRelationship() {
-    return productSpecificationRelationship;
-  }
-
-  public void setProductSpecificationRelationship(List<ProductSpecificationRelationship> productSpecificationRelationship) {
-    this.productSpecificationRelationship = productSpecificationRelationship;
-  }
-
-  public ProductSpecificationUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * A related party defines party or party role linked to a specific entity.
-   * @return relatedParty
-  **/
-  @Schema(description = "A related party defines party or party role linked to a specific entity.")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ProductSpecificationUpdate resourceSpecification(List<ResourceSpecificationRef> resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addResourceSpecificationItem(ResourceSpecificationRef resourceSpecificationItem) {
-    if (this.resourceSpecification == null) {
-      this.resourceSpecification = new ArrayList<>();
-    }
-    this.resourceSpecification.add(resourceSpecificationItem);
-    return this;
-  }
-
-  /**
-   * The ResourceSpecification is required to realize a ProductSpecification.
-   * @return resourceSpecification
-  **/
-  @Schema(description = "The ResourceSpecification is required to realize a ProductSpecification.")
-
-  @Valid
-
-  public List<ResourceSpecificationRef> getResourceSpecification() {
-    return resourceSpecification;
-  }
-
-  public void setResourceSpecification(List<ResourceSpecificationRef> resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-  }
-
-  public ProductSpecificationUpdate serviceSpecification(List<ServiceSpecificationRef> serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-    return this;
-  }
-
-  public ProductSpecificationUpdate addServiceSpecificationItem(ServiceSpecificationRef serviceSpecificationItem) {
-    if (this.serviceSpecification == null) {
-      this.serviceSpecification = new ArrayList<>();
-    }
-    this.serviceSpecification.add(serviceSpecificationItem);
-    return this;
-  }
-
-  /**
-   * ServiceSpecification(s) required to realize a ProductSpecification.
-   * @return serviceSpecification
-  **/
-  @Schema(description = "ServiceSpecification(s) required to realize a ProductSpecification.")
-
-  @Valid
-
-  public List<ServiceSpecificationRef> getServiceSpecification() {
-    return serviceSpecification;
-  }
-
-  public void setServiceSpecification(List<ServiceSpecificationRef> serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-  }
-
-  public ProductSpecificationUpdate targetProductSchema(TargetProductSchema targetProductSchema) {
-    this.targetProductSchema = targetProductSchema;
-    return this;
-  }
-
-  /**
-   * A target product schema reference. The reference object to the schema and type of target product which is described by product specification.
-   * @return targetProductSchema
-  **/
-  @Schema(description = "A target product schema reference. The reference object to the schema and type of target product which is described by product specification.")
-
-  @Valid
-
-  public TargetProductSchema getTargetProductSchema() {
-    return targetProductSchema;
-  }
-
-  public void setTargetProductSchema(TargetProductSchema targetProductSchema) {
-    this.targetProductSchema = targetProductSchema;
-  }
-
-  public ProductSpecificationUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the product specification is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the product specification is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ProductSpecificationUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductSpecificationUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductSpecificationUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationUpdate productSpecificationUpdate = (ProductSpecificationUpdate) o;
-    return Objects.equals(this.brand, productSpecificationUpdate.brand) &&
-        Objects.equals(this.description, productSpecificationUpdate.description) &&
-        Objects.equals(this.isBundle, productSpecificationUpdate.isBundle) &&
-        Objects.equals(this.lifecycleStatus, productSpecificationUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, productSpecificationUpdate.name) &&
-        Objects.equals(this.productNumber, productSpecificationUpdate.productNumber) &&
-        Objects.equals(this.version, productSpecificationUpdate.version) &&
-        Objects.equals(this.attachment, productSpecificationUpdate.attachment) &&
-        Objects.equals(this.bundledProductSpecification, productSpecificationUpdate.bundledProductSpecification) &&
-        Objects.equals(this.productSpecCharacteristic, productSpecificationUpdate.productSpecCharacteristic) &&
-        Objects.equals(this.productSpecificationRelationship, productSpecificationUpdate.productSpecificationRelationship) &&
-        Objects.equals(this.relatedParty, productSpecificationUpdate.relatedParty) &&
-        Objects.equals(this.resourceSpecification, productSpecificationUpdate.resourceSpecification) &&
-        Objects.equals(this.serviceSpecification, productSpecificationUpdate.serviceSpecification) &&
-        Objects.equals(this.targetProductSchema, productSpecificationUpdate.targetProductSchema) &&
-        Objects.equals(this.validFor, productSpecificationUpdate.validFor) &&
-        Objects.equals(this.baseType, productSpecificationUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, productSpecificationUpdate.schemaLocation) &&
-        Objects.equals(this.type, productSpecificationUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(brand, description, isBundle, lifecycleStatus, name, productNumber, version, attachment, bundledProductSpecification, productSpecCharacteristic, productSpecificationRelationship, relatedParty, resourceSpecification, serviceSpecification, targetProductSchema, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationUpdate {\n");
-    
-    sb.append("    brand: ").append(toIndentedString(brand)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    productNumber: ").append(toIndentedString(productNumber)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    bundledProductSpecification: ").append(toIndentedString(bundledProductSpecification)).append("\n");
-    sb.append("    productSpecCharacteristic: ").append(toIndentedString(productSpecCharacteristic)).append("\n");
-    sb.append("    productSpecificationRelationship: ").append(toIndentedString(productSpecificationRelationship)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("    targetProductSchema: ").append(toIndentedString(targetProductSchema)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ResourceCandidateRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ResourceCandidateRef.java
deleted file mode 100644
index 11d273966f448bb50fd1439d46fed5cfcf97f67c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ResourceCandidateRef.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ResourceCandidate reference: A resource candidate is an entity that makes a ResourceSpecification available to a catalog.
- */
-@Schema(description = "ResourceCandidate reference: A resource candidate is an entity that makes a ResourceSpecification available to a catalog.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ResourceCandidateRef")
-public class ResourceCandidateRef  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-
-  /**
-   * Unique identifier of the resource candidate
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the resource candidate")
-  @NotNull
-  public String getId() {
-		return id;
-}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-
-  public ResourceCandidateRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateRef resourceCandidateRef = (ResourceCandidateRef) o;
-    return Objects.equals(this.id, resourceCandidateRef.id) &&
-        Objects.equals(this.href, resourceCandidateRef.href) &&
-        Objects.equals(this.name, resourceCandidateRef.name) &&
-        Objects.equals(this.version, resourceCandidateRef.version) &&
-        Objects.equals(this.baseType, resourceCandidateRef.baseType) &&
-        Objects.equals(this.schemaLocation, resourceCandidateRef.schemaLocation) &&
-        Objects.equals(this.type, resourceCandidateRef.type) &&
-        Objects.equals(this.referredType, resourceCandidateRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/SLARef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/SLARef.java
deleted file mode 100644
index 98542408dd4946cb8e8daca2a5e1db2f994734fb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/SLARef.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ServiceLevelAgreement reference: A service level agreement (SLA) is a type of agreement that represents a formal negotiated agreement between two parties designed to create a common understanding about products, services, priorities, responsibilities, and so forth. The SLA is a set of appropriate procedures and targets formally or informally agreed between parties in order to achieve and maintain specified Quality of Service.
- */
-@Schema(description = "ServiceLevelAgreement reference: A service level agreement (SLA) is a type of agreement that represents a formal negotiated agreement between two parties designed to create a common understanding about products, services, priorities, responsibilities, and so forth. The SLA is a set of appropriate procedures and targets formally or informally agreed between parties in order to achieve and maintain specified Quality of Service.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "SLARef")
-public class SLARef  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  /**
-   * Unique identifier of service level agreement
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of service level agreement")
-  @NotNull
-  public String getId() {
-		return id;
-}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-  
-  public SLARef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SLARef slARef = (SLARef) o;
-    return Objects.equals(this.id, slARef.id) &&
-        Objects.equals(this.href, slARef.href) &&
-        Objects.equals(this.name, slARef.name) &&
-        Objects.equals(this.baseType, slARef.baseType) &&
-        Objects.equals(this.schemaLocation, slARef.schemaLocation) &&
-        Objects.equals(this.type, slARef.type) &&
-        Objects.equals(this.referredType, slARef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SLARef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/ServiceCandidateRef.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/ServiceCandidateRef.java
deleted file mode 100644
index 607d4758ee8750662dec11f29b76740a8526396b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/ServiceCandidateRef.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ServiceCandidate reference. ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.
- */
-@Schema(description = "ServiceCandidate reference. ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "ServiceCandidateRef")
-public class ServiceCandidateRef  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  /**
-   * Unique identifier of the service candidate
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the service candidate")
-  @NotNull
-  public String getId() {
-		return id;
-}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateRef serviceCandidateRef = (ServiceCandidateRef) o;
-    return Objects.equals(this.id, serviceCandidateRef.id) &&
-        Objects.equals(this.href, serviceCandidateRef.href) &&
-        Objects.equals(this.name, serviceCandidateRef.name) &&
-        Objects.equals(this.version, serviceCandidateRef.version) &&
-        Objects.equals(this.baseType, serviceCandidateRef.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCandidateRef.schemaLocation) &&
-        Objects.equals(this.type, serviceCandidateRef.type) &&
-        Objects.equals(this.referredType, serviceCandidateRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetProductSchema.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetProductSchema.java
deleted file mode 100644
index f695fc7b295f446bb2a150f0195286db8b155e6e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetProductSchema.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * The reference object to the schema and type of target product which is described by product specification
- */
-@Schema(description = "The reference object to the schema and type of target product which is described by product specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity(name = "TargetProductSchema")
-@JsonIgnoreProperties( {"uuid"} )
-public class TargetProductSchema  extends BaseRootEntity {
- 
-
-  public TargetProductSchema baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
- 
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetProductSchema targetProductSchema = (TargetProductSchema) o;
-    return Objects.equals(this.baseType, targetProductSchema.baseType) &&
-        Objects.equals(this.schemaLocation, targetProductSchema.schemaLocation) &&
-        Objects.equals(this.type, targetProductSchema.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetProductSchema {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetServiceSchema.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetServiceSchema.java
deleted file mode 100644
index 7fa1d9921959231c5765facd0d01d132c2bef907..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/TargetServiceSchema.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The reference object to the schema and type of target service which is described by service specification
- */
-@Schema(description = "The reference object to the schema and type of target service which is described by service specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-public class TargetServiceSchema   {
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public TargetServiceSchema baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public TargetServiceSchema schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing the target service
-   * @return schemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing the target service")
-  @NotNull
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public TargetServiceSchema type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Class type of the target service
-   * @return type
-  **/
-  @Schema(description = "Class type of the target service")
-  @NotNull
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetServiceSchema targetServiceSchema = (TargetServiceSchema) o;
-    return Objects.equals(this.baseType, targetServiceSchema.baseType) &&
-        Objects.equals(this.schemaLocation, targetServiceSchema.schemaLocation) &&
-        Objects.equals(this.type, targetServiceSchema.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetServiceSchema {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pcm620/model/TaxItem.java b/src/main/java/org/etsi/osl/tmf/pcm620/model/TaxItem.java
deleted file mode 100644
index 6ceac9736168836215b8509722b72ffa17716d7f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pcm620/model/TaxItem.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pcm620.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A tax item is created for each tax rate and tax type used in the bill.
- */
-@Schema(description = "A tax item is created for each tax rate and tax type used in the bill.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:15:57.249+03:00")
-
-@Entity
-public class TaxItem  extends BaseRootEntity{
-  @JsonProperty("taxCategory")
-  private String taxCategory = null;
-
-  @JsonProperty("taxRate")
-  private Float taxRate = null;
-
-  @JsonProperty("taxAmount")
-  private Money taxAmount = null;
-
-
-  public TaxItem taxCategory(String taxCategory) {
-    this.taxCategory = taxCategory;
-    return this;
-  }
-
-  /**
-   * Tax category
-   * @return taxCategory
-  **/
-  @Schema(description = "Tax category")
-
-
-  public String getTaxCategory() {
-    return taxCategory;
-  }
-
-  public void setTaxCategory(String taxCategory) {
-    this.taxCategory = taxCategory;
-  }
-
-  public TaxItem taxRate(Float taxRate) {
-    this.taxRate = taxRate;
-    return this;
-  }
-
-  /**
-   * Applied rate of the tax
-   * @return taxRate
-  **/
-  @Schema(description = "Applied rate of the tax")
-
-
-  public Float getTaxRate() {
-    return taxRate;
-  }
-
-  public void setTaxRate(Float taxRate) {
-    this.taxRate = taxRate;
-  }
-
-  public TaxItem taxAmount(Money taxAmount) {
-    this.taxAmount = taxAmount;
-    return this;
-  }
-
-  /**
-   * Amount of tax expressed in the given currency
-   * @return taxAmount
-  **/
-  @Schema(description = "Amount of tax expressed in the given currency")
-
-  @Valid
-
-  public Money getTaxAmount() {
-    return taxAmount;
-  }
-
-  public void setTaxAmount(Money taxAmount) {
-    this.taxAmount = taxAmount;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TaxItem taxItem = (TaxItem) o;
-    return Objects.equals(this.taxCategory, taxItem.taxCategory) &&
-        Objects.equals(this.taxRate, taxItem.taxRate) &&
-        Objects.equals(this.taxAmount, taxItem.taxAmount) &&
-        Objects.equals(this.baseType, taxItem.baseType) &&
-        Objects.equals(this.schemaLocation, taxItem.schemaLocation) &&
-        Objects.equals(this.type, taxItem.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(taxCategory, taxRate, taxAmount, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TaxItem {\n");
-    
-    sb.append("    taxCategory: ").append(toIndentedString(taxCategory)).append("\n");
-    sb.append("    taxRate: ").append(toIndentedString(taxRate)).append("\n");
-    sb.append("    taxAmount: ").append(toIndentedString(taxAmount)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Characteristic.java
deleted file mode 100644
index 7221070d61451b6817eb81a2b51fc5eddba5340b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Characteristic.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value
- * pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-@Entity(name = "PM632_Characteristic")
-public class Characteristic extends BaseRootNamedEntity {
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("value")
-	private Any value = null;
-
-	
-	public Characteristic() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();		
-	}
-	
-	public Characteristic(Characteristic src) {
-		this();
-		name = src.name;
-		valueType = src.valueType;
-		value = new Any( src.value ) ;
-		
-	}
-
-	public Characteristic name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	public Characteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * Data type of the value of the characteristic
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "Data type of the value of the characteristic")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public Characteristic value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * The value of the characteristic
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "The value of the characteristic")
-	@NotNull
-
-	@Valid
-
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Characteristic characteristic = (Characteristic) o;
-		return Objects.equals(this.name, characteristic.name)
-				&& Objects.equals(this.valueType, characteristic.valueType)
-				&& Objects.equals(this.value, characteristic.value)
-				&& Objects.equals(this.baseType, characteristic.baseType)
-				&& Objects.equals(this.schemaLocation, characteristic.schemaLocation)
-				&& Objects.equals(this.type, characteristic.type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Characteristic {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(Characteristic cmUpd) {
-			this.setName( cmUpd.getName());
-			this.setValue(new Any( cmUpd.getValue().getValue(), cmUpd.getValue().getAlias()));
-			this.setValueType(cmUpd.getValueType());
-			
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/ContactMedium.java b/src/main/java/org/etsi/osl/tmf/pm632/model/ContactMedium.java
deleted file mode 100644
index ca515e22b781c7e46fb845d311a49f90f524f0b8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/ContactMedium.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Indicates the contact medium that could be used to contact the party.
- */
-@Schema(description = "Indicates the contact medium that could be used to contact the party.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-19T23:13:44.649+02:00")
-@Entity(name = "ContactMedium")
-public class ContactMedium extends BaseRootEntity {
-	@JsonProperty("mediumType")
-	private String mediumType = null;
-
-	@JsonProperty("preferred")
-	private Boolean preferred = null;
-
-	@JsonProperty("characteristic")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn( referencedColumnName = "uuid")
-	private MediumCharacteristic characteristic = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public ContactMedium mediumType(String mediumType) {
-		this.mediumType = mediumType;
-		return this;
-	}
-
-	/**
-	 * Type of the contact medium, such as: email address, telephone number, postal
-	 * address
-	 * 
-	 * @return mediumType
-	 **/
-	@Schema(description = "Type of the contact medium, such as: email address, telephone number, postal address")
-	@NotNull
-
-	public String getMediumType() {
-		return mediumType;
-	}
-
-	public void setMediumType(String mediumType) {
-		this.mediumType = mediumType;
-	}
-
-	public ContactMedium preferred(Boolean preferred) {
-		this.preferred = preferred;
-		return this;
-	}
-
-	/**
-	 * If true, indicates that is the preferred contact medium
-	 * 
-	 * @return preferred
-	 **/
-	@Schema(description = "If true, indicates that is the preferred contact medium")
-
-	public Boolean isPreferred() {
-		return preferred;
-	}
-
-	public void setPreferred(Boolean preferred) {
-		this.preferred = preferred;
-	}
-
-	public ContactMedium characteristic(MediumCharacteristic characteristic) {
-		this.characteristic = characteristic;
-		return this;
-	}
-
-	/**
-	 * Any additional characteristic(s) of this contact medium
-	 * 
-	 * @return characteristic
-	 **/
-	@Schema(description = "Any additional characteristic(s) of this contact medium")
-	@NotNull
-
-	@Valid
-
-	public MediumCharacteristic getCharacteristic() {
-		return characteristic;
-	}
-
-	public void setCharacteristic(MediumCharacteristic characteristic) {
-		this.characteristic = characteristic;
-	}
-
-	public ContactMedium validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The time period that the contact medium is valid for
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The time period that the contact medium is valid for")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ContactMedium contactMedium = (ContactMedium) o;
-		return Objects.equals(this.mediumType, contactMedium.mediumType)
-				&& Objects.equals(this.preferred, contactMedium.preferred)
-				&& Objects.equals(this.characteristic, contactMedium.characteristic)
-				&& Objects.equals(this.validFor, contactMedium.validFor)
-				&& Objects.equals(this.baseType, contactMedium.baseType)
-				&& Objects.equals(this.schemaLocation, contactMedium.schemaLocation)
-				&& Objects.equals(this.type, contactMedium.type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ContactMedium {\n");
-
-		sb.append("    mediumType: ").append(toIndentedString(mediumType)).append("\n");
-		sb.append("    preferred: ").append(toIndentedString(preferred)).append("\n");
-		sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(ContactMedium cmUpd) {
-		this.mediumType  = cmUpd.getMediumType();
-		this.preferred =  cmUpd.isPreferred();
-		this.validFor = cmUpd.getValidFor();
-		if ( cmUpd.getCharacteristic() !=null) {
-			this.characteristic = new MediumCharacteristic( cmUpd.getCharacteristic()  );			
-		}
-		
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Disability.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Disability.java
deleted file mode 100644
index 96a9f68d0e66c38e29ba9a33bbed0933dacd1d25..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Disability.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Lack or inadequate strength or ability.
- */
-@Schema(description = "Lack or inadequate strength or ability.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-@Entity
-public class Disability  extends BaseRootEntity  {
-  @JsonProperty("disabilityCode")
-  private String disabilityCode = null;
-
-  @JsonProperty("disabilityName")
-  private String disabilityName = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public Disability disabilityCode(String disabilityCode) {
-    this.disabilityCode = disabilityCode;
-    return this;
-  }
-
-  /**
-   * Code of the disability
-   * @return disabilityCode
-  **/
-  @Schema(description = "Code of the disability")
-
-
-  public String getDisabilityCode() {
-    return disabilityCode;
-  }
-
-  public void setDisabilityCode(String disabilityCode) {
-    this.disabilityCode = disabilityCode;
-  }
-
-  public Disability disabilityName(String disabilityName) {
-    this.disabilityName = disabilityName;
-    return this;
-  }
-
-  /**
-   * Name of the disability
-   * @return disabilityName
-  **/
-  @Schema(description = "Name of the disability")
-
-
-  public String getDisabilityName() {
-    return disabilityName;
-  }
-
-  public void setDisabilityName(String disabilityName) {
-    this.disabilityName = disabilityName;
-  }
-
-  public Disability validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Disability disability = (Disability) o;
-    return Objects.equals(this.disabilityCode, disability.disabilityCode) &&
-        Objects.equals(this.disabilityName, disability.disabilityName) &&
-        Objects.equals(this.validFor, disability.validFor) &&
-        Objects.equals(this.baseType, disability.baseType) &&
-        Objects.equals(this.schemaLocation, disability.schemaLocation) &&
-        Objects.equals(this.type, disability.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(disabilityCode, disabilityName, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Disability {\n");
-    
-    sb.append("    disabilityCode: ").append(toIndentedString(disabilityCode)).append("\n");
-    sb.append("    disabilityName: ").append(toIndentedString(disabilityName)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/pm632/model/EntityRef.java
deleted file mode 100644
index 32b2719999861b1ec32621bd1ba5e791dcebe66d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/EntityRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Error.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Error.java
deleted file mode 100644
index b0966c51cf10406474779bfacc4fb5e3a14abe39..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscription.java
deleted file mode 100644
index f3cdc2dc342848be2802314e9410321a29221523..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscriptionInput.java
deleted file mode 100644
index 989ad96ffd0c806e9fbe3c7ea9383f3270b99ebc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/ExternalReference.java b/src/main/java/org/etsi/osl/tmf/pm632/model/ExternalReference.java
deleted file mode 100644
index 16c0ff3dab71f3d197743c60e86f009068b88c5c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/ExternalReference.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * External reference of the individual or reference in other system
- */
-@Schema(description = "External reference of the individual or reference in other system")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class ExternalReference  extends BaseRootNamedEntity {
-  @JsonProperty("externalReferenceType")
-  private String externalReferenceType = null;
-
-
-  public ExternalReference externalReferenceType(String externalReferenceType) {
-    this.externalReferenceType = externalReferenceType;
-    return this;
-  }
-
-  /**
-   * Type of the external reference
-   * @return externalReferenceType
-  **/
-  @Schema(description = "Type of the external reference")
-
-
-  public String getExternalReferenceType() {
-    return externalReferenceType;
-  }
-
-  public void setExternalReferenceType(String externalReferenceType) {
-    this.externalReferenceType = externalReferenceType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExternalReference externalReference = (ExternalReference) o;
-    return Objects.equals(this.externalReferenceType, externalReference.externalReferenceType) &&
-        Objects.equals(this.name, externalReference.name) &&
-        Objects.equals(this.baseType, externalReference.baseType) &&
-        Objects.equals(this.schemaLocation, externalReference.schemaLocation) &&
-        Objects.equals(this.type, externalReference.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(externalReferenceType, name, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExternalReference {\n");
-    
-    sb.append("    externalReferenceType: ").append(toIndentedString(externalReferenceType)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Individual.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Individual.java
deleted file mode 100644
index 1d06327e2cf7b1102bcd9f52a9223750c5dfe9ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Individual.java
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Index;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * Individual represents a single human being (a man, woman or child). The
- * individual can be a customer, an employee or any other person that the
- * organization needs to store information about.
- */
-@Schema(description = "Individual represents a single human being (a man, woman or child). The individual can be a customer, an employee or any other person that the organization needs to store information about.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-@Entity
-@Table(indexes = { @Index(name = "IX_FAMILYNAME", columnList = "familyName") })
-public class Individual extends BaseRootEntity {
-
-
-	@JsonProperty("id")
-	private String id = null;
-	
-	@JsonProperty("aristocraticTitle")
-	private String aristocraticTitle = null;
-
-	private OffsetDateTime birthDate = null;
-
-	@JsonProperty("countryOfBirth")
-	private String countryOfBirth = null;
-
-	private OffsetDateTime deathDate = null;
-
-	@JsonProperty("familyName")
-	private String familyName = null;
-
-	@JsonProperty("familyNamePrefix")
-	private String familyNamePrefix = null;
-
-	@JsonProperty("formattedName")
-	private String formattedName = null;
-
-	@JsonProperty("fullName")
-	private String fullName = null;
-
-	@JsonProperty("gender")
-	private String gender = null;
-
-	@JsonProperty("generation")
-	private String generation = null;
-
-	@JsonProperty("givenName")
-	private String givenName = null;
-
-	@JsonProperty("legalName")
-	private String legalName = null;
-
-	@JsonProperty("location")
-	private String location = null;
-
-	@JsonProperty("maritalStatus")
-	private String maritalStatus = null;
-
-	@JsonProperty("middleName")
-	private String middleName = null;
-
-	@JsonProperty("nationality")
-	private String nationality = null;
-
-	@JsonProperty("placeOfBirth")
-	private String placeOfBirth = null;
-
-	@JsonProperty("preferredGivenName")
-	private String preferredGivenName = null;
-
-	@JsonProperty("title")
-	private String title = null;
-
-	@JsonProperty("contactMedium")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ContactMedium> contactMedium = new HashSet<>();
-
-	@JsonProperty("creditRating")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PartyCreditProfile> creditRating = new HashSet<>();
-
-	@JsonProperty("disability")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Disability> disability = new HashSet<>();
-
-	@JsonProperty("externalReference")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ExternalReference> externalReference = new HashSet<>();
-
-	@JsonProperty("individualIdentification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<IndividualIdentification> individualIdentification = new HashSet<>();
-
-	@JsonProperty("languageAbility")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<LanguageAbility> languageAbility = new HashSet<>();
-
-	@JsonProperty("otherName")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<OtherNameIndividual> otherName = new HashSet<>();
-
-	@JsonProperty("partyCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> partyCharacteristic = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("skill")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Skill> skill = new HashSet<>();
-
-	@JsonProperty("status")
-	private IndividualStateType status = null;
-
-	@JsonProperty("taxExemptionCertificate")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TaxExemptionCertificate> taxExemptionCertificate = new HashSet<>();
-
-	@JsonProperty("@baseType")
-	private String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	@JsonProperty("@type")
-	private String type = null;
-
-
-	/**
-	 * Unique identifier of the organization
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the organization")
-	
-	public String getId() {
-		return uuid;
-	}
-
-
-	public Individual aristocraticTitle(String aristocraticTitle) {
-		this.aristocraticTitle = aristocraticTitle;
-		return this;
-	}
-
-	/**
-	 * e.g. Baron, Graf, Earl,…
-	 * 
-	 * @return aristocraticTitle
-	 **/
-	@Schema(description = "e.g. Baron, Graf, Earl,…")
-
-	public String getAristocraticTitle() {
-		return aristocraticTitle;
-	}
-
-	public void setAristocraticTitle(String aristocraticTitle) {
-		this.aristocraticTitle = aristocraticTitle;
-	}
-
-	public Individual birthDate(OffsetDateTime birthDate) {
-		this.birthDate = birthDate;
-		return this;
-	}
-
-	/**
-	 * Birth date
-	 * 
-	 * @return birthDate
-	 **/
-	@Schema(description = "Birth date")
-
-	@Valid
-
-	@JsonProperty("birthDate")
-	public String getBirthDateString() {
-
-		if ( birthDate == null ) {
-			return null;
-		}
-		return birthDate.toString();
-	}
-
-	public OffsetDateTime getBirthDate() {
-		return birthDate;
-	}
-
-	public void setBirthDate(OffsetDateTime birthDate) {
-		this.birthDate = birthDate;
-	}
-
-	public Individual countryOfBirth(String countryOfBirth) {
-		this.countryOfBirth = countryOfBirth;
-		return this;
-	}
-
-	/**
-	 * Country where the individual was born
-	 * 
-	 * @return countryOfBirth
-	 **/
-	@Schema(description = "Country where the individual was born")
-
-	public String getCountryOfBirth() {
-		return countryOfBirth;
-	}
-
-	public void setCountryOfBirth(String countryOfBirth) {
-		this.countryOfBirth = countryOfBirth;
-	}
-
-	public Individual deathDate(OffsetDateTime deathDate) {
-		this.deathDate = deathDate;
-		return this;
-	}
-
-	/**
-	 * Date of death
-	 * 
-	 * @return deathDate
-	 **/
-	@Schema(description = "Date of death")
-
-	@Valid
-
-	@JsonProperty("deathDate")
-	public String getDeathDateStr() {
-
-		if ( deathDate == null ) {
-			return null;
-		}
-		return deathDate.toString();
-	}
-
-	public OffsetDateTime getDeathDate() {
-		return deathDate;
-	}
-
-	public void setDeathDate(OffsetDateTime deathDate) {
-		this.deathDate = deathDate;
-	}
-
-	public Individual familyName(String familyName) {
-		this.familyName = familyName;
-		return this;
-	}
-
-	/**
-	 * Contains the non-chosen or inherited name. Also known as last name in the
-	 * Western context
-	 * 
-	 * @return familyName
-	 **/
-	@Schema(description = "Contains the non-chosen or inherited name. Also known as last name in the Western context")
-
-	public String getFamilyName() {
-		return familyName;
-	}
-
-	public void setFamilyName(String familyName) {
-		this.familyName = familyName;
-	}
-
-	public Individual familyNamePrefix(String familyNamePrefix) {
-		this.familyNamePrefix = familyNamePrefix;
-		return this;
-	}
-
-	/**
-	 * Family name prefix
-	 * 
-	 * @return familyNamePrefix
-	 **/
-	@Schema(description = "Family name prefix")
-
-	public String getFamilyNamePrefix() {
-		return familyNamePrefix;
-	}
-
-	public void setFamilyNamePrefix(String familyNamePrefix) {
-		this.familyNamePrefix = familyNamePrefix;
-	}
-
-	public Individual formattedName(String formattedName) {
-		this.formattedName = formattedName;
-		return this;
-	}
-
-	/**
-	 * A fully formatted name in one string with all of its pieces in their proper
-	 * place and all of the necessary punctuation. Useful for specific contexts
-	 * (Chinese, Japanese, Korean,…)
-	 * 
-	 * @return formattedName
-	 **/
-	@Schema(description = "A fully formatted name in one string with all of its pieces in their proper place and all of the necessary punctuation. Useful for specific contexts (Chinese, Japanese, Korean,…)")
-
-	public String getFormattedName() {
-		return formattedName;
-	}
-
-	public void setFormattedName(String formattedName) {
-		this.formattedName = formattedName;
-	}
-
-	public Individual fullName(String fullName) {
-		this.fullName = fullName;
-		return this;
-	}
-
-	/**
-	 * Full name flatten (first, middle, and last names)
-	 * 
-	 * @return fullName
-	 **/
-	@Schema(description = "Full name flatten (first, middle, and last names)")
-
-	public String getFullName() {
-		return fullName;
-	}
-
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-
-	public Individual gender(String gender) {
-		this.gender = gender;
-		return this;
-	}
-
-	/**
-	 * Gender
-	 * 
-	 * @return gender
-	 **/
-	@Schema(description = "Gender")
-
-	public String getGender() {
-		return gender;
-	}
-
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-
-	public Individual generation(String generation) {
-		this.generation = generation;
-		return this;
-	}
-
-	/**
-	 * e.g.. Sr, Jr, III (the third),…
-	 * 
-	 * @return generation
-	 **/
-	@Schema(description = "e.g.. Sr, Jr, III (the third),…")
-
-	public String getGeneration() {
-		return generation;
-	}
-
-	public void setGeneration(String generation) {
-		this.generation = generation;
-	}
-
-	public Individual givenName(String givenName) {
-		this.givenName = givenName;
-		return this;
-	}
-
-	/**
-	 * First name of the individual
-	 * 
-	 * @return givenName
-	 **/
-	@Schema(description = "First name of the individual")
-
-	public String getGivenName() {
-		return givenName;
-	}
-
-	public void setGivenName(String givenName) {
-		this.givenName = givenName;
-	}
-
-	public Individual legalName(String legalName) {
-		this.legalName = legalName;
-		return this;
-	}
-
-	/**
-	 * Legal name or birth name (name one has for official purposes)
-	 * 
-	 * @return legalName
-	 **/
-	@Schema(description = "Legal name or birth name (name one has for official purposes)")
-
-	public String getLegalName() {
-		return legalName;
-	}
-
-	public void setLegalName(String legalName) {
-		this.legalName = legalName;
-	}
-
-	public Individual location(String location) {
-		this.location = location;
-		return this;
-	}
-
-	/**
-	 * Temporary current location od the individual (may be used if the individual
-	 * has approved its sharing)
-	 * 
-	 * @return location
-	 **/
-	@Schema(description = "Temporary current location od the individual (may be used if the individual has approved its sharing)")
-
-	public String getLocation() {
-		return location;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public Individual maritalStatus(String maritalStatus) {
-		this.maritalStatus = maritalStatus;
-		return this;
-	}
-
-	/**
-	 * Marital status (married, divorced, widow ...)
-	 * 
-	 * @return maritalStatus
-	 **/
-	@Schema(description = "Marital status (married, divorced, widow ...)")
-
-	public String getMaritalStatus() {
-		return maritalStatus;
-	}
-
-	public void setMaritalStatus(String maritalStatus) {
-		this.maritalStatus = maritalStatus;
-	}
-
-	public Individual middleName(String middleName) {
-		this.middleName = middleName;
-		return this;
-	}
-
-	/**
-	 * Middles name or initial
-	 * 
-	 * @return middleName
-	 **/
-	@Schema(description = "Middles name or initial")
-
-	public String getMiddleName() {
-		return middleName;
-	}
-
-	public void setMiddleName(String middleName) {
-		this.middleName = middleName;
-	}
-
-	public Individual nationality(String nationality) {
-		this.nationality = nationality;
-		return this;
-	}
-
-	/**
-	 * Nationality
-	 * 
-	 * @return nationality
-	 **/
-	@Schema(description = "Nationality")
-
-	public String getNationality() {
-		return nationality;
-	}
-
-	public void setNationality(String nationality) {
-		this.nationality = nationality;
-	}
-
-	public Individual placeOfBirth(String placeOfBirth) {
-		this.placeOfBirth = placeOfBirth;
-		return this;
-	}
-
-	/**
-	 * Reference to the place where the individual was born
-	 * 
-	 * @return placeOfBirth
-	 **/
-	@Schema(description = "Reference to the place where the individual was born")
-
-	public String getPlaceOfBirth() {
-		return placeOfBirth;
-	}
-
-	public void setPlaceOfBirth(String placeOfBirth) {
-		this.placeOfBirth = placeOfBirth;
-	}
-
-	public Individual preferredGivenName(String preferredGivenName) {
-		this.preferredGivenName = preferredGivenName;
-		return this;
-	}
-
-	/**
-	 * Contains the chosen name by which the individual prefers to be addressed.
-	 * Note: This name may be a name other than a given name, such as a nickname
-	 * 
-	 * @return preferredGivenName
-	 **/
-	@Schema(description = "Contains the chosen name by which the individual prefers to be addressed. Note: This name may be a name other than a given name, such as a nickname")
-
-	public String getPreferredGivenName() {
-		return preferredGivenName;
-	}
-
-	public void setPreferredGivenName(String preferredGivenName) {
-		this.preferredGivenName = preferredGivenName;
-	}
-
-	public Individual title(String title) {
-		this.title = title;
-		return this;
-	}
-
-	/**
-	 * Useful for titles (aristocratic, social,...) Pr, Dr, Sir, ...
-	 * 
-	 * @return title
-	 **/
-	@Schema(description = "Useful for titles (aristocratic, social,...) Pr, Dr, Sir, ...")
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Individual contactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-		return this;
-	}
-
-	public Individual addContactMediumItem(ContactMedium contactMediumItem) {
-		if (this.contactMedium == null) {
-			this.contactMedium = new HashSet<>();
-		}
-		this.contactMedium.add(contactMediumItem);
-		return this;
-	}
-
-	/**
-	 * Get contactMedium
-	 * 
-	 * @return contactMedium
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ContactMedium> getContactMedium() {
-		return contactMedium;
-	}
-
-	public void setContactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-	}
-
-	public Individual creditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-		return this;
-	}
-
-	public Individual addCreditRatingItem(PartyCreditProfile creditRatingItem) {
-		if (this.creditRating == null) {
-			this.creditRating = new HashSet<>();
-		}
-		this.creditRating.add(creditRatingItem);
-		return this;
-	}
-
-	/**
-	 * Get creditRating
-	 * 
-	 * @return creditRating
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<PartyCreditProfile> getCreditRating() {
-		return creditRating;
-	}
-
-	public void setCreditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-	}
-
-	public Individual disability(Set<Disability> disability) {
-		this.disability = disability;
-		return this;
-	}
-
-	public Individual addDisabilityItem(Disability disabilityItem) {
-		if (this.disability == null) {
-			this.disability = new HashSet<>();
-		}
-		this.disability.add(disabilityItem);
-		return this;
-	}
-
-	/**
-	 * Get disability
-	 * 
-	 * @return disability
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<Disability> getDisability() {
-		return disability;
-	}
-
-	public void setDisability(Set<Disability> disability) {
-		this.disability = disability;
-	}
-
-	public Individual externalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public Individual addExternalReferenceItem(ExternalReference externalReferenceItem) {
-		if (this.externalReference == null) {
-			this.externalReference = new HashSet<>();
-		}
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ExternalReference> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public Individual individualIdentification(Set<IndividualIdentification> individualIdentification) {
-		this.individualIdentification = individualIdentification;
-		return this;
-	}
-
-	public Individual addIndividualIdentificationItem(IndividualIdentification individualIdentificationItem) {
-		if (this.individualIdentification == null) {
-			this.individualIdentification = new HashSet<>();
-		}
-		this.individualIdentification.add(individualIdentificationItem);
-		return this;
-	}
-
-	/**
-	 * Get individualIdentification
-	 * 
-	 * @return individualIdentification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<IndividualIdentification> getIndividualIdentification() {
-		return individualIdentification;
-	}
-
-	public void setIndividualIdentification(Set<IndividualIdentification> individualIdentification) {
-		this.individualIdentification = individualIdentification;
-	}
-
-	public Individual languageAbility(Set<LanguageAbility> languageAbility) {
-		this.languageAbility = languageAbility;
-		return this;
-	}
-
-	public Individual addLanguageAbilityItem(LanguageAbility languageAbilityItem) {
-		if (this.languageAbility == null) {
-			this.languageAbility = new HashSet<>();
-		}
-		this.languageAbility.add(languageAbilityItem);
-		return this;
-	}
-
-	/**
-	 * Get languageAbility
-	 * 
-	 * @return languageAbility
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<LanguageAbility> getLanguageAbility() {
-		return languageAbility;
-	}
-
-	public void setLanguageAbility(Set<LanguageAbility> languageAbility) {
-		this.languageAbility = languageAbility;
-	}
-
-	public Individual otherName(Set<OtherNameIndividual> otherName) {
-		this.otherName = otherName;
-		return this;
-	}
-
-	public Individual addOtherNameItem(OtherNameIndividual otherNameItem) {
-		if (this.otherName == null) {
-			this.otherName = new HashSet<>();
-		}
-		this.otherName.add(otherNameItem);
-		return this;
-	}
-
-	/**
-	 * Get otherName
-	 * 
-	 * @return otherName
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<OtherNameIndividual> getOtherName() {
-		return otherName;
-	}
-
-	public void setOtherName(Set<OtherNameIndividual> otherName) {
-		this.otherName = otherName;
-	}
-
-	public Individual partyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-		return this;
-	}
-
-	public Individual addPartyCharacteristicItem(Characteristic partyCharacteristicItem) {
-		if (this.partyCharacteristic == null) {
-			this.partyCharacteristic = new HashSet<>();
-		}
-		this.partyCharacteristic.add(partyCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * Get partyCharacteristic
-	 * 
-	 * @return partyCharacteristic
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<Characteristic> getPartyCharacteristic() {
-		return partyCharacteristic;
-	}
-
-	public void setPartyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-	}
-
-	public Individual relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Individual addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Individual skill(Set<Skill> skill) {
-		this.skill = skill;
-		return this;
-	}
-
-	public Individual addSkillItem(Skill skillItem) {
-		if (this.skill == null) {
-			this.skill = new HashSet<>();
-		}
-		this.skill.add(skillItem);
-		return this;
-	}
-
-	/**
-	 * Get skill
-	 * 
-	 * @return skill
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<Skill> getSkill() {
-		return skill;
-	}
-
-	public void setSkill(Set<Skill> skill) {
-		this.skill = skill;
-	}
-
-	public Individual status(IndividualStateType status) {
-		this.status = status;
-		return this;
-	}
-
-	/**
-	 * Status of the individual
-	 * 
-	 * @return status
-	 **/
-	@Schema(description = "Status of the individual")
-
-	@Valid
-
-	public IndividualStateType getStatus() {
-		return status;
-	}
-
-	public void setStatus(IndividualStateType status) {
-		this.status = status;
-	}
-
-	public Individual taxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-		return this;
-	}
-
-	public Individual addTaxExemptionCertificateItem(TaxExemptionCertificate taxExemptionCertificateItem) {
-		if (this.taxExemptionCertificate == null) {
-			this.taxExemptionCertificate = new HashSet<>();
-		}
-		this.taxExemptionCertificate.add(taxExemptionCertificateItem);
-		return this;
-	}
-
-	/**
-	 * Get taxExemptionCertificate
-	 * 
-	 * @return taxExemptionCertificate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<TaxExemptionCertificate> getTaxExemptionCertificate() {
-		return taxExemptionCertificate;
-	}
-
-	public void setTaxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-	}
-
-	public Individual baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public Individual schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public Individual type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Individual individual = (Individual) o;
-		return Objects.equals(this.uuid, individual.uuid) && Objects.equals(this.href, individual.href)
-				&& Objects.equals(this.aristocraticTitle, individual.aristocraticTitle)
-				&& Objects.equals(this.birthDate, individual.birthDate)
-				&& Objects.equals(this.countryOfBirth, individual.countryOfBirth)
-				&& Objects.equals(this.deathDate, individual.deathDate)
-				&& Objects.equals(this.familyName, individual.familyName)
-				&& Objects.equals(this.familyNamePrefix, individual.familyNamePrefix)
-				&& Objects.equals(this.formattedName, individual.formattedName)
-				&& Objects.equals(this.fullName, individual.fullName) && Objects.equals(this.gender, individual.gender)
-				&& Objects.equals(this.generation, individual.generation)
-				&& Objects.equals(this.givenName, individual.givenName)
-				&& Objects.equals(this.legalName, individual.legalName)
-				&& Objects.equals(this.location, individual.location)
-				&& Objects.equals(this.maritalStatus, individual.maritalStatus)
-				&& Objects.equals(this.middleName, individual.middleName)
-				&& Objects.equals(this.nationality, individual.nationality)
-				&& Objects.equals(this.placeOfBirth, individual.placeOfBirth)
-				&& Objects.equals(this.preferredGivenName, individual.preferredGivenName)
-				&& Objects.equals(this.title, individual.title)
-				&& Objects.equals(this.contactMedium, individual.contactMedium)
-				&& Objects.equals(this.creditRating, individual.creditRating)
-				&& Objects.equals(this.disability, individual.disability)
-				&& Objects.equals(this.externalReference, individual.externalReference)
-				&& Objects.equals(this.individualIdentification, individual.individualIdentification)
-				&& Objects.equals(this.languageAbility, individual.languageAbility)
-				&& Objects.equals(this.otherName, individual.otherName)
-				&& Objects.equals(this.partyCharacteristic, individual.partyCharacteristic)
-				&& Objects.equals(this.relatedParty, individual.relatedParty)
-				&& Objects.equals(this.skill, individual.skill) && Objects.equals(this.status, individual.status)
-				&& Objects.equals(this.taxExemptionCertificate, individual.taxExemptionCertificate)
-				&& Objects.equals(this.baseType, individual.baseType)
-				&& Objects.equals(this.schemaLocation, individual.schemaLocation)
-				&& Objects.equals(this.type, individual.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, aristocraticTitle, birthDate, countryOfBirth, deathDate, familyName,
-//				familyNamePrefix, formattedName, fullName, gender, generation, givenName, legalName, location,
-//				maritalStatus, middleName, nationality, placeOfBirth, preferredGivenName, title, contactMedium,
-//				creditRating, disability, externalReference, individualIdentification, languageAbility, otherName,
-//				partyCharacteristic, relatedParty, skill, status, taxExemptionCertificate, baseType, schemaLocation,
-//				type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Individual {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    aristocraticTitle: ").append(toIndentedString(aristocraticTitle)).append("\n");
-		sb.append("    birthDate: ").append(toIndentedString(birthDate)).append("\n");
-		sb.append("    countryOfBirth: ").append(toIndentedString(countryOfBirth)).append("\n");
-		sb.append("    deathDate: ").append(toIndentedString(deathDate)).append("\n");
-		sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
-		sb.append("    familyNamePrefix: ").append(toIndentedString(familyNamePrefix)).append("\n");
-		sb.append("    formattedName: ").append(toIndentedString(formattedName)).append("\n");
-		sb.append("    fullName: ").append(toIndentedString(fullName)).append("\n");
-		sb.append("    gender: ").append(toIndentedString(gender)).append("\n");
-		sb.append("    generation: ").append(toIndentedString(generation)).append("\n");
-		sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
-		sb.append("    legalName: ").append(toIndentedString(legalName)).append("\n");
-		sb.append("    location: ").append(toIndentedString(location)).append("\n");
-		sb.append("    maritalStatus: ").append(toIndentedString(maritalStatus)).append("\n");
-		sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-		sb.append("    nationality: ").append(toIndentedString(nationality)).append("\n");
-		sb.append("    placeOfBirth: ").append(toIndentedString(placeOfBirth)).append("\n");
-		sb.append("    preferredGivenName: ").append(toIndentedString(preferredGivenName)).append("\n");
-		sb.append("    title: ").append(toIndentedString(title)).append("\n");
-		sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-		sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-		sb.append("    disability: ").append(toIndentedString(disability)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    individualIdentification: ").append(toIndentedString(individualIdentification)).append("\n");
-		sb.append("    languageAbility: ").append(toIndentedString(languageAbility)).append("\n");
-		sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-		sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    skill: ").append(toIndentedString(skill)).append("\n");
-		sb.append("    status: ").append(toIndentedString(status)).append("\n");
-		sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEvent.java
deleted file mode 100644
index 41afa3c345b67574cb6ea6eb0061794d9795d2a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private IndividualAttributeValueChangeEventPayload event = null;
-
-  public IndividualAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public IndividualAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public IndividualAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public IndividualAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public IndividualAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public IndividualAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public IndividualAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public IndividualAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public IndividualAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public IndividualAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public IndividualAttributeValueChangeEvent event(IndividualAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public IndividualAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(IndividualAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualAttributeValueChangeEvent individualAttributeValueChangeEvent = (IndividualAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, individualAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.fieldPath, individualAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.eventTime, individualAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.description, individualAttributeValueChangeEvent.description) &&
-        Objects.equals(this.timeOcurred, individualAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.title, individualAttributeValueChangeEvent.title) &&
-        Objects.equals(this.eventType, individualAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.domain, individualAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.priority, individualAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.correlationId, individualAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.event, individualAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, fieldPath, eventTime, description, timeOcurred, title, eventType, domain, priority, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEventPayload.java
deleted file mode 100644
index 9a5cdcacb094396e02c2c6b08e7e9c247f60b0fe..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualAttributeValueChangeEventPayload   {
-  @JsonProperty("individual")
-  private Individual individual = null;
-
-  public IndividualAttributeValueChangeEventPayload individual(Individual individual) {
-    this.individual = individual;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return individual
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Individual getIndividual() {
-    return individual;
-  }
-
-  public void setIndividual(Individual individual) {
-    this.individual = individual;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualAttributeValueChangeEventPayload individualAttributeValueChangeEventPayload = (IndividualAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.individual, individualAttributeValueChangeEventPayload.individual);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(individual);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    individual: ").append(toIndentedString(individual)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreate.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreate.java
deleted file mode 100644
index 34861fe9305dcda399a47fb98b236d133371e9d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreate.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Individual represents a single human being (a man, woman or child). The individual can be a customer, an employee or any other person that the organization needs to store information about. Skipped properties: id,href
- */
-@Schema(description = "Individual represents a single human being (a man, woman or child). The individual can be a customer, an employee or any other person that the organization needs to store information about. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualCreate  extends  IndividualUpdate {
-  
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualCreate individualCreate = (IndividualCreate) o;
-    return Objects.equals(this.aristocraticTitle, individualCreate.aristocraticTitle) &&
-        Objects.equals(this.birthDate, individualCreate.birthDate) &&
-        Objects.equals(this.countryOfBirth, individualCreate.countryOfBirth) &&
-        Objects.equals(this.deathDate, individualCreate.deathDate) &&
-        Objects.equals(this.familyName, individualCreate.familyName) &&
-        Objects.equals(this.familyNamePrefix, individualCreate.familyNamePrefix) &&
-        Objects.equals(this.formattedName, individualCreate.formattedName) &&
-        Objects.equals(this.fullName, individualCreate.fullName) &&
-        Objects.equals(this.gender, individualCreate.gender) &&
-        Objects.equals(this.generation, individualCreate.generation) &&
-        Objects.equals(this.givenName, individualCreate.givenName) &&
-        Objects.equals(this.legalName, individualCreate.legalName) &&
-        Objects.equals(this.location, individualCreate.location) &&
-        Objects.equals(this.maritalStatus, individualCreate.maritalStatus) &&
-        Objects.equals(this.middleName, individualCreate.middleName) &&
-        Objects.equals(this.nationality, individualCreate.nationality) &&
-        Objects.equals(this.placeOfBirth, individualCreate.placeOfBirth) &&
-        Objects.equals(this.preferredGivenName, individualCreate.preferredGivenName) &&
-        Objects.equals(this.title, individualCreate.title) &&
-        Objects.equals(this.contactMedium, individualCreate.contactMedium) &&
-        Objects.equals(this.creditRating, individualCreate.creditRating) &&
-        Objects.equals(this.disability, individualCreate.disability) &&
-        Objects.equals(this.externalReference, individualCreate.externalReference) &&
-        Objects.equals(this.individualIdentification, individualCreate.individualIdentification) &&
-        Objects.equals(this.languageAbility, individualCreate.languageAbility) &&
-        Objects.equals(this.otherName, individualCreate.otherName) &&
-        Objects.equals(this.partyCharacteristic, individualCreate.partyCharacteristic) &&
-        Objects.equals(this.relatedParty, individualCreate.relatedParty) &&
-        Objects.equals(this.skill, individualCreate.skill) &&
-        Objects.equals(this.status, individualCreate.status) &&
-        Objects.equals(this.taxExemptionCertificate, individualCreate.taxExemptionCertificate) &&
-        Objects.equals(this.baseType, individualCreate.baseType) &&
-        Objects.equals(this.schemaLocation, individualCreate.schemaLocation) &&
-        Objects.equals(this.type, individualCreate.type);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualCreate {\n");
-    
-    sb.append("    aristocraticTitle: ").append(toIndentedString(aristocraticTitle)).append("\n");
-    sb.append("    birthDate: ").append(toIndentedString(birthDate)).append("\n");
-    sb.append("    countryOfBirth: ").append(toIndentedString(countryOfBirth)).append("\n");
-    sb.append("    deathDate: ").append(toIndentedString(deathDate)).append("\n");
-    sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
-    sb.append("    familyNamePrefix: ").append(toIndentedString(familyNamePrefix)).append("\n");
-    sb.append("    formattedName: ").append(toIndentedString(formattedName)).append("\n");
-    sb.append("    fullName: ").append(toIndentedString(fullName)).append("\n");
-    sb.append("    gender: ").append(toIndentedString(gender)).append("\n");
-    sb.append("    generation: ").append(toIndentedString(generation)).append("\n");
-    sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
-    sb.append("    legalName: ").append(toIndentedString(legalName)).append("\n");
-    sb.append("    location: ").append(toIndentedString(location)).append("\n");
-    sb.append("    maritalStatus: ").append(toIndentedString(maritalStatus)).append("\n");
-    sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-    sb.append("    nationality: ").append(toIndentedString(nationality)).append("\n");
-    sb.append("    placeOfBirth: ").append(toIndentedString(placeOfBirth)).append("\n");
-    sb.append("    preferredGivenName: ").append(toIndentedString(preferredGivenName)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-    sb.append("    disability: ").append(toIndentedString(disability)).append("\n");
-    sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-    sb.append("    individualIdentification: ").append(toIndentedString(individualIdentification)).append("\n");
-    sb.append("    languageAbility: ").append(toIndentedString(languageAbility)).append("\n");
-    sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-    sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    skill: ").append(toIndentedString(skill)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEvent.java
deleted file mode 100644
index fc12211cc3ce1715a79d94a738c7dcd658519d43..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualCreateEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private IndividualCreateEventPayload event = null;
-
-  public IndividualCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public IndividualCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public IndividualCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public IndividualCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public IndividualCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public IndividualCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public IndividualCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public IndividualCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public IndividualCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public IndividualCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public IndividualCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public IndividualCreateEvent event(IndividualCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public IndividualCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(IndividualCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualCreateEvent individualCreateEvent = (IndividualCreateEvent) o;
-    return Objects.equals(this.eventId, individualCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, individualCreateEvent.eventTime) &&
-        Objects.equals(this.description, individualCreateEvent.description) &&
-        Objects.equals(this.timeOcurred, individualCreateEvent.timeOcurred) &&
-        Objects.equals(this.title, individualCreateEvent.title) &&
-        Objects.equals(this.eventType, individualCreateEvent.eventType) &&
-        Objects.equals(this.domain, individualCreateEvent.domain) &&
-        Objects.equals(this.priority, individualCreateEvent.priority) &&
-        Objects.equals(this.href, individualCreateEvent.href) &&
-        Objects.equals(this.id, individualCreateEvent.id) &&
-        Objects.equals(this.correlationId, individualCreateEvent.correlationId) &&
-        Objects.equals(this.event, individualCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualCreateEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEventPayload.java
deleted file mode 100644
index 41c37ee686eb23c0d46ea03a0e9ddce4b929f2e8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualCreateEventPayload   {
-  @JsonProperty("individual")
-  private Individual individual = null;
-
-  public IndividualCreateEventPayload individual(Individual individual) {
-    this.individual = individual;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return individual
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Individual getIndividual() {
-    return individual;
-  }
-
-  public void setIndividual(Individual individual) {
-    this.individual = individual;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualCreateEventPayload individualCreateEventPayload = (IndividualCreateEventPayload) o;
-    return Objects.equals(this.individual, individualCreateEventPayload.individual);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(individual);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualCreateEventPayload {\n");
-    
-    sb.append("    individual: ").append(toIndentedString(individual)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEvent.java
deleted file mode 100644
index 320fff978665da154dc359e7126c8e87a1a2659f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualDeleteEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private IndividualDeleteEventPayload event = null;
-
-  public IndividualDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public IndividualDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public IndividualDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public IndividualDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public IndividualDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public IndividualDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public IndividualDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public IndividualDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public IndividualDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public IndividualDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public IndividualDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public IndividualDeleteEvent event(IndividualDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public IndividualDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(IndividualDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualDeleteEvent individualDeleteEvent = (IndividualDeleteEvent) o;
-    return Objects.equals(this.eventId, individualDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, individualDeleteEvent.eventTime) &&
-        Objects.equals(this.description, individualDeleteEvent.description) &&
-        Objects.equals(this.timeOcurred, individualDeleteEvent.timeOcurred) &&
-        Objects.equals(this.title, individualDeleteEvent.title) &&
-        Objects.equals(this.eventType, individualDeleteEvent.eventType) &&
-        Objects.equals(this.domain, individualDeleteEvent.domain) &&
-        Objects.equals(this.priority, individualDeleteEvent.priority) &&
-        Objects.equals(this.href, individualDeleteEvent.href) &&
-        Objects.equals(this.id, individualDeleteEvent.id) &&
-        Objects.equals(this.correlationId, individualDeleteEvent.correlationId) &&
-        Objects.equals(this.event, individualDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualDeleteEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEventPayload.java
deleted file mode 100644
index ecec1067464084b3cdda79349d2244f289734e2d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualDeleteEventPayload   {
-  @JsonProperty("individual")
-  private Individual individual = null;
-
-  public IndividualDeleteEventPayload individual(Individual individual) {
-    this.individual = individual;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return individual
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Individual getIndividual() {
-    return individual;
-  }
-
-  public void setIndividual(Individual individual) {
-    this.individual = individual;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualDeleteEventPayload individualDeleteEventPayload = (IndividualDeleteEventPayload) o;
-    return Objects.equals(this.individual, individualDeleteEventPayload.individual);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(individual);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualDeleteEventPayload {\n");
-    
-    sb.append("    individual: ").append(toIndentedString(individual)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualIdentification.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualIdentification.java
deleted file mode 100644
index d1797d9951aab2852f67e4ed20f5679d2ace2ab2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualIdentification.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Represents our registration of information used as proof of identity by an
- * individual (passport, national identity card, drivers license, social
- * security number, birth certificate)
- */
-@Schema(description = "Represents our registration of information used as proof of identity by an individual (passport, national identity card, drivers license, social security number, birth certificate)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class IndividualIdentification extends BaseRootEntity {
-	@JsonProperty("identificationId")
-	private String identificationId = null;
-
-	@JsonProperty("identificationType")
-	private String identificationType = null;
-
-	@JsonProperty("issuingAuthority")
-	private String issuingAuthority = null;
-
-	private OffsetDateTime issuingDate = null;
-
-	@JsonProperty("attachment")
-	@OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "attachmentrv_refid", referencedColumnName = "uuid")
-	private AttachmentRefOrValue attachment = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public IndividualIdentification identificationId(String identificationId) {
-		this.identificationId = identificationId;
-		return this;
-	}
-
-	/**
-	 * Identifier
-	 * 
-	 * @return identificationId
-	 **/
-	@Schema(description = "Identifier")
-
-	public String getIdentificationId() {
-		return identificationId;
-	}
-
-	public void setIdentificationId(String identificationId) {
-		this.identificationId = identificationId;
-	}
-
-	public IndividualIdentification identificationType(String identificationType) {
-		this.identificationType = identificationType;
-		return this;
-	}
-
-	/**
-	 * Identification type (passport, national identity card, drivers license,
-	 * social security number, birth certificate)
-	 * 
-	 * @return identificationType
-	 **/
-	@Schema(description = "Identification type (passport, national identity card, drivers license, social security number, birth certificate)")
-
-	public String getIdentificationType() {
-		return identificationType;
-	}
-
-	public void setIdentificationType(String identificationType) {
-		this.identificationType = identificationType;
-	}
-
-	public IndividualIdentification issuingAuthority(String issuingAuthority) {
-		this.issuingAuthority = issuingAuthority;
-		return this;
-	}
-
-	/**
-	 * Authority which has issued the identifier, such as: social security, town
-	 * hall
-	 * 
-	 * @return issuingAuthority
-	 **/
-	@Schema(description = "Authority which has issued the identifier, such as: social security, town hall")
-
-	public String getIssuingAuthority() {
-		return issuingAuthority;
-	}
-
-	public void setIssuingAuthority(String issuingAuthority) {
-		this.issuingAuthority = issuingAuthority;
-	}
-
-	public IndividualIdentification issuingDate(OffsetDateTime issuingDate) {
-		this.issuingDate = issuingDate;
-		return this;
-	}
-
-	/**
-	 * Date at which the identifier was issued
-	 * 
-	 * @return issuingDate
-	 **/
-	@Schema(description = "Date at which the identifier was issued")
-
-	@Valid
-
-	@JsonProperty("issuingDate")
-	public String getIssuingDateString() {
-		return issuingDate.toString();
-	}
-
-	public OffsetDateTime getIssuingDate() {
-		return issuingDate;
-	}
-
-	public void setIssuingDate(OffsetDateTime issuingDate) {
-		this.issuingDate = issuingDate;
-	}
-
-	public IndividualIdentification attachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	/**
-	 * Get attachment
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public AttachmentRefOrValue getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-	}
-
-	public IndividualIdentification validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the identification information is valid.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the identification information is valid.")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		IndividualIdentification individualIdentification = (IndividualIdentification) o;
-		return Objects.equals(this.identificationId, individualIdentification.identificationId)
-				&& Objects.equals(this.identificationType, individualIdentification.identificationType)
-				&& Objects.equals(this.issuingAuthority, individualIdentification.issuingAuthority)
-				&& Objects.equals(this.issuingDate, individualIdentification.issuingDate)
-				&& Objects.equals(this.attachment, individualIdentification.attachment)
-				&& Objects.equals(this.validFor, individualIdentification.validFor)
-				&& Objects.equals(this.baseType, individualIdentification.baseType)
-				&& Objects.equals(this.schemaLocation, individualIdentification.schemaLocation)
-				&& Objects.equals(this.type, individualIdentification.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(identificationId, identificationType, issuingAuthority, issuingDate, attachment, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class IndividualIdentification {\n");
-
-		sb.append("    identificationId: ").append(toIndentedString(identificationId)).append("\n");
-		sb.append("    identificationType: ").append(toIndentedString(identificationType)).append("\n");
-		sb.append("    issuingAuthority: ").append(toIndentedString(issuingAuthority)).append("\n");
-		sb.append("    issuingDate: ").append(toIndentedString(issuingDate)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEvent.java
deleted file mode 100644
index b2db1c05ca7f67f39bd295f4adfa2f4f53e11020..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualStateChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private IndividualStateChangeEventPayload event = null;
-
-  public IndividualStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public IndividualStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public IndividualStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public IndividualStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public IndividualStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public IndividualStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public IndividualStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public IndividualStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public IndividualStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public IndividualStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public IndividualStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public IndividualStateChangeEvent event(IndividualStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public IndividualStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(IndividualStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualStateChangeEvent individualStateChangeEvent = (IndividualStateChangeEvent) o;
-    return Objects.equals(this.eventId, individualStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, individualStateChangeEvent.eventTime) &&
-        Objects.equals(this.description, individualStateChangeEvent.description) &&
-        Objects.equals(this.timeOcurred, individualStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.title, individualStateChangeEvent.title) &&
-        Objects.equals(this.eventType, individualStateChangeEvent.eventType) &&
-        Objects.equals(this.domain, individualStateChangeEvent.domain) &&
-        Objects.equals(this.priority, individualStateChangeEvent.priority) &&
-        Objects.equals(this.href, individualStateChangeEvent.href) &&
-        Objects.equals(this.id, individualStateChangeEvent.id) &&
-        Objects.equals(this.correlationId, individualStateChangeEvent.correlationId) &&
-        Objects.equals(this.event, individualStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualStateChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEventPayload.java
deleted file mode 100644
index 1757e831f88b909b376c34014e75643c5c700db0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualStateChangeEventPayload   {
-  @JsonProperty("individual")
-  private Individual individual = null;
-
-  public IndividualStateChangeEventPayload individual(Individual individual) {
-    this.individual = individual;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return individual
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Individual getIndividual() {
-    return individual;
-  }
-
-  public void setIndividual(Individual individual) {
-    this.individual = individual;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IndividualStateChangeEventPayload individualStateChangeEventPayload = (IndividualStateChangeEventPayload) o;
-    return Objects.equals(this.individual, individualStateChangeEventPayload.individual);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(individual);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IndividualStateChangeEventPayload {\n");
-    
-    sb.append("    individual: ").append(toIndentedString(individual)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateType.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateType.java
deleted file mode 100644
index 8c8679a8e78e62f8ccc4cad59c758314b86195af..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualStateType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Valid values for the lifecycle state of the individual
- */
-public enum IndividualStateType {
-  
-  INITIALIZED("initialized"),
-  
-  VALIDATED("validated"),
-  
-  DECEADED("deceaded");
-
-  private String value;
-
-  IndividualStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static IndividualStateType fromValue(String text) {
-    for (IndividualStateType b : IndividualStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualUpdate.java b/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualUpdate.java
deleted file mode 100644
index 4944c7c24528a11fbf7298d6734ba84b7d5e962a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/IndividualUpdate.java
+++ /dev/null
@@ -1,1079 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Individual represents a single human being (a man, woman or child). The
- * individual can be a customer, an employee or any other person that the
- * organization needs to store information about. Skipped properties: id,href
- */
-@Schema(description = "Individual represents a single human being (a man, woman or child). The individual can be a customer, an employee or any other person that the organization needs to store information about. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class IndividualUpdate {
-	@JsonProperty("aristocraticTitle")
-	protected String aristocraticTitle = null;
-
-	protected OffsetDateTime birthDate = null;
-
-	@JsonProperty("countryOfBirth")
-	protected String countryOfBirth = null;
-
-	protected OffsetDateTime deathDate = null;
-
-	@JsonProperty("familyName")
-	protected String familyName = null;
-
-	@JsonProperty("familyNamePrefix")
-	protected String familyNamePrefix = null;
-
-	@JsonProperty("formattedName")
-	protected String formattedName = null;
-
-	@JsonProperty("fullName")
-	protected String fullName = null;
-
-	@JsonProperty("gender")
-	protected String gender = null;
-
-	@JsonProperty("generation")
-	protected String generation = null;
-
-	@JsonProperty("givenName")
-	protected String givenName = null;
-
-	@JsonProperty("legalName")
-	protected String legalName = null;
-
-	@JsonProperty("location")
-	protected String location = null;
-
-	@JsonProperty("maritalStatus")
-	protected String maritalStatus = null;
-
-	@JsonProperty("middleName")
-	protected String middleName = null;
-
-	@JsonProperty("nationality")
-	protected String nationality = null;
-
-	@JsonProperty("placeOfBirth")
-	protected String placeOfBirth = null;
-
-	@JsonProperty("preferredGivenName")
-	protected String preferredGivenName = null;
-
-	@JsonProperty("title")
-	protected String title = null;
-
-	@JsonProperty("contactMedium")
-	@Valid
-	protected List<ContactMedium> contactMedium = null;
-
-	@JsonProperty("creditRating")
-	@Valid
-	protected List<PartyCreditProfile> creditRating = null;
-
-	@JsonProperty("disability")
-	@Valid
-	protected List<Disability> disability = null;
-
-	@JsonProperty("externalReference")
-	@Valid
-	protected List<ExternalReference> externalReference = null;
-
-	@JsonProperty("individualIdentification")
-	@Valid
-	protected List<IndividualIdentification> individualIdentification = null;
-
-	@JsonProperty("languageAbility")
-	@Valid
-	protected List<LanguageAbility> languageAbility = null;
-
-	@JsonProperty("otherName")
-	@Valid
-	protected List<OtherNameIndividual> otherName = null;
-
-	@JsonProperty("partyCharacteristic")
-	@Valid
-	protected List<Characteristic> partyCharacteristic = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("skill")
-	@Valid
-	protected List<Skill> skill = null;
-
-	@JsonProperty("status")
-	protected IndividualStateType status = null;
-
-	@JsonProperty("taxExemptionCertificate")
-	@Valid
-	protected List<TaxExemptionCertificate> taxExemptionCertificate = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public IndividualUpdate aristocraticTitle(String aristocraticTitle) {
-		this.aristocraticTitle = aristocraticTitle;
-		return this;
-	}
-
-	/**
-	 * e.g. Baron, Graf, Earl,…
-	 * 
-	 * @return aristocraticTitle
-	 **/
-	@Schema(description = "e.g. Baron, Graf, Earl,…")
-
-	public String getAristocraticTitle() {
-		return aristocraticTitle;
-	}
-
-	public void setAristocraticTitle(String aristocraticTitle) {
-		this.aristocraticTitle = aristocraticTitle;
-	}
-
-	public IndividualUpdate birthDate(OffsetDateTime birthDate) {
-		this.birthDate = birthDate;
-		return this;
-	}
-
-	/**
-	 * Birth date
-	 * 
-	 * @return birthDate
-	 **/
-	@Schema(description = "Birth date")
-
-	@Valid
-
-	@JsonProperty("birthDate")
-	public String getBirthDateString() {
-		if ( birthDate == null ) {
-			return null;
-		}
-		return  birthDate.toString();
-	}
-
-	public OffsetDateTime getBirthDate() {
-		return birthDate;
-	}
-
-	public void setBirthDate(OffsetDateTime birthDate) {
-		this.birthDate = birthDate;
-	}
-
-	public IndividualUpdate countryOfBirth(String countryOfBirth) {
-		this.countryOfBirth = countryOfBirth;
-		return this;
-	}
-
-	/**
-	 * Country where the individual was born
-	 * 
-	 * @return countryOfBirth
-	 **/
-	@Schema(description = "Country where the individual was born")
-
-	public String getCountryOfBirth() {
-		return countryOfBirth;
-	}
-
-	public void setCountryOfBirth(String countryOfBirth) {
-		this.countryOfBirth = countryOfBirth;
-	}
-
-	public IndividualUpdate deathDate(OffsetDateTime deathDate) {
-		this.deathDate = deathDate;
-		return this;
-	}
-
-	/**
-	 * Date of death
-	 * 
-	 * @return deathDate
-	 **/
-	@Schema(description = "Date of death")
-
-	@Valid
-
-	@JsonProperty("deathDate")
-	public String getDeathDateString() {
-		if ( deathDate == null ) {
-			return null;
-		}
-		return deathDate.toString();
-	}
-
-	public OffsetDateTime getDeathDate() {
-		return deathDate;
-	}
-
-	public void setDeathDate(OffsetDateTime deathDate) {
-		this.deathDate = deathDate;
-	}
-
-	public IndividualUpdate familyName(String familyName) {
-		this.familyName = familyName;
-		return this;
-	}
-
-	/**
-	 * Contains the non-chosen or inherited name. Also known as last name in the
-	 * Western context
-	 * 
-	 * @return familyName
-	 **/
-	@Schema(description = "Contains the non-chosen or inherited name. Also known as last name in the Western context")
-
-	public String getFamilyName() {
-		return familyName;
-	}
-
-	public void setFamilyName(String familyName) {
-		this.familyName = familyName;
-	}
-
-	public IndividualUpdate familyNamePrefix(String familyNamePrefix) {
-		this.familyNamePrefix = familyNamePrefix;
-		return this;
-	}
-
-	/**
-	 * Family name prefix
-	 * 
-	 * @return familyNamePrefix
-	 **/
-	@Schema(description = "Family name prefix")
-
-	public String getFamilyNamePrefix() {
-		return familyNamePrefix;
-	}
-
-	public void setFamilyNamePrefix(String familyNamePrefix) {
-		this.familyNamePrefix = familyNamePrefix;
-	}
-
-	public IndividualUpdate formattedName(String formattedName) {
-		this.formattedName = formattedName;
-		return this;
-	}
-
-	/**
-	 * A fully formatted name in one string with all of its pieces in their proper
-	 * place and all of the necessary punctuation. Useful for specific contexts
-	 * (Chinese, Japanese, Korean,…)
-	 * 
-	 * @return formattedName
-	 **/
-	@Schema(description = "A fully formatted name in one string with all of its pieces in their proper place and all of the necessary punctuation. Useful for specific contexts (Chinese, Japanese, Korean,…)")
-
-	public String getFormattedName() {
-		return formattedName;
-	}
-
-	public void setFormattedName(String formattedName) {
-		this.formattedName = formattedName;
-	}
-
-	public IndividualUpdate fullName(String fullName) {
-		this.fullName = fullName;
-		return this;
-	}
-
-	/**
-	 * Full name flatten (first, middle, and last names)
-	 * 
-	 * @return fullName
-	 **/
-	@Schema(description = "Full name flatten (first, middle, and last names)")
-
-	public String getFullName() {
-		return fullName;
-	}
-
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-
-	public IndividualUpdate gender(String gender) {
-		this.gender = gender;
-		return this;
-	}
-
-	/**
-	 * Gender
-	 * 
-	 * @return gender
-	 **/
-	@Schema(description = "Gender")
-
-	public String getGender() {
-		return gender;
-	}
-
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
-
-	public IndividualUpdate generation(String generation) {
-		this.generation = generation;
-		return this;
-	}
-
-	/**
-	 * e.g.. Sr, Jr, III (the third),…
-	 * 
-	 * @return generation
-	 **/
-	@Schema(description = "e.g.. Sr, Jr, III (the third),…")
-
-	public String getGeneration() {
-		return generation;
-	}
-
-	public void setGeneration(String generation) {
-		this.generation = generation;
-	}
-
-	public IndividualUpdate givenName(String givenName) {
-		this.givenName = givenName;
-		return this;
-	}
-
-	/**
-	 * First name of the individual
-	 * 
-	 * @return givenName
-	 **/
-	@Schema(description = "First name of the individual")
-
-	public String getGivenName() {
-		return givenName;
-	}
-
-	public void setGivenName(String givenName) {
-		this.givenName = givenName;
-	}
-
-	public IndividualUpdate legalName(String legalName) {
-		this.legalName = legalName;
-		return this;
-	}
-
-	/**
-	 * Legal name or birth name (name one has for official purposes)
-	 * 
-	 * @return legalName
-	 **/
-	@Schema(description = "Legal name or birth name (name one has for official purposes)")
-
-	public String getLegalName() {
-		return legalName;
-	}
-
-	public void setLegalName(String legalName) {
-		this.legalName = legalName;
-	}
-
-	public IndividualUpdate location(String location) {
-		this.location = location;
-		return this;
-	}
-
-	/**
-	 * Temporary current location od the individual (may be used if the individual
-	 * has approved its sharing)
-	 * 
-	 * @return location
-	 **/
-	@Schema(description = "Temporary current location od the individual (may be used if the individual has approved its sharing)")
-
-	public String getLocation() {
-		return location;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public IndividualUpdate maritalStatus(String maritalStatus) {
-		this.maritalStatus = maritalStatus;
-		return this;
-	}
-
-	/**
-	 * Marital status (married, divorced, widow ...)
-	 * 
-	 * @return maritalStatus
-	 **/
-	@Schema(description = "Marital status (married, divorced, widow ...)")
-
-	public String getMaritalStatus() {
-		return maritalStatus;
-	}
-
-	public void setMaritalStatus(String maritalStatus) {
-		this.maritalStatus = maritalStatus;
-	}
-
-	public IndividualUpdate middleName(String middleName) {
-		this.middleName = middleName;
-		return this;
-	}
-
-	/**
-	 * Middles name or initial
-	 * 
-	 * @return middleName
-	 **/
-	@Schema(description = "Middles name or initial")
-
-	public String getMiddleName() {
-		return middleName;
-	}
-
-	public void setMiddleName(String middleName) {
-		this.middleName = middleName;
-	}
-
-	public IndividualUpdate nationality(String nationality) {
-		this.nationality = nationality;
-		return this;
-	}
-
-	/**
-	 * Nationality
-	 * 
-	 * @return nationality
-	 **/
-	@Schema(description = "Nationality")
-
-	public String getNationality() {
-		return nationality;
-	}
-
-	public void setNationality(String nationality) {
-		this.nationality = nationality;
-	}
-
-	public IndividualUpdate placeOfBirth(String placeOfBirth) {
-		this.placeOfBirth = placeOfBirth;
-		return this;
-	}
-
-	/**
-	 * Reference to the place where the individual was born
-	 * 
-	 * @return placeOfBirth
-	 **/
-	@Schema(description = "Reference to the place where the individual was born")
-
-	public String getPlaceOfBirth() {
-		return placeOfBirth;
-	}
-
-	public void setPlaceOfBirth(String placeOfBirth) {
-		this.placeOfBirth = placeOfBirth;
-	}
-
-	public IndividualUpdate preferredGivenName(String preferredGivenName) {
-		this.preferredGivenName = preferredGivenName;
-		return this;
-	}
-
-	/**
-	 * Contains the chosen name by which the individual prefers to be addressed.
-	 * Note: This name may be a name other than a given name, such as a nickname
-	 * 
-	 * @return preferredGivenName
-	 **/
-	@Schema(description = "Contains the chosen name by which the individual prefers to be addressed. Note: This name may be a name other than a given name, such as a nickname")
-
-	public String getPreferredGivenName() {
-		return preferredGivenName;
-	}
-
-	public void setPreferredGivenName(String preferredGivenName) {
-		this.preferredGivenName = preferredGivenName;
-	}
-
-	public IndividualUpdate title(String title) {
-		this.title = title;
-		return this;
-	}
-
-	/**
-	 * Useful for titles (aristocratic, social,...) Pr, Dr, Sir, ...
-	 * 
-	 * @return title
-	 **/
-	@Schema(description = "Useful for titles (aristocratic, social,...) Pr, Dr, Sir, ...")
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public IndividualUpdate contactMedium(List<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-		return this;
-	}
-
-	public IndividualUpdate addContactMediumItem(ContactMedium contactMediumItem) {
-		if (this.contactMedium == null) {
-			this.contactMedium = new ArrayList<>();
-		}
-		this.contactMedium.add(contactMediumItem);
-		return this;
-	}
-
-	/**
-	 * Get contactMedium
-	 * 
-	 * @return contactMedium
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<ContactMedium> getContactMedium() {
-		return contactMedium;
-	}
-
-	public void setContactMedium(List<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-	}
-
-	public IndividualUpdate creditRating(List<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-		return this;
-	}
-
-	public IndividualUpdate addCreditRatingItem(PartyCreditProfile creditRatingItem) {
-		if (this.creditRating == null) {
-			this.creditRating = new ArrayList<>();
-		}
-		this.creditRating.add(creditRatingItem);
-		return this;
-	}
-
-	/**
-	 * Get creditRating
-	 * 
-	 * @return creditRating
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<PartyCreditProfile> getCreditRating() {
-		return creditRating;
-	}
-
-	public void setCreditRating(List<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-	}
-
-	public IndividualUpdate disability(List<Disability> disability) {
-		this.disability = disability;
-		return this;
-	}
-
-	public IndividualUpdate addDisabilityItem(Disability disabilityItem) {
-		if (this.disability == null) {
-			this.disability = new ArrayList<>();
-		}
-		this.disability.add(disabilityItem);
-		return this;
-	}
-
-	/**
-	 * Get disability
-	 * 
-	 * @return disability
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<Disability> getDisability() {
-		return disability;
-	}
-
-	public void setDisability(List<Disability> disability) {
-		this.disability = disability;
-	}
-
-	public IndividualUpdate externalReference(List<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public IndividualUpdate addExternalReferenceItem(ExternalReference externalReferenceItem) {
-		if (this.externalReference == null) {
-			this.externalReference = new ArrayList<>();
-		}
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<ExternalReference> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(List<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public IndividualUpdate individualIdentification(List<IndividualIdentification> individualIdentification) {
-		this.individualIdentification = individualIdentification;
-		return this;
-	}
-
-	public IndividualUpdate addIndividualIdentificationItem(IndividualIdentification individualIdentificationItem) {
-		if (this.individualIdentification == null) {
-			this.individualIdentification = new ArrayList<>();
-		}
-		this.individualIdentification.add(individualIdentificationItem);
-		return this;
-	}
-
-	/**
-	 * Get individualIdentification
-	 * 
-	 * @return individualIdentification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<IndividualIdentification> getIndividualIdentification() {
-		return individualIdentification;
-	}
-
-	public void setIndividualIdentification(List<IndividualIdentification> individualIdentification) {
-		this.individualIdentification = individualIdentification;
-	}
-
-	public IndividualUpdate languageAbility(List<LanguageAbility> languageAbility) {
-		this.languageAbility = languageAbility;
-		return this;
-	}
-
-	public IndividualUpdate addLanguageAbilityItem(LanguageAbility languageAbilityItem) {
-		if (this.languageAbility == null) {
-			this.languageAbility = new ArrayList<>();
-		}
-		this.languageAbility.add(languageAbilityItem);
-		return this;
-	}
-
-	/**
-	 * Get languageAbility
-	 * 
-	 * @return languageAbility
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<LanguageAbility> getLanguageAbility() {
-		return languageAbility;
-	}
-
-	public void setLanguageAbility(List<LanguageAbility> languageAbility) {
-		this.languageAbility = languageAbility;
-	}
-
-	public IndividualUpdate otherName(List<OtherNameIndividual> otherName) {
-		this.otherName = otherName;
-		return this;
-	}
-
-	public IndividualUpdate addOtherNameItem(OtherNameIndividual otherNameItem) {
-		if (this.otherName == null) {
-			this.otherName = new ArrayList<>();
-		}
-		this.otherName.add(otherNameItem);
-		return this;
-	}
-
-	/**
-	 * Get otherName
-	 * 
-	 * @return otherName
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<OtherNameIndividual> getOtherName() {
-		return otherName;
-	}
-
-	public void setOtherName(List<OtherNameIndividual> otherName) {
-		this.otherName = otherName;
-	}
-
-	public IndividualUpdate partyCharacteristic(List<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-		return this;
-	}
-
-	public IndividualUpdate addPartyCharacteristicItem(Characteristic partyCharacteristicItem) {
-		if (this.partyCharacteristic == null) {
-			this.partyCharacteristic = new ArrayList<>();
-		}
-		this.partyCharacteristic.add(partyCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * Get partyCharacteristic
-	 * 
-	 * @return partyCharacteristic
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<Characteristic> getPartyCharacteristic() {
-		return partyCharacteristic;
-	}
-
-	public void setPartyCharacteristic(List<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-	}
-
-	public IndividualUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public IndividualUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public IndividualUpdate skill(List<Skill> skill) {
-		this.skill = skill;
-		return this;
-	}
-
-	public IndividualUpdate addSkillItem(Skill skillItem) {
-		if (this.skill == null) {
-			this.skill = new ArrayList<>();
-		}
-		this.skill.add(skillItem);
-		return this;
-	}
-
-	/**
-	 * Get skill
-	 * 
-	 * @return skill
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<Skill> getSkill() {
-		return skill;
-	}
-
-	public void setSkill(List<Skill> skill) {
-		this.skill = skill;
-	}
-
-	public IndividualUpdate status(IndividualStateType status) {
-		this.status = status;
-		return this;
-	}
-
-	/**
-	 * Status of the individual
-	 * 
-	 * @return status
-	 **/
-	@Schema(description = "Status of the individual")
-
-	@Valid
-
-	public IndividualStateType getStatus() {
-		return status;
-	}
-
-	public void setStatus(IndividualStateType status) {
-		this.status = status;
-	}
-
-	public IndividualUpdate taxExemptionCertificate(List<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-		return this;
-	}
-
-	public IndividualUpdate addTaxExemptionCertificateItem(TaxExemptionCertificate taxExemptionCertificateItem) {
-		if (this.taxExemptionCertificate == null) {
-			this.taxExemptionCertificate = new ArrayList<>();
-		}
-		this.taxExemptionCertificate.add(taxExemptionCertificateItem);
-		return this;
-	}
-
-	/**
-	 * Get taxExemptionCertificate
-	 * 
-	 * @return taxExemptionCertificate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<TaxExemptionCertificate> getTaxExemptionCertificate() {
-		return taxExemptionCertificate;
-	}
-
-	public void setTaxExemptionCertificate(List<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-	}
-
-	public IndividualUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public IndividualUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public IndividualUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		IndividualUpdate individualUpdate = (IndividualUpdate) o;
-		return Objects.equals(this.aristocraticTitle, individualUpdate.aristocraticTitle)
-				&& Objects.equals(this.birthDate, individualUpdate.birthDate)
-				&& Objects.equals(this.countryOfBirth, individualUpdate.countryOfBirth)
-				&& Objects.equals(this.deathDate, individualUpdate.deathDate)
-				&& Objects.equals(this.familyName, individualUpdate.familyName)
-				&& Objects.equals(this.familyNamePrefix, individualUpdate.familyNamePrefix)
-				&& Objects.equals(this.formattedName, individualUpdate.formattedName)
-				&& Objects.equals(this.fullName, individualUpdate.fullName)
-				&& Objects.equals(this.gender, individualUpdate.gender)
-				&& Objects.equals(this.generation, individualUpdate.generation)
-				&& Objects.equals(this.givenName, individualUpdate.givenName)
-				&& Objects.equals(this.legalName, individualUpdate.legalName)
-				&& Objects.equals(this.location, individualUpdate.location)
-				&& Objects.equals(this.maritalStatus, individualUpdate.maritalStatus)
-				&& Objects.equals(this.middleName, individualUpdate.middleName)
-				&& Objects.equals(this.nationality, individualUpdate.nationality)
-				&& Objects.equals(this.placeOfBirth, individualUpdate.placeOfBirth)
-				&& Objects.equals(this.preferredGivenName, individualUpdate.preferredGivenName)
-				&& Objects.equals(this.title, individualUpdate.title)
-				&& Objects.equals(this.contactMedium, individualUpdate.contactMedium)
-				&& Objects.equals(this.creditRating, individualUpdate.creditRating)
-				&& Objects.equals(this.disability, individualUpdate.disability)
-				&& Objects.equals(this.externalReference, individualUpdate.externalReference)
-				&& Objects.equals(this.individualIdentification, individualUpdate.individualIdentification)
-				&& Objects.equals(this.languageAbility, individualUpdate.languageAbility)
-				&& Objects.equals(this.otherName, individualUpdate.otherName)
-				&& Objects.equals(this.partyCharacteristic, individualUpdate.partyCharacteristic)
-				&& Objects.equals(this.relatedParty, individualUpdate.relatedParty)
-				&& Objects.equals(this.skill, individualUpdate.skill)
-				&& Objects.equals(this.status, individualUpdate.status)
-				&& Objects.equals(this.taxExemptionCertificate, individualUpdate.taxExemptionCertificate)
-				&& Objects.equals(this.baseType, individualUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, individualUpdate.schemaLocation)
-				&& Objects.equals(this.type, individualUpdate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(aristocraticTitle, birthDate, countryOfBirth, deathDate, familyName, familyNamePrefix,
-				formattedName, fullName, gender, generation, givenName, legalName, location, maritalStatus, middleName,
-				nationality, placeOfBirth, preferredGivenName, title, contactMedium, creditRating, disability,
-				externalReference, individualIdentification, languageAbility, otherName, partyCharacteristic,
-				relatedParty, skill, status, taxExemptionCertificate, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class IndividualUpdate {\n");
-
-		sb.append("    aristocraticTitle: ").append(toIndentedString(aristocraticTitle)).append("\n");
-		sb.append("    birthDate: ").append(toIndentedString(birthDate)).append("\n");
-		sb.append("    countryOfBirth: ").append(toIndentedString(countryOfBirth)).append("\n");
-		sb.append("    deathDate: ").append(toIndentedString(deathDate)).append("\n");
-		sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
-		sb.append("    familyNamePrefix: ").append(toIndentedString(familyNamePrefix)).append("\n");
-		sb.append("    formattedName: ").append(toIndentedString(formattedName)).append("\n");
-		sb.append("    fullName: ").append(toIndentedString(fullName)).append("\n");
-		sb.append("    gender: ").append(toIndentedString(gender)).append("\n");
-		sb.append("    generation: ").append(toIndentedString(generation)).append("\n");
-		sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
-		sb.append("    legalName: ").append(toIndentedString(legalName)).append("\n");
-		sb.append("    location: ").append(toIndentedString(location)).append("\n");
-		sb.append("    maritalStatus: ").append(toIndentedString(maritalStatus)).append("\n");
-		sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-		sb.append("    nationality: ").append(toIndentedString(nationality)).append("\n");
-		sb.append("    placeOfBirth: ").append(toIndentedString(placeOfBirth)).append("\n");
-		sb.append("    preferredGivenName: ").append(toIndentedString(preferredGivenName)).append("\n");
-		sb.append("    title: ").append(toIndentedString(title)).append("\n");
-		sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-		sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-		sb.append("    disability: ").append(toIndentedString(disability)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    individualIdentification: ").append(toIndentedString(individualIdentification)).append("\n");
-		sb.append("    languageAbility: ").append(toIndentedString(languageAbility)).append("\n");
-		sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-		sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    skill: ").append(toIndentedString(skill)).append("\n");
-		sb.append("    status: ").append(toIndentedString(status)).append("\n");
-		sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/LanguageAbility.java b/src/main/java/org/etsi/osl/tmf/pm632/model/LanguageAbility.java
deleted file mode 100644
index b5a710685a825126f2c387f352d20f1ad9f70cce..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/LanguageAbility.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Ability of an individual to understand or converse in a language.
- */
-@Schema(description = "Ability of an individual to understand or converse in a language.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-@Entity
-public class LanguageAbility  extends BaseRootEntity {
-  @JsonProperty("isFavouriteLanguage")
-  private Boolean isFavouriteLanguage = null;
-
-  @JsonProperty("languageCode")
-  private String languageCode = null;
-
-  @JsonProperty("languageName")
-  private String languageName = null;
-
-  @JsonProperty("listeningProficiency")
-  private String listeningProficiency = null;
-
-  @JsonProperty("readingProficiency")
-  private String readingProficiency = null;
-
-  @JsonProperty("speakingProficiency")
-  private String speakingProficiency = null;
-
-  @JsonProperty("writingProficiency")
-  private String writingProficiency = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public LanguageAbility isFavouriteLanguage(Boolean isFavouriteLanguage) {
-    this.isFavouriteLanguage = isFavouriteLanguage;
-    return this;
-  }
-
-  /**
-   * A “true” value specifies whether the language is considered by the individual as his favourite one
-   * @return isFavouriteLanguage
-  **/
-  @Schema(description = "A “true” value specifies whether the language is considered by the individual as his favourite one")
-
-
-  public Boolean isIsFavouriteLanguage() {
-    return isFavouriteLanguage;
-  }
-
-  public void setIsFavouriteLanguage(Boolean isFavouriteLanguage) {
-    this.isFavouriteLanguage = isFavouriteLanguage;
-  }
-
-  public LanguageAbility languageCode(String languageCode) {
-    this.languageCode = languageCode;
-    return this;
-  }
-
-  /**
-   * Language code (RFC 5646)
-   * @return languageCode
-  **/
-  @Schema(description = "Language code (RFC 5646)")
-
-
-  public String getLanguageCode() {
-    return languageCode;
-  }
-
-  public void setLanguageCode(String languageCode) {
-    this.languageCode = languageCode;
-  }
-
-  public LanguageAbility languageName(String languageName) {
-    this.languageName = languageName;
-    return this;
-  }
-
-  /**
-   * Language name
-   * @return languageName
-  **/
-  @Schema(description = "Language name")
-
-
-  public String getLanguageName() {
-    return languageName;
-  }
-
-  public void setLanguageName(String languageName) {
-    this.languageName = languageName;
-  }
-
-  public LanguageAbility listeningProficiency(String listeningProficiency) {
-    this.listeningProficiency = listeningProficiency;
-    return this;
-  }
-
-  /**
-   * Listening proficiency evaluated for this language
-   * @return listeningProficiency
-  **/
-  @Schema(description = "Listening proficiency evaluated for this language")
-
-
-  public String getListeningProficiency() {
-    return listeningProficiency;
-  }
-
-  public void setListeningProficiency(String listeningProficiency) {
-    this.listeningProficiency = listeningProficiency;
-  }
-
-  public LanguageAbility readingProficiency(String readingProficiency) {
-    this.readingProficiency = readingProficiency;
-    return this;
-  }
-
-  /**
-   * Reading proficiency evaluated for this language
-   * @return readingProficiency
-  **/
-  @Schema(description = "Reading proficiency evaluated for this language")
-
-
-  public String getReadingProficiency() {
-    return readingProficiency;
-  }
-
-  public void setReadingProficiency(String readingProficiency) {
-    this.readingProficiency = readingProficiency;
-  }
-
-  public LanguageAbility speakingProficiency(String speakingProficiency) {
-    this.speakingProficiency = speakingProficiency;
-    return this;
-  }
-
-  /**
-   * Speaking proficiency evaluated for this language
-   * @return speakingProficiency
-  **/
-  @Schema(description = "Speaking proficiency evaluated for this language")
-
-
-  public String getSpeakingProficiency() {
-    return speakingProficiency;
-  }
-
-  public void setSpeakingProficiency(String speakingProficiency) {
-    this.speakingProficiency = speakingProficiency;
-  }
-
-  public LanguageAbility writingProficiency(String writingProficiency) {
-    this.writingProficiency = writingProficiency;
-    return this;
-  }
-
-  /**
-   * Writing proficiency evaluated for this language
-   * @return writingProficiency
-  **/
-  @Schema(description = "Writing proficiency evaluated for this language")
-
-
-  public String getWritingProficiency() {
-    return writingProficiency;
-  }
-
-  public void setWritingProficiency(String writingProficiency) {
-    this.writingProficiency = writingProficiency;
-  }
-
-  public LanguageAbility validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
- 
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LanguageAbility languageAbility = (LanguageAbility) o;
-    return Objects.equals(this.isFavouriteLanguage, languageAbility.isFavouriteLanguage) &&
-        Objects.equals(this.languageCode, languageAbility.languageCode) &&
-        Objects.equals(this.languageName, languageAbility.languageName) &&
-        Objects.equals(this.listeningProficiency, languageAbility.listeningProficiency) &&
-        Objects.equals(this.readingProficiency, languageAbility.readingProficiency) &&
-        Objects.equals(this.speakingProficiency, languageAbility.speakingProficiency) &&
-        Objects.equals(this.writingProficiency, languageAbility.writingProficiency) &&
-        Objects.equals(this.validFor, languageAbility.validFor) &&
-        Objects.equals(this.baseType, languageAbility.baseType) &&
-        Objects.equals(this.schemaLocation, languageAbility.schemaLocation) &&
-        Objects.equals(this.type, languageAbility.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(isFavouriteLanguage, languageCode, languageName, listeningProficiency, readingProficiency, speakingProficiency, writingProficiency, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LanguageAbility {\n");
-    
-    sb.append("    isFavouriteLanguage: ").append(toIndentedString(isFavouriteLanguage)).append("\n");
-    sb.append("    languageCode: ").append(toIndentedString(languageCode)).append("\n");
-    sb.append("    languageName: ").append(toIndentedString(languageName)).append("\n");
-    sb.append("    listeningProficiency: ").append(toIndentedString(listeningProficiency)).append("\n");
-    sb.append("    readingProficiency: ").append(toIndentedString(readingProficiency)).append("\n");
-    sb.append("    speakingProficiency: ").append(toIndentedString(speakingProficiency)).append("\n");
-    sb.append("    writingProficiency: ").append(toIndentedString(writingProficiency)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/MediumCharacteristic.java b/src/main/java/org/etsi/osl/tmf/pm632/model/MediumCharacteristic.java
deleted file mode 100644
index e00f41d82529232925b5b297158e1c6ea41612ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/MediumCharacteristic.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)
- */
-@Schema(description = "Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity(name = "MediumCharacteristic")
-public class MediumCharacteristic extends BaseRootEntity {
-	@JsonProperty("city")
-	private String city = null;
-
-	@JsonProperty("contactType")
-	private String contactType = null;
-
-	@JsonProperty("country")
-	private String country = null;
-
-	@JsonProperty("emailAddress")
-	private String emailAddress = null;
-
-	@JsonProperty("faxNumber")
-	private String faxNumber = null;
-
-	@JsonProperty("phoneNumber")
-	private String phoneNumber = null;
-
-	@JsonProperty("postCode")
-	private String postCode = null;
-
-	@JsonProperty("socialNetworkId")
-	private String socialNetworkId = null;
-
-	@JsonProperty("stateOrProvince")
-	private String stateOrProvince = null;
-
-	@JsonProperty("street1")
-	private String street1 = null;
-
-	@JsonProperty("street2")
-	private String street2 = null;
-
-	public MediumCharacteristic(@NotNull @Valid MediumCharacteristic c) {
-		this.city = c.city;
-		this.contactType = c.contactType;
-		this.country = c.country;
-		this.emailAddress = c.emailAddress;
-		this.faxNumber = c.faxNumber;
-		this.phoneNumber = c.phoneNumber;
-		this.postCode = c.postCode;
-		this.socialNetworkId = c.socialNetworkId;
-		this.stateOrProvince = c.stateOrProvince;
-		this.street1 = c.street1;
-		this.street2 = c.street2;
-	}
-
-	public MediumCharacteristic() {
-
-	}
-
-	public MediumCharacteristic city(String city) {
-		this.city = city;
-		return this;
-	}
-
-	/**
-	 * The city
-	 * 
-	 * @return city
-	 **/
-	@Schema(description = "The city")
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public MediumCharacteristic contactType(String contactType) {
-		this.contactType = contactType;
-		return this;
-	}
-
-	/**
-	 * The type of contact, for example: phone number such as mobile, fixed home,
-	 * fixed office. postal address such as shipping instalation…
-	 * 
-	 * @return contactType
-	 **/
-	@Schema(description = "The type of contact, for example: phone number such as mobile, fixed home, fixed office. postal address such as shipping instalation…")
-
-	public String getContactType() {
-		return contactType;
-	}
-
-	public void setContactType(String contactType) {
-		this.contactType = contactType;
-	}
-
-	public MediumCharacteristic country(String country) {
-		this.country = country;
-		return this;
-	}
-
-	/**
-	 * The country
-	 * 
-	 * @return country
-	 **/
-	@Schema(description = "The country")
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public MediumCharacteristic emailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-		return this;
-	}
-
-	/**
-	 * Full email address in standard format
-	 * 
-	 * @return emailAddress
-	 **/
-	@Schema(description = "Full email address in standard format")
-
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = emailAddress;
-	}
-
-	public MediumCharacteristic faxNumber(String faxNumber) {
-		this.faxNumber = faxNumber;
-		return this;
-	}
-
-	/**
-	 * The fax number of the contact
-	 * 
-	 * @return faxNumber
-	 **/
-	@Schema(description = "The fax number of the contact")
-
-	public String getFaxNumber() {
-		return faxNumber;
-	}
-
-	public void setFaxNumber(String faxNumber) {
-		this.faxNumber = faxNumber;
-	}
-
-	public MediumCharacteristic phoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-		return this;
-	}
-
-	/**
-	 * The primary phone number of the contact
-	 * 
-	 * @return phoneNumber
-	 **/
-	@Schema(description = "The primary phone number of the contact")
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public MediumCharacteristic postCode(String postCode) {
-		this.postCode = postCode;
-		return this;
-	}
-
-	/**
-	 * Postcode
-	 * 
-	 * @return postCode
-	 **/
-	@Schema(description = "Postcode")
-
-	public String getPostCode() {
-		return postCode;
-	}
-
-	public void setPostCode(String postCode) {
-		this.postCode = postCode;
-	}
-
-	public MediumCharacteristic socialNetworkId(String socialNetworkId) {
-		this.socialNetworkId = socialNetworkId;
-		return this;
-	}
-
-	/**
-	 * Identifier as a member of a social network
-	 * 
-	 * @return socialNetworkId
-	 **/
-	@Schema(description = "Identifier as a member of a social network")
-
-	public String getSocialNetworkId() {
-		return socialNetworkId;
-	}
-
-	public void setSocialNetworkId(String socialNetworkId) {
-		this.socialNetworkId = socialNetworkId;
-	}
-
-	public MediumCharacteristic stateOrProvince(String stateOrProvince) {
-		this.stateOrProvince = stateOrProvince;
-		return this;
-	}
-
-	/**
-	 * State or province
-	 * 
-	 * @return stateOrProvince
-	 **/
-	@Schema(description = "State or province")
-
-	public String getStateOrProvince() {
-		return stateOrProvince;
-	}
-
-	public void setStateOrProvince(String stateOrProvince) {
-		this.stateOrProvince = stateOrProvince;
-	}
-
-	public MediumCharacteristic street1(String street1) {
-		this.street1 = street1;
-		return this;
-	}
-
-	/**
-	 * Describes the street
-	 * 
-	 * @return street1
-	 **/
-	@Schema(description = "Describes the street")
-
-	public String getStreet1() {
-		return street1;
-	}
-
-	public void setStreet1(String street1) {
-		this.street1 = street1;
-	}
-
-	public MediumCharacteristic street2(String street2) {
-		this.street2 = street2;
-		return this;
-	}
-
-	/**
-	 * Complementary street description
-	 * 
-	 * @return street2
-	 **/
-	@Schema(description = "Complementary street description")
-
-	public String getStreet2() {
-		return street2;
-	}
-
-	public void setStreet2(String street2) {
-		this.street2 = street2;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		MediumCharacteristic mediumCharacteristic = (MediumCharacteristic) o;
-		return Objects.equals(this.city, mediumCharacteristic.city)
-				&& Objects.equals(this.contactType, mediumCharacteristic.contactType)
-				&& Objects.equals(this.country, mediumCharacteristic.country)
-				&& Objects.equals(this.emailAddress, mediumCharacteristic.emailAddress)
-				&& Objects.equals(this.faxNumber, mediumCharacteristic.faxNumber)
-				&& Objects.equals(this.phoneNumber, mediumCharacteristic.phoneNumber)
-				&& Objects.equals(this.postCode, mediumCharacteristic.postCode)
-				&& Objects.equals(this.socialNetworkId, mediumCharacteristic.socialNetworkId)
-				&& Objects.equals(this.stateOrProvince, mediumCharacteristic.stateOrProvince)
-				&& Objects.equals(this.street1, mediumCharacteristic.street1)
-				&& Objects.equals(this.street2, mediumCharacteristic.street2)
-				&& Objects.equals(this.baseType, mediumCharacteristic.baseType)
-				&& Objects.equals(this.schemaLocation, mediumCharacteristic.schemaLocation)
-				&& Objects.equals(this.type, mediumCharacteristic.type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class MediumCharacteristic {\n");
-
-		sb.append("    city: ").append(toIndentedString(city)).append("\n");
-		sb.append("    contactType: ").append(toIndentedString(contactType)).append("\n");
-		sb.append("    country: ").append(toIndentedString(country)).append("\n");
-		sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
-		sb.append("    faxNumber: ").append(toIndentedString(faxNumber)).append("\n");
-		sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-		sb.append("    postCode: ").append(toIndentedString(postCode)).append("\n");
-		sb.append("    socialNetworkId: ").append(toIndentedString(socialNetworkId)).append("\n");
-		sb.append("    stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");
-		sb.append("    street1: ").append(toIndentedString(street1)).append("\n");
-		sb.append("    street2: ").append(toIndentedString(street2)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Organization.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Organization.java
deleted file mode 100644
index 6447faf3a197ba719998f4b81e91ea1aaf77b3bd..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Organization.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Organization represents a group of people identified by shared interests or
- * purpose. Examples include business, department and enterprise. Because of the
- * complex nature of many businesses, both organizations and organization units
- * are represented by the same data.
- */
-@Schema(description = "Organization represents a group of people identified by shared interests or purpose. Examples include business, department and enterprise. Because of the complex nature of many businesses, both organizations and organization units are represented by the same data.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-@Entity
-public class Organization extends BaseRootNamedEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isHeadOffice")
-	private Boolean isHeadOffice = null;
-
-	@JsonProperty("isLegalEntity")
-	private Boolean isLegalEntity = null;
-
-	@JsonProperty("nameType")
-	private String nameType = null;
-
-	@JsonProperty("organizationType")
-	private String organizationType = null;
-
-	@JsonProperty("tradingName")
-	private String tradingName = null;
-
-	@JsonProperty("contactMedium")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ContactMedium> contactMedium = new HashSet<>();
-
-	@JsonProperty("creditRating")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PartyCreditProfile> creditRating = new HashSet<>();
-
-	@JsonProperty("existsDuring")
-	private TimePeriod existsDuring = null;
-
-	@JsonProperty("externalReference")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ExternalReference> externalReference = new HashSet<>();
-
-	@JsonProperty("organizationChildRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<OrganizationChildRelationship> organizationChildRelationship = new HashSet<>();
-
-	@JsonProperty("organizationIdentification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<OrganizationIdentification> organizationIdentification = new HashSet<>();
-
-	@JsonProperty("organizationParentRelationship")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "organization_parentrel_refid", referencedColumnName = "uuid")
-	private OrganizationParentRelationship organizationParentRelationship = null;
-
-	@JsonProperty("otherName")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<OtherNameOrganization> otherName = new HashSet<>();
-
-	@JsonProperty("partyCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> partyCharacteristic = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("status")
-	private OrganizationStateType status = null;
-
-	@JsonProperty("taxExemptionCertificate")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TaxExemptionCertificate> taxExemptionCertificate = new HashSet<>();
-
-	/**
-	 * Unique identifier of the organization
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the organization")
-	
-	public String getId() {
-		return uuid;
-	}
-
-	public Organization isHeadOffice(Boolean isHeadOffice) {
-		this.isHeadOffice = isHeadOffice;
-		return this;
-	}
-
-	/**
-	 * If value is true, the organization is the head office
-	 * 
-	 * @return isHeadOffice
-	 **/
-	@Schema(description = "If value is true, the organization is the head office")
-
-	public Boolean isIsHeadOffice() {
-		return isHeadOffice;
-	}
-
-	public void setIsHeadOffice(Boolean isHeadOffice) {
-		this.isHeadOffice = isHeadOffice;
-	}
-
-	public Organization isLegalEntity(Boolean isLegalEntity) {
-		this.isLegalEntity = isLegalEntity;
-		return this;
-	}
-
-	/**
-	 * If value is true, the organization is a legal entity known by a national
-	 * referential.
-	 * 
-	 * @return isLegalEntity
-	 **/
-	@Schema(description = "If value is true, the organization is a legal entity known by a national referential.")
-
-	public Boolean isIsLegalEntity() {
-		return isLegalEntity;
-	}
-
-	public void setIsLegalEntity(Boolean isLegalEntity) {
-		this.isLegalEntity = isLegalEntity;
-	}
-
-	public Organization nameType(String nameType) {
-		this.nameType = nameType;
-		return this;
-	}
-
-	/**
-	 * Type of the name : Co, Inc, Ltd,…
-	 * 
-	 * @return nameType
-	 **/
-	@Schema(description = "Type of the name : Co, Inc, Ltd,…")
-
-	public String getNameType() {
-		return nameType;
-	}
-
-	public void setNameType(String nameType) {
-		this.nameType = nameType;
-	}
-
-	public Organization organizationType(String organizationType) {
-		this.organizationType = organizationType;
-		return this;
-	}
-
-	/**
-	 * Type of Organization (company, department...)
-	 * 
-	 * @return organizationType
-	 **/
-	@Schema(description = "Type of Organization (company, department...)")
-
-	public String getOrganizationType() {
-		return organizationType;
-	}
-
-	public void setOrganizationType(String organizationType) {
-		this.organizationType = organizationType;
-	}
-
-	public Organization tradingName(String tradingName) {
-		this.tradingName = tradingName;
-		return this;
-	}
-
-	/**
-	 * Name that the organization (unit) trades under
-	 * 
-	 * @return tradingName
-	 **/
-	@Schema(description = "Name that the organization (unit) trades under")
-
-	public String getTradingName() {
-		return tradingName;
-	}
-
-	public void setTradingName(String tradingName) {
-		this.tradingName = tradingName;
-	}
-
-	public Organization contactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-		return this;
-	}
-
-	public Organization addContactMediumItem(ContactMedium contactMediumItem) {
-		if (this.contactMedium == null) {
-			this.contactMedium = new HashSet<>();
-		}
-		this.contactMedium.add(contactMediumItem);
-		return this;
-	}
-
-	/**
-	 * Get contactMedium
-	 * 
-	 * @return contactMedium
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ContactMedium> getContactMedium() {
-		return contactMedium;
-	}
-
-	public void setContactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-	}
-
-	public Organization creditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-		return this;
-	}
-
-	public Organization addCreditRatingItem(PartyCreditProfile creditRatingItem) {
-		if (this.creditRating == null) {
-			this.creditRating = new HashSet<>();
-		}
-		this.creditRating.add(creditRatingItem);
-		return this;
-	}
-
-	/**
-	 * Get creditRating
-	 * 
-	 * @return creditRating
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<PartyCreditProfile> getCreditRating() {
-		return creditRating;
-	}
-
-	public void setCreditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-	}
-
-	public Organization existsDuring(TimePeriod existsDuring) {
-		this.existsDuring = existsDuring;
-		return this;
-	}
-
-	/**
-	 * Get existsDuring
-	 * 
-	 * @return existsDuring
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public TimePeriod getExistsDuring() {
-		return existsDuring;
-	}
-
-	public void setExistsDuring(TimePeriod existsDuring) {
-		this.existsDuring = existsDuring;
-	}
-
-	public Organization externalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public Organization addExternalReferenceItem(ExternalReference externalReferenceItem) {
-		if (this.externalReference == null) {
-			this.externalReference = new HashSet<>();
-		}
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ExternalReference> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public Organization organizationChildRelationship(
-			Set<OrganizationChildRelationship> organizationChildRelationship) {
-		this.organizationChildRelationship = organizationChildRelationship;
-		return this;
-	}
-
-	public Organization addOrganizationChildRelationshipItem(
-			OrganizationChildRelationship organizationChildRelationshipItem) {
-		if (this.organizationChildRelationship == null) {
-			this.organizationChildRelationship = new HashSet<>();
-		}
-		this.organizationChildRelationship.add(organizationChildRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get organizationChildRelationship
-	 * 
-	 * @return organizationChildRelationship
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<OrganizationChildRelationship> getOrganizationChildRelationship() {
-		return organizationChildRelationship;
-	}
-
-	public void setOrganizationChildRelationship(Set<OrganizationChildRelationship> organizationChildRelationship) {
-		this.organizationChildRelationship = organizationChildRelationship;
-	}
-
-	public Organization organizationIdentification(Set<OrganizationIdentification> organizationIdentification) {
-		this.organizationIdentification = organizationIdentification;
-		return this;
-	}
-
-	public Organization addOrganizationIdentificationItem(OrganizationIdentification organizationIdentificationItem) {
-		if (this.organizationIdentification == null) {
-			this.organizationIdentification = new HashSet<>();
-		}
-		this.organizationIdentification.add(organizationIdentificationItem);
-		return this;
-	}
-
-	/**
-	 * Get organizationIdentification
-	 * 
-	 * @return organizationIdentification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<OrganizationIdentification> getOrganizationIdentification() {
-		return organizationIdentification;
-	}
-
-	public void setOrganizationIdentification(Set<OrganizationIdentification> organizationIdentification) {
-		this.organizationIdentification = organizationIdentification;
-	}
-
-	public Organization organizationParentRelationship(OrganizationParentRelationship organizationParentRelationship) {
-		this.organizationParentRelationship = organizationParentRelationship;
-		return this;
-	}
-
-	/**
-	 * Get organizationParentRelationship
-	 * 
-	 * @return organizationParentRelationship
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public OrganizationParentRelationship getOrganizationParentRelationship() {
-		return organizationParentRelationship;
-	}
-
-	public void setOrganizationParentRelationship(OrganizationParentRelationship organizationParentRelationship) {
-		this.organizationParentRelationship = organizationParentRelationship;
-	}
-
-	public Organization otherName(Set<OtherNameOrganization> otherName) {
-		this.otherName = otherName;
-		return this;
-	}
-
-	public Organization addOtherNameItem(OtherNameOrganization otherNameItem) {
-		if (this.otherName == null) {
-			this.otherName = new HashSet<>();
-		}
-		this.otherName.add(otherNameItem);
-		return this;
-	}
-
-	/**
-	 * Get otherName
-	 * 
-	 * @return otherName
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<OtherNameOrganization> getOtherName() {
-		return otherName;
-	}
-
-	public void setOtherName(Set<OtherNameOrganization> otherName) {
-		this.otherName = otherName;
-	}
-
-	public Organization partyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-		return this;
-	}
-
-	public Organization addPartyCharacteristicItem(Characteristic partyCharacteristicItem) {
-		if (this.partyCharacteristic == null) {
-			this.partyCharacteristic = new HashSet<>();
-		}
-		this.partyCharacteristic.add(partyCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * Get partyCharacteristic
-	 * 
-	 * @return partyCharacteristic
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<Characteristic> getPartyCharacteristic() {
-		return partyCharacteristic;
-	}
-
-	public void setPartyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-	}
-
-	public Organization relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Organization addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Organization status(OrganizationStateType status) {
-		this.status = status;
-		return this;
-	}
-
-	/**
-	 * Status of the organization
-	 * 
-	 * @return status
-	 **/
-	@Schema(description = "Status of the organization")
-
-	@Valid
-
-	public OrganizationStateType getStatus() {
-		return status;
-	}
-
-	public void setStatus(OrganizationStateType status) {
-		this.status = status;
-	}
-
-	public Organization taxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-		return this;
-	}
-
-	public Organization addTaxExemptionCertificateItem(TaxExemptionCertificate taxExemptionCertificateItem) {
-		if (this.taxExemptionCertificate == null) {
-			this.taxExemptionCertificate = new HashSet<>();
-		}
-		this.taxExemptionCertificate.add(taxExemptionCertificateItem);
-		return this;
-	}
-
-	/**
-	 * Get taxExemptionCertificate
-	 * 
-	 * @return taxExemptionCertificate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<TaxExemptionCertificate> getTaxExemptionCertificate() {
-		return taxExemptionCertificate;
-	}
-
-	public void setTaxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Organization organization = (Organization) o;
-		return Objects.equals(this.uuid, organization.uuid) && Objects.equals(this.href, organization.href)
-				&& Objects.equals(this.isHeadOffice, organization.isHeadOffice)
-				&& Objects.equals(this.isLegalEntity, organization.isLegalEntity)
-				&& Objects.equals(this.name, organization.name) && Objects.equals(this.nameType, organization.nameType)
-				&& Objects.equals(this.organizationType, organization.organizationType)
-				&& Objects.equals(this.tradingName, organization.tradingName)
-				&& Objects.equals(this.contactMedium, organization.contactMedium)
-				&& Objects.equals(this.creditRating, organization.creditRating)
-				&& Objects.equals(this.existsDuring, organization.existsDuring)
-				&& Objects.equals(this.externalReference, organization.externalReference)
-				&& Objects.equals(this.organizationChildRelationship, organization.organizationChildRelationship)
-				&& Objects.equals(this.organizationIdentification, organization.organizationIdentification)
-				&& Objects.equals(this.organizationParentRelationship, organization.organizationParentRelationship)
-				&& Objects.equals(this.otherName, organization.otherName)
-				&& Objects.equals(this.partyCharacteristic, organization.partyCharacteristic)
-				&& Objects.equals(this.relatedParty, organization.relatedParty)
-				&& Objects.equals(this.status, organization.status)
-				&& Objects.equals(this.taxExemptionCertificate, organization.taxExemptionCertificate)
-				&& Objects.equals(this.baseType, organization.baseType)
-				&& Objects.equals(this.schemaLocation, organization.schemaLocation)
-				&& Objects.equals(this.type, organization.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, isHeadOffice, isLegalEntity, name, nameType, organizationType, tradingName,
-//				contactMedium, creditRating, existsDuring, externalReference, organizationChildRelationship,
-//				organizationIdentification, organizationParentRelationship, otherName, partyCharacteristic,
-//				relatedParty, status, taxExemptionCertificate, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Organization {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    isHeadOffice: ").append(toIndentedString(isHeadOffice)).append("\n");
-		sb.append("    isLegalEntity: ").append(toIndentedString(isLegalEntity)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    nameType: ").append(toIndentedString(nameType)).append("\n");
-		sb.append("    organizationType: ").append(toIndentedString(organizationType)).append("\n");
-		sb.append("    tradingName: ").append(toIndentedString(tradingName)).append("\n");
-		sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-		sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-		sb.append("    existsDuring: ").append(toIndentedString(existsDuring)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    organizationChildRelationship: ").append(toIndentedString(organizationChildRelationship))
-				.append("\n");
-		sb.append("    organizationIdentification: ").append(toIndentedString(organizationIdentification)).append("\n");
-		sb.append("    organizationParentRelationship: ").append(toIndentedString(organizationParentRelationship))
-				.append("\n");
-		sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-		sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    status: ").append(toIndentedString(status)).append("\n");
-		sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-	
-	public Characteristic findPartyCharacteristic( String name) { 
-		for (Characteristic c : partyCharacteristic) {
-			if ( c.getName().equals(name) ) {
-				return c;
-			}
-		}
-		
-		return null;
-		
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEvent.java
deleted file mode 100644
index 5d41cee6629657e88195470c8fad7d5d3f858036..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private OrganizationAttributeValueChangeEventPayload event = null;
-
-  public OrganizationAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public OrganizationAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public OrganizationAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public OrganizationAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrganizationAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public OrganizationAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public OrganizationAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public OrganizationAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public OrganizationAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public OrganizationAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public OrganizationAttributeValueChangeEvent event(OrganizationAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public OrganizationAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(OrganizationAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationAttributeValueChangeEvent organizationAttributeValueChangeEvent = (OrganizationAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, organizationAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.fieldPath, organizationAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.eventTime, organizationAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.description, organizationAttributeValueChangeEvent.description) &&
-        Objects.equals(this.timeOcurred, organizationAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.title, organizationAttributeValueChangeEvent.title) &&
-        Objects.equals(this.eventType, organizationAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.domain, organizationAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.priority, organizationAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.correlationId, organizationAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.event, organizationAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, fieldPath, eventTime, description, timeOcurred, title, eventType, domain, priority, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEventPayload.java
deleted file mode 100644
index fde24ae4aef7a66a6cd4deaa529e05612856d929..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationAttributeValueChangeEventPayload   {
-  @JsonProperty("organization")
-  private Organization organization = null;
-
-  public OrganizationAttributeValueChangeEventPayload organization(Organization organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return organization
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Organization getOrganization() {
-    return organization;
-  }
-
-  public void setOrganization(Organization organization) {
-    this.organization = organization;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationAttributeValueChangeEventPayload organizationAttributeValueChangeEventPayload = (OrganizationAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.organization, organizationAttributeValueChangeEventPayload.organization);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(organization);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationChildRelationship.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationChildRelationship.java
deleted file mode 100644
index d22d1dfde8c171a1857406b0445470790f684b88..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationChildRelationship.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Child references of an organization in a structure of organizations.
- */
-@Schema(description = "Child references of an organization in a structure of organizations.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OrganizationChildRelationship extends BaseRootEntity {
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("organization")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "organization_refid", referencedColumnName = "uuid")
-	private OrganizationRef organization = null;
-
-	public OrganizationChildRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of the relationship. Could be juridical, hierarchical, geographical,
-	 * functional for example.
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of the relationship. Could be juridical, hierarchical, geographical, functional for example.")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public OrganizationChildRelationship organization(OrganizationRef organization) {
-		this.organization = organization;
-		return this;
-	}
-
-	/**
-	 * Get organization
-	 * 
-	 * @return organization
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public OrganizationRef getOrganization() {
-		return organization;
-	}
-
-	public void setOrganization(OrganizationRef organization) {
-		this.organization = organization;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		OrganizationChildRelationship organizationChildRelationship = (OrganizationChildRelationship) o;
-		return Objects.equals(this.relationshipType, organizationChildRelationship.relationshipType)
-				&& Objects.equals(this.organization, organizationChildRelationship.organization)
-				&& Objects.equals(this.baseType, organizationChildRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, organizationChildRelationship.schemaLocation)
-				&& Objects.equals(this.type, organizationChildRelationship.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(relationshipType, organization, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class OrganizationChildRelationship {\n");
-
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreate.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreate.java
deleted file mode 100644
index 952fd489f4f7173ec518f9859bcd69d70e0242b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreate.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Organization represents a group of people identified by shared interests or purpose. Examples include business, department and enterprise. Because of the complex nature of many businesses, both organizations and organization units are represented by the same data. Skipped properties: id,href
- */
-@Schema(description = "Organization represents a group of people identified by shared interests or purpose. Examples include business, department and enterprise. Because of the complex nature of many businesses, both organizations and organization units are represented by the same data. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationCreate  extends OrganizationUpdate {
- 
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationCreate organizationCreate = (OrganizationCreate) o;
-    return Objects.equals(this.isHeadOffice, organizationCreate.isHeadOffice) &&
-        Objects.equals(this.isLegalEntity, organizationCreate.isLegalEntity) &&
-        Objects.equals(this.name, organizationCreate.name) &&
-        Objects.equals(this.nameType, organizationCreate.nameType) &&
-        Objects.equals(this.organizationType, organizationCreate.organizationType) &&
-        Objects.equals(this.tradingName, organizationCreate.tradingName) &&
-        Objects.equals(this.contactMedium, organizationCreate.contactMedium) &&
-        Objects.equals(this.creditRating, organizationCreate.creditRating) &&
-        Objects.equals(this.existsDuring, organizationCreate.existsDuring) &&
-        Objects.equals(this.externalReference, organizationCreate.externalReference) &&
-        Objects.equals(this.organizationChildRelationship, organizationCreate.organizationChildRelationship) &&
-        Objects.equals(this.organizationIdentification, organizationCreate.organizationIdentification) &&
-        Objects.equals(this.organizationParentRelationship, organizationCreate.organizationParentRelationship) &&
-        Objects.equals(this.otherName, organizationCreate.otherName) &&
-        Objects.equals(this.partyCharacteristic, organizationCreate.partyCharacteristic) &&
-        Objects.equals(this.relatedParty, organizationCreate.relatedParty) &&
-        Objects.equals(this.status, organizationCreate.status) &&
-        Objects.equals(this.taxExemptionCertificate, organizationCreate.taxExemptionCertificate) &&
-        Objects.equals(this.baseType, organizationCreate.baseType) &&
-        Objects.equals(this.schemaLocation, organizationCreate.schemaLocation) &&
-        Objects.equals(this.type, organizationCreate.type);
-  }
-//
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(isHeadOffice, isLegalEntity, name, nameType, organizationType, tradingName, contactMedium, creditRating, existsDuring, externalReference, organizationChildRelationship, organizationIdentification, organizationParentRelationship, otherName, partyCharacteristic, relatedParty, status, taxExemptionCertificate, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationCreate {\n");
-    
-    sb.append("    isHeadOffice: ").append(toIndentedString(isHeadOffice)).append("\n");
-    sb.append("    isLegalEntity: ").append(toIndentedString(isLegalEntity)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    nameType: ").append(toIndentedString(nameType)).append("\n");
-    sb.append("    organizationType: ").append(toIndentedString(organizationType)).append("\n");
-    sb.append("    tradingName: ").append(toIndentedString(tradingName)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-    sb.append("    existsDuring: ").append(toIndentedString(existsDuring)).append("\n");
-    sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-    sb.append("    organizationChildRelationship: ").append(toIndentedString(organizationChildRelationship)).append("\n");
-    sb.append("    organizationIdentification: ").append(toIndentedString(organizationIdentification)).append("\n");
-    sb.append("    organizationParentRelationship: ").append(toIndentedString(organizationParentRelationship)).append("\n");
-    sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-    sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEvent.java
deleted file mode 100644
index 692ab6bda5011c92067582e1f4d73ebc028cada4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationCreateEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private OrganizationCreateEventPayload event = null;
-
-  public OrganizationCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public OrganizationCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public OrganizationCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrganizationCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public OrganizationCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public OrganizationCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public OrganizationCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public OrganizationCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public OrganizationCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public OrganizationCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public OrganizationCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public OrganizationCreateEvent event(OrganizationCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public OrganizationCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(OrganizationCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationCreateEvent organizationCreateEvent = (OrganizationCreateEvent) o;
-    return Objects.equals(this.eventId, organizationCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, organizationCreateEvent.eventTime) &&
-        Objects.equals(this.description, organizationCreateEvent.description) &&
-        Objects.equals(this.timeOcurred, organizationCreateEvent.timeOcurred) &&
-        Objects.equals(this.title, organizationCreateEvent.title) &&
-        Objects.equals(this.eventType, organizationCreateEvent.eventType) &&
-        Objects.equals(this.domain, organizationCreateEvent.domain) &&
-        Objects.equals(this.priority, organizationCreateEvent.priority) &&
-        Objects.equals(this.href, organizationCreateEvent.href) &&
-        Objects.equals(this.id, organizationCreateEvent.id) &&
-        Objects.equals(this.correlationId, organizationCreateEvent.correlationId) &&
-        Objects.equals(this.event, organizationCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationCreateEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEventPayload.java
deleted file mode 100644
index f129e71e0a0eef288656b1ff46bf8122a4c7d644..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationCreateEventPayload   {
-  @JsonProperty("organization")
-  private Organization organization = null;
-
-  public OrganizationCreateEventPayload organization(Organization organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return organization
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Organization getOrganization() {
-    return organization;
-  }
-
-  public void setOrganization(Organization organization) {
-    this.organization = organization;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationCreateEventPayload organizationCreateEventPayload = (OrganizationCreateEventPayload) o;
-    return Objects.equals(this.organization, organizationCreateEventPayload.organization);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(organization);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationCreateEventPayload {\n");
-    
-    sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEvent.java
deleted file mode 100644
index df342b436c65b4fa21467182bc61be969444efd4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationDeleteEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private OrganizationDeleteEventPayload event = null;
-
-  public OrganizationDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public OrganizationDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public OrganizationDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrganizationDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public OrganizationDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public OrganizationDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public OrganizationDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public OrganizationDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public OrganizationDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public OrganizationDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public OrganizationDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public OrganizationDeleteEvent event(OrganizationDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public OrganizationDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(OrganizationDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationDeleteEvent organizationDeleteEvent = (OrganizationDeleteEvent) o;
-    return Objects.equals(this.eventId, organizationDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, organizationDeleteEvent.eventTime) &&
-        Objects.equals(this.description, organizationDeleteEvent.description) &&
-        Objects.equals(this.timeOcurred, organizationDeleteEvent.timeOcurred) &&
-        Objects.equals(this.title, organizationDeleteEvent.title) &&
-        Objects.equals(this.eventType, organizationDeleteEvent.eventType) &&
-        Objects.equals(this.domain, organizationDeleteEvent.domain) &&
-        Objects.equals(this.priority, organizationDeleteEvent.priority) &&
-        Objects.equals(this.href, organizationDeleteEvent.href) &&
-        Objects.equals(this.id, organizationDeleteEvent.id) &&
-        Objects.equals(this.correlationId, organizationDeleteEvent.correlationId) &&
-        Objects.equals(this.event, organizationDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationDeleteEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEventPayload.java
deleted file mode 100644
index 464db22ec8e88c9ffc29c7592eb59bf1c6580939..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationDeleteEventPayload   {
-  @JsonProperty("organization")
-  private Organization organization = null;
-
-  public OrganizationDeleteEventPayload organization(Organization organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return organization
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Organization getOrganization() {
-    return organization;
-  }
-
-  public void setOrganization(Organization organization) {
-    this.organization = organization;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationDeleteEventPayload organizationDeleteEventPayload = (OrganizationDeleteEventPayload) o;
-    return Objects.equals(this.organization, organizationDeleteEventPayload.organization);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(organization);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationDeleteEventPayload {\n");
-    
-    sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationIdentification.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationIdentification.java
deleted file mode 100644
index 6c08b67a451f46b27b84e2c4593575ee0116bcb0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationIdentification.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Represents our registration of information used as proof of identity by an
- * organization
- */
-@Schema(description = "Represents our registration of information used as proof of identity by an organization")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OrganizationIdentification extends BaseRootEntity {
-	@JsonProperty("identificationId")
-	private String identificationId = null;
-
-	@JsonProperty("identificationType")
-	private String identificationType = null;
-
-	@JsonProperty("issuingAuthority")
-	private String issuingAuthority = null;
-
-	@JsonProperty("issuingDate")
-	private OffsetDateTime issuingDate = null;
-
-	@JsonProperty("attachment")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "attachment_refid", referencedColumnName = "uuid")
-	private AttachmentRefOrValue attachment = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public OrganizationIdentification identificationId(String identificationId) {
-		this.identificationId = identificationId;
-		return this;
-	}
-
-	/**
-	 * Identifier
-	 * 
-	 * @return identificationId
-	 **/
-	@Schema(description = "Identifier")
-
-	public String getIdentificationId() {
-		return identificationId;
-	}
-
-	public void setIdentificationId(String identificationId) {
-		this.identificationId = identificationId;
-	}
-
-	public OrganizationIdentification identificationType(String identificationType) {
-		this.identificationType = identificationType;
-		return this;
-	}
-
-	/**
-	 * Type of identification information used to identify the company in a country
-	 * or internationally
-	 * 
-	 * @return identificationType
-	 **/
-	@Schema(description = "Type of identification information used to identify the company in a country or internationally")
-
-	public String getIdentificationType() {
-		return identificationType;
-	}
-
-	public void setIdentificationType(String identificationType) {
-		this.identificationType = identificationType;
-	}
-
-	public OrganizationIdentification issuingAuthority(String issuingAuthority) {
-		this.issuingAuthority = issuingAuthority;
-		return this;
-	}
-
-	/**
-	 * Authority which has issued the identifier (chamber of commerce...)
-	 * 
-	 * @return issuingAuthority
-	 **/
-	@Schema(description = "Authority which has issued the identifier (chamber of commerce...)")
-
-	public String getIssuingAuthority() {
-		return issuingAuthority;
-	}
-
-	public void setIssuingAuthority(String issuingAuthority) {
-		this.issuingAuthority = issuingAuthority;
-	}
-
-	public OrganizationIdentification issuingDate(OffsetDateTime issuingDate) {
-		this.issuingDate = issuingDate;
-		return this;
-	}
-
-	/**
-	 * Date at which the identifier was issued
-	 * 
-	 * @return issuingDate
-	 **/
-	@Schema(description = "Date at which the identifier was issued")
-
-	@Valid
-
-	public OffsetDateTime getIssuingDate() {
-		return issuingDate;
-	}
-
-	public void setIssuingDate(OffsetDateTime issuingDate) {
-		this.issuingDate = issuingDate;
-	}
-
-	public OrganizationIdentification attachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	/**
-	 * Get attachment
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public AttachmentRefOrValue getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-	}
-
-	public OrganizationIdentification validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the identification information is valid.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the identification information is valid.")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		OrganizationIdentification organizationIdentification = (OrganizationIdentification) o;
-		return Objects.equals(this.identificationId, organizationIdentification.identificationId)
-				&& Objects.equals(this.identificationType, organizationIdentification.identificationType)
-				&& Objects.equals(this.issuingAuthority, organizationIdentification.issuingAuthority)
-				&& Objects.equals(this.issuingDate, organizationIdentification.issuingDate)
-				&& Objects.equals(this.attachment, organizationIdentification.attachment)
-				&& Objects.equals(this.validFor, organizationIdentification.validFor)
-				&& Objects.equals(this.baseType, organizationIdentification.baseType)
-				&& Objects.equals(this.schemaLocation, organizationIdentification.schemaLocation)
-				&& Objects.equals(this.type, organizationIdentification.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(identificationId, identificationType, issuingAuthority, issuingDate, attachment, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class OrganizationIdentification {\n");
-
-		sb.append("    identificationId: ").append(toIndentedString(identificationId)).append("\n");
-		sb.append("    identificationType: ").append(toIndentedString(identificationType)).append("\n");
-		sb.append("    issuingAuthority: ").append(toIndentedString(issuingAuthority)).append("\n");
-		sb.append("    issuingDate: ").append(toIndentedString(issuingDate)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationParentRelationship.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationParentRelationship.java
deleted file mode 100644
index 7baacc69d3bed63891ba22f7be953551b3fd246c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationParentRelationship.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Parent references of an organization in a structure of organizations.
- */
-@Schema(description = "Parent references of an organization in a structure of organizations.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OrganizationParentRelationship extends BaseRootNamedEntity {
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("organization")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "organizationref_refid", referencedColumnName = "uuid")
-	private OrganizationRef organization = null;
-
-	public OrganizationParentRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of the relationship. Could be juridical, hierarchical, geographical,
-	 * functional for example.
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of the relationship. Could be juridical, hierarchical, geographical, functional for example.")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public OrganizationParentRelationship organization(OrganizationRef organization) {
-		this.organization = organization;
-		return this;
-	}
-
-	/**
-	 * Get organization
-	 * 
-	 * @return organization
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public OrganizationRef getOrganization() {
-		return organization;
-	}
-
-	public void setOrganization(OrganizationRef organization) {
-		this.organization = organization;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		OrganizationParentRelationship organizationParentRelationship = (OrganizationParentRelationship) o;
-		return Objects.equals(this.relationshipType, organizationParentRelationship.relationshipType)
-				&& Objects.equals(this.organization, organizationParentRelationship.organization)
-				&& Objects.equals(this.baseType, organizationParentRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, organizationParentRelationship.schemaLocation)
-				&& Objects.equals(this.type, organizationParentRelationship.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(relationshipType, organization, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class OrganizationParentRelationship {\n");
-
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationRef.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationRef.java
deleted file mode 100644
index aa60396757832492de214d65b245cb7785f73e0f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationRef.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * OrganizationRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OrganizationRef  extends BaseRootNamedEntity {
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  @JsonProperty("id")
-  public String getId() {
-    return uuid;
-  }
-
-  public OrganizationRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationRef organizationRef = (OrganizationRef) o;
-    return Objects.equals(this.uuid, organizationRef.uuid) &&
-        Objects.equals(this.href, organizationRef.href) &&
-        Objects.equals(this.name, organizationRef.name) &&
-        Objects.equals(this.baseType, organizationRef.baseType) &&
-        Objects.equals(this.schemaLocation, organizationRef.schemaLocation) &&
-        Objects.equals(this.type, organizationRef.type) &&
-        Objects.equals(this.referredType, organizationRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash( uuid, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEvent.java
deleted file mode 100644
index 4d2795ae00e8ae219644a406048e0eeccabed5d5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationStateChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("event")
-  private OrganizationStateChangeEventPayload event = null;
-
-  public OrganizationStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public OrganizationStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public OrganizationStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrganizationStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public OrganizationStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public OrganizationStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public OrganizationStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public OrganizationStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public OrganizationStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public OrganizationStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public OrganizationStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public OrganizationStateChangeEvent event(OrganizationStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public OrganizationStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(OrganizationStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationStateChangeEvent organizationStateChangeEvent = (OrganizationStateChangeEvent) o;
-    return Objects.equals(this.eventId, organizationStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, organizationStateChangeEvent.eventTime) &&
-        Objects.equals(this.description, organizationStateChangeEvent.description) &&
-        Objects.equals(this.timeOcurred, organizationStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.title, organizationStateChangeEvent.title) &&
-        Objects.equals(this.eventType, organizationStateChangeEvent.eventType) &&
-        Objects.equals(this.domain, organizationStateChangeEvent.domain) &&
-        Objects.equals(this.priority, organizationStateChangeEvent.priority) &&
-        Objects.equals(this.href, organizationStateChangeEvent.href) &&
-        Objects.equals(this.id, organizationStateChangeEvent.id) &&
-        Objects.equals(this.correlationId, organizationStateChangeEvent.correlationId) &&
-        Objects.equals(this.event, organizationStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, description, timeOcurred, title, eventType, domain, priority, href, id, correlationId, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationStateChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEventPayload.java
deleted file mode 100644
index 76435dbd416198fe4999c3f10da6b2724b7f3f1e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationStateChangeEventPayload   {
-  @JsonProperty("organization")
-  private Organization organization = null;
-
-  public OrganizationStateChangeEventPayload organization(Organization organization) {
-    this.organization = organization;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return organization
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Organization getOrganization() {
-    return organization;
-  }
-
-  public void setOrganization(Organization organization) {
-    this.organization = organization;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationStateChangeEventPayload organizationStateChangeEventPayload = (OrganizationStateChangeEventPayload) o;
-    return Objects.equals(this.organization, organizationStateChangeEventPayload.organization);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(organization);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationStateChangeEventPayload {\n");
-    
-    sb.append("    organization: ").append(toIndentedString(organization)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateType.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateType.java
deleted file mode 100644
index f18c90b17ced1f9fe800962a6adb2c81152cb099..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationStateType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Valid values for the lifecycle state of the organization
- */
-public enum OrganizationStateType {
-  
-  INITIALIZED("initialized"),
-  
-  VALIDATED("validated"),
-  
-  CLOSED("closed");
-
-  private String value;
-
-  OrganizationStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OrganizationStateType fromValue(String text) {
-    for (OrganizationStateType b : OrganizationStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationUpdate.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationUpdate.java
deleted file mode 100644
index 475e4ce7938eea69aeb7ea3e48cbe349c6c44333..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OrganizationUpdate.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Organization represents a group of people identified by shared interests or purpose. Examples include business, department and enterprise. Because of the complex nature of many businesses, both organizations and organization units are represented by the same data. Skipped properties: id,href
- */
-@Schema(description = "Organization represents a group of people identified by shared interests or purpose. Examples include business, department and enterprise. Because of the complex nature of many businesses, both organizations and organization units are represented by the same data. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-public class OrganizationUpdate   {
-  @JsonProperty("isHeadOffice")
-  protected Boolean isHeadOffice = null;
-
-  @JsonProperty("isLegalEntity")
-  protected Boolean isLegalEntity = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("nameType")
-  protected String nameType = null;
-
-  @JsonProperty("organizationType")
-  protected String organizationType = null;
-
-  @JsonProperty("tradingName")
-  protected String tradingName = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  protected List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("creditRating")
-  @Valid
-  protected List<PartyCreditProfile> creditRating = null;
-
-  @JsonProperty("existsDuring")
-  protected TimePeriod existsDuring = null;
-
-  @JsonProperty("externalReference")
-  @Valid
-  protected List<ExternalReference> externalReference = null;
-
-  @JsonProperty("organizationChildRelationship")
-  @Valid
-  protected List<OrganizationChildRelationship> organizationChildRelationship = null;
-
-  @JsonProperty("organizationIdentification")
-  @Valid
-  protected List<OrganizationIdentification> organizationIdentification = null;
-
-  @JsonProperty("organizationParentRelationship")
-  protected OrganizationParentRelationship organizationParentRelationship = null;
-
-  @JsonProperty("otherName")
-  @Valid
-  protected List<OtherNameOrganization> otherName = null;
-
-  @JsonProperty("partyCharacteristic")
-  @Valid
-  protected List<Characteristic> partyCharacteristic = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("status")
-  protected OrganizationStateType status = null;
-
-  @JsonProperty("taxExemptionCertificate")
-  @Valid
-  protected List<TaxExemptionCertificate> taxExemptionCertificate = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public OrganizationUpdate isHeadOffice(Boolean isHeadOffice) {
-    this.isHeadOffice = isHeadOffice;
-    return this;
-  }
-
-  /**
-   * If value is true, the organization is the head office
-   * @return isHeadOffice
-  **/
-  @Schema(description = "If value is true, the organization is the head office")
-
-
-  public Boolean isIsHeadOffice() {
-    return isHeadOffice;
-  }
-
-  public void setIsHeadOffice(Boolean isHeadOffice) {
-    this.isHeadOffice = isHeadOffice;
-  }
-
-  public OrganizationUpdate isLegalEntity(Boolean isLegalEntity) {
-    this.isLegalEntity = isLegalEntity;
-    return this;
-  }
-
-  /**
-   * If value is true, the organization is a legal entity known by a national referential.
-   * @return isLegalEntity
-  **/
-  @Schema(description = "If value is true, the organization is a legal entity known by a national referential.")
-
-
-  public Boolean isIsLegalEntity() {
-    return isLegalEntity;
-  }
-
-  public void setIsLegalEntity(Boolean isLegalEntity) {
-    this.isLegalEntity = isLegalEntity;
-  }
-
-  public OrganizationUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Organization name (department name for example)
-   * @return name
-  **/
-  @Schema(description = "Organization name (department name for example)")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public OrganizationUpdate nameType(String nameType) {
-    this.nameType = nameType;
-    return this;
-  }
-
-  /**
-   * Type of the name : Co, Inc, Ltd,…
-   * @return nameType
-  **/
-  @Schema(description = "Type of the name : Co, Inc, Ltd,…")
-
-
-  public String getNameType() {
-    return nameType;
-  }
-
-  public void setNameType(String nameType) {
-    this.nameType = nameType;
-  }
-
-  public OrganizationUpdate organizationType(String organizationType) {
-    this.organizationType = organizationType;
-    return this;
-  }
-
-  /**
-   * Type of Organization (company, department...)
-   * @return organizationType
-  **/
-  @Schema(description = "Type of Organization (company, department...)")
-
-
-  public String getOrganizationType() {
-    return organizationType;
-  }
-
-  public void setOrganizationType(String organizationType) {
-    this.organizationType = organizationType;
-  }
-
-  public OrganizationUpdate tradingName(String tradingName) {
-    this.tradingName = tradingName;
-    return this;
-  }
-
-  /**
-   * Name that the organization (unit) trades under
-   * @return tradingName
-  **/
-  @Schema(description = "Name that the organization (unit) trades under")
-
-
-  public String getTradingName() {
-    return tradingName;
-  }
-
-  public void setTradingName(String tradingName) {
-    this.tradingName = tradingName;
-  }
-
-  public OrganizationUpdate contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public OrganizationUpdate addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public OrganizationUpdate creditRating(List<PartyCreditProfile> creditRating) {
-    this.creditRating = creditRating;
-    return this;
-  }
-
-  public OrganizationUpdate addCreditRatingItem(PartyCreditProfile creditRatingItem) {
-    if (this.creditRating == null) {
-      this.creditRating = new ArrayList<>();
-    }
-    this.creditRating.add(creditRatingItem);
-    return this;
-  }
-
-  /**
-   * Get creditRating
-   * @return creditRating
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PartyCreditProfile> getCreditRating() {
-    return creditRating;
-  }
-
-  public void setCreditRating(List<PartyCreditProfile> creditRating) {
-    this.creditRating = creditRating;
-  }
-
-  public OrganizationUpdate existsDuring(TimePeriod existsDuring) {
-    this.existsDuring = existsDuring;
-    return this;
-  }
-
-  /**
-   * Get existsDuring
-   * @return existsDuring
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getExistsDuring() {
-    return existsDuring;
-  }
-
-  public void setExistsDuring(TimePeriod existsDuring) {
-    this.existsDuring = existsDuring;
-  }
-
-  public OrganizationUpdate externalReference(List<ExternalReference> externalReference) {
-    this.externalReference = externalReference;
-    return this;
-  }
-
-  public OrganizationUpdate addExternalReferenceItem(ExternalReference externalReferenceItem) {
-    if (this.externalReference == null) {
-      this.externalReference = new ArrayList<>();
-    }
-    this.externalReference.add(externalReferenceItem);
-    return this;
-  }
-
-  /**
-   * Get externalReference
-   * @return externalReference
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ExternalReference> getExternalReference() {
-    return externalReference;
-  }
-
-  public void setExternalReference(List<ExternalReference> externalReference) {
-    this.externalReference = externalReference;
-  }
-
-  public OrganizationUpdate organizationChildRelationship(List<OrganizationChildRelationship> organizationChildRelationship) {
-    this.organizationChildRelationship = organizationChildRelationship;
-    return this;
-  }
-
-  public OrganizationUpdate addOrganizationChildRelationshipItem(OrganizationChildRelationship organizationChildRelationshipItem) {
-    if (this.organizationChildRelationship == null) {
-      this.organizationChildRelationship = new ArrayList<>();
-    }
-    this.organizationChildRelationship.add(organizationChildRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get organizationChildRelationship
-   * @return organizationChildRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<OrganizationChildRelationship> getOrganizationChildRelationship() {
-    return organizationChildRelationship;
-  }
-
-  public void setOrganizationChildRelationship(List<OrganizationChildRelationship> organizationChildRelationship) {
-    this.organizationChildRelationship = organizationChildRelationship;
-  }
-
-  public OrganizationUpdate organizationIdentification(List<OrganizationIdentification> organizationIdentification) {
-    this.organizationIdentification = organizationIdentification;
-    return this;
-  }
-
-  public OrganizationUpdate addOrganizationIdentificationItem(OrganizationIdentification organizationIdentificationItem) {
-    if (this.organizationIdentification == null) {
-      this.organizationIdentification = new ArrayList<>();
-    }
-    this.organizationIdentification.add(organizationIdentificationItem);
-    return this;
-  }
-
-  /**
-   * Get organizationIdentification
-   * @return organizationIdentification
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<OrganizationIdentification> getOrganizationIdentification() {
-    return organizationIdentification;
-  }
-
-  public void setOrganizationIdentification(List<OrganizationIdentification> organizationIdentification) {
-    this.organizationIdentification = organizationIdentification;
-  }
-
-  public OrganizationUpdate organizationParentRelationship(OrganizationParentRelationship organizationParentRelationship) {
-    this.organizationParentRelationship = organizationParentRelationship;
-    return this;
-  }
-
-  /**
-   * Get organizationParentRelationship
-   * @return organizationParentRelationship
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public OrganizationParentRelationship getOrganizationParentRelationship() {
-    return organizationParentRelationship;
-  }
-
-  public void setOrganizationParentRelationship(OrganizationParentRelationship organizationParentRelationship) {
-    this.organizationParentRelationship = organizationParentRelationship;
-  }
-
-  public OrganizationUpdate otherName(List<OtherNameOrganization> otherName) {
-    this.otherName = otherName;
-    return this;
-  }
-
-  public OrganizationUpdate addOtherNameItem(OtherNameOrganization otherNameItem) {
-    if (this.otherName == null) {
-      this.otherName = new ArrayList<>();
-    }
-    this.otherName.add(otherNameItem);
-    return this;
-  }
-
-  /**
-   * Get otherName
-   * @return otherName
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<OtherNameOrganization> getOtherName() {
-    return otherName;
-  }
-
-  public void setOtherName(List<OtherNameOrganization> otherName) {
-    this.otherName = otherName;
-  }
-
-  public OrganizationUpdate partyCharacteristic(List<Characteristic> partyCharacteristic) {
-    this.partyCharacteristic = partyCharacteristic;
-    return this;
-  }
-
-  public OrganizationUpdate addPartyCharacteristicItem(Characteristic partyCharacteristicItem) {
-    if (this.partyCharacteristic == null) {
-      this.partyCharacteristic = new ArrayList<>();
-    }
-    this.partyCharacteristic.add(partyCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get partyCharacteristic
-   * @return partyCharacteristic
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<Characteristic> getPartyCharacteristic() {
-    return partyCharacteristic;
-  }
-
-  public void setPartyCharacteristic(List<Characteristic> partyCharacteristic) {
-    this.partyCharacteristic = partyCharacteristic;
-  }
-
-  public OrganizationUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public OrganizationUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public OrganizationUpdate status(OrganizationStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the organization
-   * @return status
-  **/
-  @Schema(description = "Status of the organization")
-
-  @Valid
-
-  public OrganizationStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(OrganizationStateType status) {
-    this.status = status;
-  }
-
-  public OrganizationUpdate taxExemptionCertificate(List<TaxExemptionCertificate> taxExemptionCertificate) {
-    this.taxExemptionCertificate = taxExemptionCertificate;
-    return this;
-  }
-
-  public OrganizationUpdate addTaxExemptionCertificateItem(TaxExemptionCertificate taxExemptionCertificateItem) {
-    if (this.taxExemptionCertificate == null) {
-      this.taxExemptionCertificate = new ArrayList<>();
-    }
-    this.taxExemptionCertificate.add(taxExemptionCertificateItem);
-    return this;
-  }
-
-  /**
-   * Get taxExemptionCertificate
-   * @return taxExemptionCertificate
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<TaxExemptionCertificate> getTaxExemptionCertificate() {
-    return taxExemptionCertificate;
-  }
-
-  public void setTaxExemptionCertificate(List<TaxExemptionCertificate> taxExemptionCertificate) {
-    this.taxExemptionCertificate = taxExemptionCertificate;
-  }
-
-  public OrganizationUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public OrganizationUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public OrganizationUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrganizationUpdate organizationUpdate = (OrganizationUpdate) o;
-    return Objects.equals(this.isHeadOffice, organizationUpdate.isHeadOffice) &&
-        Objects.equals(this.isLegalEntity, organizationUpdate.isLegalEntity) &&
-        Objects.equals(this.name, organizationUpdate.name) &&
-        Objects.equals(this.nameType, organizationUpdate.nameType) &&
-        Objects.equals(this.organizationType, organizationUpdate.organizationType) &&
-        Objects.equals(this.tradingName, organizationUpdate.tradingName) &&
-        Objects.equals(this.contactMedium, organizationUpdate.contactMedium) &&
-        Objects.equals(this.creditRating, organizationUpdate.creditRating) &&
-        Objects.equals(this.existsDuring, organizationUpdate.existsDuring) &&
-        Objects.equals(this.externalReference, organizationUpdate.externalReference) &&
-        Objects.equals(this.organizationChildRelationship, organizationUpdate.organizationChildRelationship) &&
-        Objects.equals(this.organizationIdentification, organizationUpdate.organizationIdentification) &&
-        Objects.equals(this.organizationParentRelationship, organizationUpdate.organizationParentRelationship) &&
-        Objects.equals(this.otherName, organizationUpdate.otherName) &&
-        Objects.equals(this.partyCharacteristic, organizationUpdate.partyCharacteristic) &&
-        Objects.equals(this.relatedParty, organizationUpdate.relatedParty) &&
-        Objects.equals(this.status, organizationUpdate.status) &&
-        Objects.equals(this.taxExemptionCertificate, organizationUpdate.taxExemptionCertificate) &&
-        Objects.equals(this.baseType, organizationUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, organizationUpdate.schemaLocation) &&
-        Objects.equals(this.type, organizationUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(isHeadOffice, isLegalEntity, name, nameType, organizationType, tradingName, contactMedium, creditRating, existsDuring, externalReference, organizationChildRelationship, organizationIdentification, organizationParentRelationship, otherName, partyCharacteristic, relatedParty, status, taxExemptionCertificate, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrganizationUpdate {\n");
-    
-    sb.append("    isHeadOffice: ").append(toIndentedString(isHeadOffice)).append("\n");
-    sb.append("    isLegalEntity: ").append(toIndentedString(isLegalEntity)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    nameType: ").append(toIndentedString(nameType)).append("\n");
-    sb.append("    organizationType: ").append(toIndentedString(organizationType)).append("\n");
-    sb.append("    tradingName: ").append(toIndentedString(tradingName)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-    sb.append("    existsDuring: ").append(toIndentedString(existsDuring)).append("\n");
-    sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-    sb.append("    organizationChildRelationship: ").append(toIndentedString(organizationChildRelationship)).append("\n");
-    sb.append("    organizationIdentification: ").append(toIndentedString(organizationIdentification)).append("\n");
-    sb.append("    organizationParentRelationship: ").append(toIndentedString(organizationParentRelationship)).append("\n");
-    sb.append("    otherName: ").append(toIndentedString(otherName)).append("\n");
-    sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-  
-  public Characteristic findCharacteristic(String aName) {
-	  	if ( partyCharacteristic!= null ) {
-			for ( Characteristic c : partyCharacteristic) {
-				if ( c.getName().equals(aName) ) {
-					return c;
-				}
-			}	  		
-	  	}
-	  
-		return null;
-	}
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameIndividual.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameIndividual.java
deleted file mode 100644
index 62b7d7383887a11d953a619974cd342f7e8d4880..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameIndividual.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-/**
- * Keeps track of other names, for example the old name of a woman before marriage or an artist name.
- */
-@Schema(description = "Keeps track of other names, for example the old name of a woman before marriage or an artist name.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OtherNameIndividual extends BaseRootEntity   {
-  @JsonProperty("aristocraticTitle")
-  private String aristocraticTitle = null;
-
-  @JsonProperty("familyName")
-  private String familyName = null;
-
-  @JsonProperty("familyNamePrefix")
-  private String familyNamePrefix = null;
-
-  @JsonProperty("formattedName")
-  private String formattedName = null;
-
-  @JsonProperty("fullName")
-  private String fullName = null;
-
-  @JsonProperty("generation")
-  private String generation = null;
-
-  @JsonProperty("givenName")
-  private String givenName = null;
-
-  @JsonProperty("legalName")
-  private String legalName = null;
-
-  @JsonProperty("middleName")
-  private String middleName = null;
-
-  @JsonProperty("preferredGivenName")
-  private String preferredGivenName = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public OtherNameIndividual aristocraticTitle(String aristocraticTitle) {
-    this.aristocraticTitle = aristocraticTitle;
-    return this;
-  }
-
-  /**
-   * e.g. Baron, Graf, Earl,…
-   * @return aristocraticTitle
-  **/
-  @Schema(description = "e.g. Baron, Graf, Earl,…")
-
-
-  public String getAristocraticTitle() {
-    return aristocraticTitle;
-  }
-
-  public void setAristocraticTitle(String aristocraticTitle) {
-    this.aristocraticTitle = aristocraticTitle;
-  }
-
-  public OtherNameIndividual familyName(String familyName) {
-    this.familyName = familyName;
-    return this;
-  }
-
-  /**
-   * Contains the non-chosen or inherited name. Also known as last name in the Western context
-   * @return familyName
-  **/
-  @Schema(description = "Contains the non-chosen or inherited name. Also known as last name in the Western context")
-
-
-  public String getFamilyName() {
-    return familyName;
-  }
-
-  public void setFamilyName(String familyName) {
-    this.familyName = familyName;
-  }
-
-  public OtherNameIndividual familyNamePrefix(String familyNamePrefix) {
-    this.familyNamePrefix = familyNamePrefix;
-    return this;
-  }
-
-  /**
-   * Family name prefix
-   * @return familyNamePrefix
-  **/
-  @Schema(description = "Family name prefix")
-
-
-  public String getFamilyNamePrefix() {
-    return familyNamePrefix;
-  }
-
-  public void setFamilyNamePrefix(String familyNamePrefix) {
-    this.familyNamePrefix = familyNamePrefix;
-  }
-
-  public OtherNameIndividual formattedName(String formattedName) {
-    this.formattedName = formattedName;
-    return this;
-  }
-
-  /**
-   * . A fully formatted name in one string with all of its pieces in their proper place and all of the necessary punctuation. Useful for specific contexts (Chinese, Japanese, Korean,…)
-   * @return formattedName
-  **/
-  @Schema(description = ". A fully formatted name in one string with all of its pieces in their proper place and all of the necessary punctuation. Useful for specific contexts (Chinese, Japanese, Korean,…)")
-
-
-  public String getFormattedName() {
-    return formattedName;
-  }
-
-  public void setFormattedName(String formattedName) {
-    this.formattedName = formattedName;
-  }
-
-  public OtherNameIndividual fullName(String fullName) {
-    this.fullName = fullName;
-    return this;
-  }
-
-  /**
-   * Full name flatten (first, middle, and last names)
-   * @return fullName
-  **/
-  @Schema(description = "Full name flatten (first, middle, and last names)")
-
-
-  public String getFullName() {
-    return fullName;
-  }
-
-  public void setFullName(String fullName) {
-    this.fullName = fullName;
-  }
-
-  public OtherNameIndividual generation(String generation) {
-    this.generation = generation;
-    return this;
-  }
-
-  /**
-   * e.g. Sr, Jr…
-   * @return generation
-  **/
-  @Schema(description = "e.g. Sr, Jr…")
-
-
-  public String getGeneration() {
-    return generation;
-  }
-
-  public void setGeneration(String generation) {
-    this.generation = generation;
-  }
-
-  public OtherNameIndividual givenName(String givenName) {
-    this.givenName = givenName;
-    return this;
-  }
-
-  /**
-   * First name
-   * @return givenName
-  **/
-  @Schema(description = "First name")
-
-
-  public String getGivenName() {
-    return givenName;
-  }
-
-  public void setGivenName(String givenName) {
-    this.givenName = givenName;
-  }
-
-  public OtherNameIndividual legalName(String legalName) {
-    this.legalName = legalName;
-    return this;
-  }
-
-  /**
-   * Legal name or birth name (name one has for official purposes)
-   * @return legalName
-  **/
-  @Schema(description = "Legal name or birth name (name one has for official purposes)")
-
-
-  public String getLegalName() {
-    return legalName;
-  }
-
-  public void setLegalName(String legalName) {
-    this.legalName = legalName;
-  }
-
-  public OtherNameIndividual middleName(String middleName) {
-    this.middleName = middleName;
-    return this;
-  }
-
-  /**
-   * Middle name or initial
-   * @return middleName
-  **/
-  @Schema(description = "Middle name or initial")
-
-
-  public String getMiddleName() {
-    return middleName;
-  }
-
-  public void setMiddleName(String middleName) {
-    this.middleName = middleName;
-  }
-
-  public OtherNameIndividual preferredGivenName(String preferredGivenName) {
-    this.preferredGivenName = preferredGivenName;
-    return this;
-  }
-
-  /**
-   * Contains the chosen name by which the person prefers to be addressed. Note: This name may be a name other than a given name, such as a nickname
-   * @return preferredGivenName
-  **/
-  @Schema(description = "Contains the chosen name by which the person prefers to be addressed. Note: This name may be a name other than a given name, such as a nickname")
-
-
-  public String getPreferredGivenName() {
-    return preferredGivenName;
-  }
-
-  public void setPreferredGivenName(String preferredGivenName) {
-    this.preferredGivenName = preferredGivenName;
-  }
-
-  public OtherNameIndividual title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * Use for titles (aristrocatic, social, ...): Pr, Dr, Sir,....
-   * @return title
-  **/
-  @Schema(description = "Use for titles (aristrocatic, social, ...): Pr, Dr, Sir,....")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public OtherNameIndividual validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OtherNameIndividual otherNameIndividual = (OtherNameIndividual) o;
-    return Objects.equals(this.aristocraticTitle, otherNameIndividual.aristocraticTitle) &&
-        Objects.equals(this.familyName, otherNameIndividual.familyName) &&
-        Objects.equals(this.familyNamePrefix, otherNameIndividual.familyNamePrefix) &&
-        Objects.equals(this.formattedName, otherNameIndividual.formattedName) &&
-        Objects.equals(this.fullName, otherNameIndividual.fullName) &&
-        Objects.equals(this.generation, otherNameIndividual.generation) &&
-        Objects.equals(this.givenName, otherNameIndividual.givenName) &&
-        Objects.equals(this.legalName, otherNameIndividual.legalName) &&
-        Objects.equals(this.middleName, otherNameIndividual.middleName) &&
-        Objects.equals(this.preferredGivenName, otherNameIndividual.preferredGivenName) &&
-        Objects.equals(this.title, otherNameIndividual.title) &&
-        Objects.equals(this.validFor, otherNameIndividual.validFor) &&
-        Objects.equals(this.baseType, otherNameIndividual.baseType) &&
-        Objects.equals(this.schemaLocation, otherNameIndividual.schemaLocation) &&
-        Objects.equals(this.type, otherNameIndividual.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(aristocraticTitle, familyName, familyNamePrefix, formattedName, fullName, generation, givenName, legalName, middleName, preferredGivenName, title, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OtherNameIndividual {\n");
-    
-    sb.append("    aristocraticTitle: ").append(toIndentedString(aristocraticTitle)).append("\n");
-    sb.append("    familyName: ").append(toIndentedString(familyName)).append("\n");
-    sb.append("    familyNamePrefix: ").append(toIndentedString(familyNamePrefix)).append("\n");
-    sb.append("    formattedName: ").append(toIndentedString(formattedName)).append("\n");
-    sb.append("    fullName: ").append(toIndentedString(fullName)).append("\n");
-    sb.append("    generation: ").append(toIndentedString(generation)).append("\n");
-    sb.append("    givenName: ").append(toIndentedString(givenName)).append("\n");
-    sb.append("    legalName: ").append(toIndentedString(legalName)).append("\n");
-    sb.append("    middleName: ").append(toIndentedString(middleName)).append("\n");
-    sb.append("    preferredGivenName: ").append(toIndentedString(preferredGivenName)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameOrganization.java b/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameOrganization.java
deleted file mode 100644
index eb9a0739acd8e2e262c1dd5b3836adebf8d46448..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/OtherNameOrganization.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Keeps track of other names, for example the old name of an organization.
- */
-@Schema(description = "Keeps track of other names, for example the old name of an organization.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class OtherNameOrganization extends BaseRootNamedEntity  {
-
-  @JsonProperty("nameType")
-  private String nameType = null;
-
-  @JsonProperty("tradingName")
-  private String tradingName = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  /**
-   * Co. , Inc. , Ltd. , Pty Ltd. , Plc; , Gmbh
-   * @return nameType
-  **/
-  @Schema(description = "Co. , Inc. , Ltd. , Pty Ltd. , Plc; , Gmbh")
-
-
-  public String getNameType() {
-    return nameType;
-  }
-
-  public void setNameType(String nameType) {
-    this.nameType = nameType;
-  }
-
-  public OtherNameOrganization tradingName(String tradingName) {
-    this.tradingName = tradingName;
-    return this;
-  }
-
-  /**
-   * The name that the organization trades under
-   * @return tradingName
-  **/
-  @Schema(description = "The name that the organization trades under")
-
-
-  public String getTradingName() {
-    return tradingName;
-  }
-
-  public void setTradingName(String tradingName) {
-    this.tradingName = tradingName;
-  }
-
-  public OtherNameOrganization validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OtherNameOrganization otherNameOrganization = (OtherNameOrganization) o;
-    return Objects.equals(this.name, otherNameOrganization.name) &&
-        Objects.equals(this.nameType, otherNameOrganization.nameType) &&
-        Objects.equals(this.tradingName, otherNameOrganization.tradingName) &&
-        Objects.equals(this.validFor, otherNameOrganization.validFor) &&
-        Objects.equals(this.baseType, otherNameOrganization.baseType) &&
-        Objects.equals(this.schemaLocation, otherNameOrganization.schemaLocation) &&
-        Objects.equals(this.type, otherNameOrganization.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, nameType, tradingName, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OtherNameOrganization {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    nameType: ").append(toIndentedString(nameType)).append("\n");
-    sb.append("    tradingName: ").append(toIndentedString(tradingName)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Party.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Party.java
deleted file mode 100644
index 41b73509146934fe8c26fa2ba543f5a054af1c47..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Party.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * Generic Party structure used to define commonalities between sub concepts of
- * Individual and Organization.
- */
-@Schema(description = "Generic Party structure used to define commonalities between sub concepts of Individual and Organization.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-@Entity
-public class Party extends BaseRootEntity {
-
-	@JsonProperty("contactMedium")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ContactMedium> contactMedium = new HashSet<>();
-
-	@JsonProperty("creditRating")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<PartyCreditProfile> creditRating = new HashSet<>();
-
-	@JsonProperty("externalReference")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ExternalReference> externalReference = new HashSet<>();
-
-	@JsonProperty("partyCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> partyCharacteristic = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("taxExemptionCertificate")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TaxExemptionCertificate> taxExemptionCertificate = new HashSet<>();
-
-	/**
-	 * Unique identifier of the organization
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the organization")
-
-	@JsonProperty("id")
-	public String getId() {
-		return this.uuid;
-	}
-
-	public Party contactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-		return this;
-	}
-
-	public Party addContactMediumItem(ContactMedium contactMediumItem) {
-		if (this.contactMedium == null) {
-			this.contactMedium = new HashSet<>();
-		}
-		this.contactMedium.add(contactMediumItem);
-		return this;
-	}
-
-	/**
-	 * Get contactMedium
-	 * 
-	 * @return contactMedium
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ContactMedium> getContactMedium() {
-		return contactMedium;
-	}
-
-	public void setContactMedium(Set<ContactMedium> contactMedium) {
-		this.contactMedium = contactMedium;
-	}
-
-	public Party creditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-		return this;
-	}
-
-	public Party addCreditRatingItem(PartyCreditProfile creditRatingItem) {
-		if (this.creditRating == null) {
-			this.creditRating = new HashSet<>();
-		}
-		this.creditRating.add(creditRatingItem);
-		return this;
-	}
-
-	/**
-	 * Get creditRating
-	 * 
-	 * @return creditRating
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<PartyCreditProfile> getCreditRating() {
-		return creditRating;
-	}
-
-	public void setCreditRating(Set<PartyCreditProfile> creditRating) {
-		this.creditRating = creditRating;
-	}
-
-	public Party externalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public Party addExternalReferenceItem(ExternalReference externalReferenceItem) {
-		if (this.externalReference == null) {
-			this.externalReference = new HashSet<>();
-		}
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ExternalReference> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(Set<ExternalReference> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public Party partyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-		return this;
-	}
-
-	public Party addPartyCharacteristicItem(Characteristic partyCharacteristicItem) {
-		if (this.partyCharacteristic == null) {
-			this.partyCharacteristic = new HashSet<>();
-		}
-		this.partyCharacteristic.add(partyCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * Get partyCharacteristic
-	 * 
-	 * @return partyCharacteristic
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<Characteristic> getPartyCharacteristic() {
-		return partyCharacteristic;
-	}
-
-	public void setPartyCharacteristic(Set<Characteristic> partyCharacteristic) {
-		this.partyCharacteristic = partyCharacteristic;
-	}
-
-	public Party relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Party addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Party taxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-		return this;
-	}
-
-	public Party addTaxExemptionCertificateItem(TaxExemptionCertificate taxExemptionCertificateItem) {
-		if (this.taxExemptionCertificate == null) {
-			this.taxExemptionCertificate = new HashSet<>();
-		}
-		this.taxExemptionCertificate.add(taxExemptionCertificateItem);
-		return this;
-	}
-
-	/**
-	 * Get taxExemptionCertificate
-	 * 
-	 * @return taxExemptionCertificate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<TaxExemptionCertificate> getTaxExemptionCertificate() {
-		return taxExemptionCertificate;
-	}
-
-	public void setTaxExemptionCertificate(Set<TaxExemptionCertificate> taxExemptionCertificate) {
-		this.taxExemptionCertificate = taxExemptionCertificate;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Party party = (Party) o;
-		return Objects.equals(this.uuid, party.uuid) && Objects.equals(this.href, party.href)
-				&& Objects.equals(this.contactMedium, party.contactMedium)
-				&& Objects.equals(this.creditRating, party.creditRating)
-				&& Objects.equals(this.externalReference, party.externalReference)
-				&& Objects.equals(this.partyCharacteristic, party.partyCharacteristic)
-				&& Objects.equals(this.relatedParty, party.relatedParty)
-				&& Objects.equals(this.taxExemptionCertificate, party.taxExemptionCertificate)
-				&& Objects.equals(this.baseType, party.baseType)
-				&& Objects.equals(this.schemaLocation, party.schemaLocation) && Objects.equals(this.type, party.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, contactMedium, creditRating, externalReference, partyCharacteristic, relatedParty, taxExemptionCertificate, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Party {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-		sb.append("    creditRating: ").append(toIndentedString(creditRating)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    partyCharacteristic: ").append(toIndentedString(partyCharacteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    taxExemptionCertificate: ").append(toIndentedString(taxExemptionCertificate)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/PartyCreditProfile.java b/src/main/java/org/etsi/osl/tmf/pm632/model/PartyCreditProfile.java
deleted file mode 100644
index 7f837ecfd56c70a92df1b4527c0de9b5323649a6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/PartyCreditProfile.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * An individual might be evaluated for its worthiness and this evaluation might be based on a credit rating given by a credit agency.
- */
-@Schema(description = "An individual might be evaluated for its worthiness and this evaluation might be based on a credit rating given by a credit agency.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-
-@Entity
-public class PartyCreditProfile extends BaseRootEntity  {
-  @JsonProperty("creditAgencyName")
-  private String creditAgencyName = null;
-
-  @JsonProperty("creditAgencyType")
-  private String creditAgencyType = null;
-
-  @JsonProperty("ratingReference")
-  private String ratingReference = null;
-
-  @JsonProperty("ratingScore")
-  private Integer ratingScore = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public PartyCreditProfile creditAgencyName(String creditAgencyName) {
-    this.creditAgencyName = creditAgencyName;
-    return this;
-  }
-
-  /**
-   * Name of the credit agency giving the score
-   * @return creditAgencyName
-  **/
-  @Schema(description = "Name of the credit agency giving the score")
-
-
-  public String getCreditAgencyName() {
-    return creditAgencyName;
-  }
-
-  public void setCreditAgencyName(String creditAgencyName) {
-    this.creditAgencyName = creditAgencyName;
-  }
-
-  public PartyCreditProfile creditAgencyType(String creditAgencyType) {
-    this.creditAgencyType = creditAgencyType;
-    return this;
-  }
-
-  /**
-   * Type of the credit agency giving the score
-   * @return creditAgencyType
-  **/
-  @Schema(description = "Type of the credit agency giving the score")
-
-
-  public String getCreditAgencyType() {
-    return creditAgencyType;
-  }
-
-  public void setCreditAgencyType(String creditAgencyType) {
-    this.creditAgencyType = creditAgencyType;
-  }
-
-  public PartyCreditProfile ratingReference(String ratingReference) {
-    this.ratingReference = ratingReference;
-    return this;
-  }
-
-  /**
-   * Reference corresponding to the credit rating
-   * @return ratingReference
-  **/
-  @Schema(description = "Reference corresponding to the credit rating")
-
-
-  public String getRatingReference() {
-    return ratingReference;
-  }
-
-  public void setRatingReference(String ratingReference) {
-    this.ratingReference = ratingReference;
-  }
-
-  public PartyCreditProfile ratingScore(Integer ratingScore) {
-    this.ratingScore = ratingScore;
-    return this;
-  }
-
-  /**
-   * A measure of a party’s creditworthiness calculated on the basis of a combination of factors such as their income and credit history
-   * @return ratingScore
-  **/
-  @Schema(description = "A measure of a party’s creditworthiness calculated on the basis of a combination of factors such as their income and credit history")
-
-
-  public Integer getRatingScore() {
-    return ratingScore;
-  }
-
-  public void setRatingScore(Integer ratingScore) {
-    this.ratingScore = ratingScore;
-  }
-
-  public PartyCreditProfile validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyCreditProfile partyCreditProfile = (PartyCreditProfile) o;
-    return Objects.equals(this.creditAgencyName, partyCreditProfile.creditAgencyName) &&
-        Objects.equals(this.creditAgencyType, partyCreditProfile.creditAgencyType) &&
-        Objects.equals(this.ratingReference, partyCreditProfile.ratingReference) &&
-        Objects.equals(this.ratingScore, partyCreditProfile.ratingScore) &&
-        Objects.equals(this.validFor, partyCreditProfile.validFor) &&
-        Objects.equals(this.baseType, partyCreditProfile.baseType) &&
-        Objects.equals(this.schemaLocation, partyCreditProfile.schemaLocation) &&
-        Objects.equals(this.type, partyCreditProfile.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(creditAgencyName, creditAgencyType, ratingReference, ratingScore, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyCreditProfile {\n");
-    
-    sb.append("    creditAgencyName: ").append(toIndentedString(creditAgencyName)).append("\n");
-    sb.append("    creditAgencyType: ").append(toIndentedString(creditAgencyType)).append("\n");
-    sb.append("    ratingReference: ").append(toIndentedString(ratingReference)).append("\n");
-    sb.append("    ratingScore: ").append(toIndentedString(ratingScore)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/Skill.java b/src/main/java/org/etsi/osl/tmf/pm632/model/Skill.java
deleted file mode 100644
index 0047531e731f6c27d269393f2d64c27fd661bfc4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/Skill.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Skills evaluated for an individual with a level and possibly with a limited validity when an obsolescence is defined (Ex: the first-aid certificate first level is limited to one year and an update training is required each year to keep the level).
- */
-@Schema(description = "Skills evaluated for an individual with a level and possibly with a limited validity when an obsolescence is defined (Ex: the first-aid certificate first level is limited to one year and an update training is required each year to keep the level).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class Skill extends BaseRootEntity  {
-  @JsonProperty("comment")
-  private String comment = null;
-
-  @JsonProperty("evaluatedLevel")
-  private String evaluatedLevel = null;
-
-  @JsonProperty("skillCode")
-  private String skillCode = null;
-
-  @JsonProperty("skillName")
-  private String skillName = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public Skill comment(String comment) {
-    this.comment = comment;
-    return this;
-  }
-
-  /**
-   * A free text comment linked to the evaluation done
-   * @return comment
-  **/
-  @Schema(description = "A free text comment linked to the evaluation done")
-
-
-  public String getComment() {
-    return comment;
-  }
-
-  public void setComment(String comment) {
-    this.comment = comment;
-  }
-
-  public Skill evaluatedLevel(String evaluatedLevel) {
-    this.evaluatedLevel = evaluatedLevel;
-    return this;
-  }
-
-  /**
-   * Level of expertise in a skill evaluated for an individual
-   * @return evaluatedLevel
-  **/
-  @Schema(description = "Level of expertise in a skill evaluated for an individual")
-
-
-  public String getEvaluatedLevel() {
-    return evaluatedLevel;
-  }
-
-  public void setEvaluatedLevel(String evaluatedLevel) {
-    this.evaluatedLevel = evaluatedLevel;
-  }
-
-  public Skill skillCode(String skillCode) {
-    this.skillCode = skillCode;
-    return this;
-  }
-
-  /**
-   * Code of the skill
-   * @return skillCode
-  **/
-  @Schema(description = "Code of the skill")
-
-
-  public String getSkillCode() {
-    return skillCode;
-  }
-
-  public void setSkillCode(String skillCode) {
-    this.skillCode = skillCode;
-  }
-
-  public Skill skillName(String skillName) {
-    this.skillName = skillName;
-    return this;
-  }
-
-  /**
-   * Name of the skill such as Java language,…
-   * @return skillName
-  **/
-  @Schema(description = "Name of the skill such as Java language,…")
-
-
-  public String getSkillName() {
-    return skillName;
-  }
-
-  public void setSkillName(String skillName) {
-    this.skillName = skillName;
-  }
-
-  public Skill validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Skill skill = (Skill) o;
-    return Objects.equals(this.comment, skill.comment) &&
-        Objects.equals(this.evaluatedLevel, skill.evaluatedLevel) &&
-        Objects.equals(this.skillCode, skill.skillCode) &&
-        Objects.equals(this.skillName, skill.skillName) &&
-        Objects.equals(this.validFor, skill.validFor) &&
-        Objects.equals(this.baseType, skill.baseType) &&
-        Objects.equals(this.schemaLocation, skill.schemaLocation) &&
-        Objects.equals(this.type, skill.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(comment, evaluatedLevel, skillCode, skillName, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Skill {\n");
-    
-    sb.append("    comment: ").append(toIndentedString(comment)).append("\n");
-    sb.append("    evaluatedLevel: ").append(toIndentedString(evaluatedLevel)).append("\n");
-    sb.append("    skillCode: ").append(toIndentedString(skillCode)).append("\n");
-    sb.append("    skillName: ").append(toIndentedString(skillName)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/TaxDefinition.java b/src/main/java/org/etsi/osl/tmf/pm632/model/TaxDefinition.java
deleted file mode 100644
index 1682ae54604b79d7255de122c02098213717ddb6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/TaxDefinition.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Reference of a tax definition. A tax is levied by an authorized tax jurisdiction. There are many different types of tax (Federal Tax levied by the US Government, State Tax levied by the State of California,…).
- */
-@Schema(description = "Reference of a tax definition. A tax is levied by an authorized tax jurisdiction. There are many different types of tax (Federal Tax levied by the US Government, State Tax levied by the State of California,…).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class TaxDefinition  extends BaseRootNamedEntity { 
-
-
-  @JsonProperty("taxType")
-  private String taxType = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-
-  /**
-   * Unique identifier of the tax.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the tax.")
-
-
-  @JsonProperty("id")
-  public String getId() {
-    return uuid;
-  }
-
-
-
-  public TaxDefinition taxType(String taxType) {
-    this.taxType = taxType;
-    return this;
-  }
-
-  /**
-   * Type of  the tax.
-   * @return taxType
-  **/
-  @Schema(description = "Type of  the tax.")
-
-
-  public String getTaxType() {
-    return taxType;
-  }
-
-  public void setTaxType(String taxType) {
-    this.taxType = taxType;
-  }
-
-
-  public TaxDefinition referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TaxDefinition taxDefinition = (TaxDefinition) o;
-    return Objects.equals(this.uuid, taxDefinition.uuid) &&
-        Objects.equals(this.name, taxDefinition.name) &&
-        Objects.equals(this.taxType, taxDefinition.taxType) &&
-        Objects.equals(this.baseType, taxDefinition.baseType) &&
-        Objects.equals(this.schemaLocation, taxDefinition.schemaLocation) &&
-        Objects.equals(this.type, taxDefinition.type) &&
-        Objects.equals(this.referredType, taxDefinition.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, name, taxType, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TaxDefinition {\n");
-    
-    sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    taxType: ").append(toIndentedString(taxType)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/model/TaxExemptionCertificate.java b/src/main/java/org/etsi/osl/tmf/pm632/model/TaxExemptionCertificate.java
deleted file mode 100644
index ba1924900ed9d9ee12cdd7d7b7b6aaf18d997841..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/pm632/model/TaxExemptionCertificate.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.pm632.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * A tax exemption certificate represents a tax exemption granted to a party
- * (individual or organization) by a tax jurisdiction which may be a city,
- * state, country,... An exemption has a certificate identifier (received from
- * the jurisdiction that levied the tax) and a validity period. An exemption is
- * per tax types and determines for each type of tax what portion of the tax is
- * exempted (partial by percentage or complete) via the tax definition.
- */
-@Schema(description = "A tax exemption certificate represents a tax exemption granted to a party (individual or organization) by a tax jurisdiction which may be a city, state, country,... An exemption has a certificate identifier (received from the jurisdiction that levied the tax) and a validity period. An exemption is per tax types and determines for each type of tax what portion of the tax is exempted (partial by percentage or complete) via the tax definition.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:38:47.101+03:00")
-
-@Entity
-public class TaxExemptionCertificate extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("attachment")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "attachment_refid", referencedColumnName = "uuid")
-	private AttachmentRefOrValue attachment = null;
-
-	@JsonProperty("taxDefinition")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TaxDefinition> taxDefinition = new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	private String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	@JsonProperty("@type")
-	private String type = null;
-
-	public TaxExemptionCertificate id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the certificate of the tax exemption
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the certificate of the tax exemption")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public TaxExemptionCertificate attachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	/**
-	 * Get attachment
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public AttachmentRefOrValue getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(AttachmentRefOrValue attachment) {
-		this.attachment = attachment;
-	}
-
-	public TaxExemptionCertificate taxDefinition(Set<TaxDefinition> taxDefinition) {
-		this.taxDefinition = taxDefinition;
-		return this;
-	}
-
-	public TaxExemptionCertificate addTaxDefinitionItem(TaxDefinition taxDefinitionItem) {
-		if (this.taxDefinition == null) {
-			this.taxDefinition = new HashSet<>();
-		}
-		this.taxDefinition.add(taxDefinitionItem);
-		return this;
-	}
-
-	/**
-	 * Get taxDefinition
-	 * 
-	 * @return taxDefinition
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<TaxDefinition> getTaxDefinition() {
-		return taxDefinition;
-	}
-
-	public void setTaxDefinition(Set<TaxDefinition> taxDefinition) {
-		this.taxDefinition = taxDefinition;
-	}
-
-	public TaxExemptionCertificate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public TaxExemptionCertificate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public TaxExemptionCertificate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public TaxExemptionCertificate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		TaxExemptionCertificate taxExemptionCertificate = (TaxExemptionCertificate) o;
-		return Objects.equals(this.id, taxExemptionCertificate.id)
-				&& Objects.equals(this.attachment, taxExemptionCertificate.attachment)
-				&& Objects.equals(this.taxDefinition, taxExemptionCertificate.taxDefinition)
-				&& Objects.equals(this.validFor, taxExemptionCertificate.validFor)
-				&& Objects.equals(this.baseType, taxExemptionCertificate.baseType)
-				&& Objects.equals(this.schemaLocation, taxExemptionCertificate.schemaLocation)
-				&& Objects.equals(this.type, taxExemptionCertificate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, attachment, taxDefinition, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class TaxExemptionCertificate {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    taxDefinition: ").append(toIndentedString(taxDefinition)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/AgreementItemRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/AgreementItemRef.java
deleted file mode 100644
index 73de8611b1ece90f3ec9e20fe7c527b606287478..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/AgreementItemRef.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.
- */
-@Schema(description = "Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class AgreementItemRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("agreementItemId")
-  private String agreementItemId = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public AgreementItemRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementItemRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementItemRef agreementItemId(String agreementItemId) {
-    this.agreementItemId = agreementItemId;
-    return this;
-  }
-
-  /**
-   * Identifier of the agreement
-   * @return agreementItemId
-  **/
-  @Schema(description = "Identifier of the agreement")
-  
-    public String getAgreementItemId() {
-    return agreementItemId;
-  }
-
-  public void setAgreementItemId(String agreementItemId) {
-    this.agreementItemId = agreementItemId;
-  }
-
-  public AgreementItemRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementItemRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AgreementItemRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementItemRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public AgreementItemRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementItemRef agreementItemRef = (AgreementItemRef) o;
-    return Objects.equals(this.id, agreementItemRef.id) &&
-        Objects.equals(this.href, agreementItemRef.href) &&
-        Objects.equals(this.agreementItemId, agreementItemRef.agreementItemId) &&
-        Objects.equals(this.name, agreementItemRef.name) &&
-        Objects.equals(this.baseType, agreementItemRef.baseType) &&
-        Objects.equals(this.schemaLocation, agreementItemRef.schemaLocation) &&
-        Objects.equals(this.type, agreementItemRef.type) &&
-        Objects.equals(this._atReferredType, agreementItemRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, agreementItemId, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementItemRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    agreementItemId: ").append(toIndentedString(agreementItemId)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/AgreementRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/AgreementRef.java
deleted file mode 100644
index c729d633d433442643f981874999b6fbd13d92b8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/AgreementRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.
- */
-@Schema(description = "Agreement reference. An agreement represents a contract or arrangement, either written or verbal and sometimes enforceable by law, such as a service level agreement or a customer price agreement. An agreement involves a number of other business entities, such as products, services, and resources and/or their specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class AgreementRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public AgreementRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AgreementRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AgreementRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the agreement
-   * @return name
-  **/
-  @Schema(description = "Name of the agreement")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public AgreementRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AgreementRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AgreementRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public AgreementRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AgreementRef agreementRef = (AgreementRef) o;
-    return Objects.equals(this.id, agreementRef.id) &&
-        Objects.equals(this.href, agreementRef.href) &&
-        Objects.equals(this.name, agreementRef.name) &&
-        Objects.equals(this.baseType, agreementRef.baseType) &&
-        Objects.equals(this.schemaLocation, agreementRef.schemaLocation) &&
-        Objects.equals(this.type, agreementRef.type) &&
-        Objects.equals(this._atReferredType, agreementRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AgreementRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Any.java b/src/main/java/org/etsi/osl/tmf/po622/model/Any.java
deleted file mode 100644
index 836730781fb2b5198759302676013fec36be4607..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Any.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-/**
- * Any
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Any   {
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash();
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Any {\n");
-    
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/AppointmentRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/AppointmentRef.java
deleted file mode 100644
index 44e145e39b1c2156681b7699e5ee4e72dbde030a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/AppointmentRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Refers an appointment, such as a Customer presentation or internal meeting or site visit
- */
-@Schema(description = "Refers an appointment, such as a Customer presentation or internal meeting or site visit")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class AppointmentRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public AppointmentRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier of the referred appointment
-   * @return id
-  **/
-  @Schema(description = "The identifier of the referred appointment")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AppointmentRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The reference of the appointment
-   * @return href
-  **/
-  @Schema(description = "The reference of the appointment")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AppointmentRef description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text regarding the appointment made with a party
-   * @return description
-  **/
-  @Schema(description = "An explanatory text regarding the appointment made with a party")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AppointmentRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public AppointmentRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public AppointmentRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public AppointmentRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AppointmentRef appointmentRef = (AppointmentRef) o;
-    return Objects.equals(this.id, appointmentRef.id) &&
-        Objects.equals(this.href, appointmentRef.href) &&
-        Objects.equals(this.description, appointmentRef.description) &&
-        Objects.equals(this.baseType, appointmentRef.baseType) &&
-        Objects.equals(this.schemaLocation, appointmentRef.schemaLocation) &&
-        Objects.equals(this.type, appointmentRef.type) &&
-        Objects.equals(this._atReferredType, appointmentRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AppointmentRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/BillingAccountRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/BillingAccountRef.java
deleted file mode 100644
index 5dd0323895b435b2590568adc6f58f171b212a1d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/BillingAccountRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * BillingAccount reference. A BillingAccount is a detailed description of a bill structure.
- */
-@Schema(description = "BillingAccount reference. A BillingAccount is a detailed description of a bill structure.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class BillingAccountRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public BillingAccountRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the billing account
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the billing account")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public BillingAccountRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the billing account
-   * @return href
-  **/
-  @Schema(description = "Reference of the billing account")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public BillingAccountRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the billing account
-   * @return name
-  **/
-  @Schema(description = "Name of the billing account")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public BillingAccountRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public BillingAccountRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public BillingAccountRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public BillingAccountRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BillingAccountRef billingAccountRef = (BillingAccountRef) o;
-    return Objects.equals(this.id, billingAccountRef.id) &&
-        Objects.equals(this.href, billingAccountRef.href) &&
-        Objects.equals(this.name, billingAccountRef.name) &&
-        Objects.equals(this.baseType, billingAccountRef.baseType) &&
-        Objects.equals(this.schemaLocation, billingAccountRef.schemaLocation) &&
-        Objects.equals(this.type, billingAccountRef.type) &&
-        Objects.equals(this._atReferredType, billingAccountRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BillingAccountRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelOrder.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelOrder.java
deleted file mode 100644
index c431bb56a9f38832339da33825cf3a6b731ceb9b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelOrder.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Order cancel is a type of task which  can  be used to place a request to cancel an order
- */
-@Schema(description = "A Order cancel is a type of task which  can  be used to place a request to cancel an order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelOrder   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("effectiveCancellationDate")
-  private OffsetDateTime effectiveCancellationDate = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("state")
-  private TaskStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public CancelOrder id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * id of the cancellation request (this is not an order id)
-   * @return id
-  **/
-  @Schema(description = "id of the cancellation request (this is not an order id)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelOrder href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the cancellation request
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the cancellation request")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelOrder cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelOrder effectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled.
-   * @return effectiveCancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled.")
-  
-    @Valid
-    public OffsetDateTime getEffectiveCancellationDate() {
-    return effectiveCancellationDate;
-  }
-
-  public void setEffectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-  }
-
-  public CancelOrder requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelOrder state(TaskStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TaskStateType getState() {
-    return state;
-  }
-
-  public void setState(TaskStateType state) {
-    this.state = state;
-  }
-
-  public CancelOrder baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CancelOrder schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CancelOrder type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelOrder cancelOrder = (CancelOrder) o;
-    return Objects.equals(this.id, cancelOrder.id) &&
-        Objects.equals(this.href, cancelOrder.href) &&
-        Objects.equals(this.cancellationReason, cancelOrder.cancellationReason) &&
-        Objects.equals(this.effectiveCancellationDate, cancelOrder.effectiveCancellationDate) &&
-        Objects.equals(this.requestedCancellationDate, cancelOrder.requestedCancellationDate) &&
-        Objects.equals(this.state, cancelOrder.state) &&
-        Objects.equals(this.baseType, cancelOrder.baseType) &&
-        Objects.equals(this.schemaLocation, cancelOrder.schemaLocation) &&
-        Objects.equals(this.type, cancelOrder.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, cancellationReason, effectiveCancellationDate, requestedCancellationDate, state, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelOrder {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    effectiveCancellationDate: ").append(toIndentedString(effectiveCancellationDate)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrder.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrder.java
deleted file mode 100644
index 6a6ac36680f7e11d58ac5b5bc133bbe3427b121c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrder.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Request for cancellation an existing product order
- */
-@Schema(description = "Request for cancellation an existing product order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrder   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("effectiveCancellationDate")
-  private OffsetDateTime effectiveCancellationDate = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("productOrder")
-  private ProductOrderRef productOrder = null;
-
-  @JsonProperty("state")
-  private TaskStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public CancelProductOrder id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * id of the cancellation request (this is not an order id)
-   * @return id
-  **/
-  @Schema(description = "id of the cancellation request (this is not an order id)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelProductOrder href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the cancellation request
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the cancellation request")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelProductOrder cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelProductOrder effectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled.
-   * @return effectiveCancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled.")
-  
-    @Valid
-    public OffsetDateTime getEffectiveCancellationDate() {
-    return effectiveCancellationDate;
-  }
-
-  public void setEffectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-  }
-
-  public CancelProductOrder requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelProductOrder productOrder(ProductOrderRef productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public ProductOrderRef getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrderRef productOrder) {
-    this.productOrder = productOrder;
-  }
-
-  public CancelProductOrder state(TaskStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TaskStateType getState() {
-    return state;
-  }
-
-  public void setState(TaskStateType state) {
-    this.state = state;
-  }
-
-  public CancelProductOrder baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CancelProductOrder schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CancelProductOrder type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrder cancelProductOrder = (CancelProductOrder) o;
-    return Objects.equals(this.id, cancelProductOrder.id) &&
-        Objects.equals(this.href, cancelProductOrder.href) &&
-        Objects.equals(this.cancellationReason, cancelProductOrder.cancellationReason) &&
-        Objects.equals(this.effectiveCancellationDate, cancelProductOrder.effectiveCancellationDate) &&
-        Objects.equals(this.requestedCancellationDate, cancelProductOrder.requestedCancellationDate) &&
-        Objects.equals(this.productOrder, cancelProductOrder.productOrder) &&
-        Objects.equals(this.state, cancelProductOrder.state) &&
-        Objects.equals(this.baseType, cancelProductOrder.baseType) &&
-        Objects.equals(this.schemaLocation, cancelProductOrder.schemaLocation) &&
-        Objects.equals(this.type, cancelProductOrder.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, cancellationReason, effectiveCancellationDate, requestedCancellationDate, productOrder, state, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrder {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    effectiveCancellationDate: ").append(toIndentedString(effectiveCancellationDate)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreate.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreate.java
deleted file mode 100644
index 018dda099b7dc16bf7e336e11dad75fa4ded6bae..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreate.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Request for cancellation an existing product order Skipped properties: id,href,state,effectiveCancellationDate
- */
-@Schema(description = "Request for cancellation an existing product order Skipped properties: id,href,state,effectiveCancellationDate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderCreate   {
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("productOrder")
-  private ProductOrderRef productOrder = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public CancelProductOrderCreate cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelProductOrderCreate requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelProductOrderCreate productOrder(ProductOrderRef productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public ProductOrderRef getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrderRef productOrder) {
-    this.productOrder = productOrder;
-  }
-
-  public CancelProductOrderCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CancelProductOrderCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CancelProductOrderCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderCreate cancelProductOrderCreate = (CancelProductOrderCreate) o;
-    return Objects.equals(this.cancellationReason, cancelProductOrderCreate.cancellationReason) &&
-        Objects.equals(this.requestedCancellationDate, cancelProductOrderCreate.requestedCancellationDate) &&
-        Objects.equals(this.productOrder, cancelProductOrderCreate.productOrder) &&
-        Objects.equals(this.baseType, cancelProductOrderCreate.baseType) &&
-        Objects.equals(this.schemaLocation, cancelProductOrderCreate.schemaLocation) &&
-        Objects.equals(this.type, cancelProductOrderCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancellationReason, requestedCancellationDate, productOrder, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderCreate {\n");
-    
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEvent.java
deleted file mode 100644
index 59d42a223d8dcf9be83d3d58ebf2c928a2b59c2f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CancelProductOrderCreateEventPayload event = null;
-
-  public CancelProductOrderCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelProductOrderCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelProductOrderCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelProductOrderCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelProductOrderCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelProductOrderCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelProductOrderCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelProductOrderCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelProductOrderCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelProductOrderCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelProductOrderCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelProductOrderCreateEvent event(CancelProductOrderCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrderCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelProductOrderCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderCreateEvent cancelProductOrderCreateEvent = (CancelProductOrderCreateEvent) o;
-    return Objects.equals(this.id, cancelProductOrderCreateEvent.id) &&
-        Objects.equals(this.href, cancelProductOrderCreateEvent.href) &&
-        Objects.equals(this.eventId, cancelProductOrderCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelProductOrderCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelProductOrderCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelProductOrderCreateEvent.correlationId) &&
-        Objects.equals(this.domain, cancelProductOrderCreateEvent.domain) &&
-        Objects.equals(this.title, cancelProductOrderCreateEvent.title) &&
-        Objects.equals(this.description, cancelProductOrderCreateEvent.description) &&
-        Objects.equals(this.priority, cancelProductOrderCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelProductOrderCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, cancelProductOrderCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEventPayload.java
deleted file mode 100644
index 86c4ec665d8d1621ee40abc373aca724ace10748..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderCreateEventPayload   {
-  @JsonProperty("cancelProductOrder")
-  private CancelProductOrder cancelProductOrder = null;
-
-  public CancelProductOrderCreateEventPayload cancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelProductOrder
-   * @return cancelProductOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrder getCancelProductOrder() {
-    return cancelProductOrder;
-  }
-
-  public void setCancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderCreateEventPayload cancelProductOrderCreateEventPayload = (CancelProductOrderCreateEventPayload) o;
-    return Objects.equals(this.cancelProductOrder, cancelProductOrderCreateEventPayload.cancelProductOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelProductOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderCreateEventPayload {\n");
-    
-    sb.append("    cancelProductOrder: ").append(toIndentedString(cancelProductOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEvent.java
deleted file mode 100644
index fd6e530f456b2f8835f760d9527aa4b33b7d2ef6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderInformationRequiredEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private CancelProductOrderInformationRequiredEventPayload event = null;
-
-  public CancelProductOrderInformationRequiredEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelProductOrderInformationRequiredEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelProductOrderInformationRequiredEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelProductOrderInformationRequiredEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelProductOrderInformationRequiredEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelProductOrderInformationRequiredEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelProductOrderInformationRequiredEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelProductOrderInformationRequiredEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelProductOrderInformationRequiredEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelProductOrderInformationRequiredEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public CancelProductOrderInformationRequiredEvent event(CancelProductOrderInformationRequiredEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrderInformationRequiredEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelProductOrderInformationRequiredEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderInformationRequiredEvent cancelProductOrderInformationRequiredEvent = (CancelProductOrderInformationRequiredEvent) o;
-    return Objects.equals(this.eventId, cancelProductOrderInformationRequiredEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelProductOrderInformationRequiredEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelProductOrderInformationRequiredEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelProductOrderInformationRequiredEvent.correlationId) &&
-        Objects.equals(this.domain, cancelProductOrderInformationRequiredEvent.domain) &&
-        Objects.equals(this.title, cancelProductOrderInformationRequiredEvent.title) &&
-        Objects.equals(this.description, cancelProductOrderInformationRequiredEvent.description) &&
-        Objects.equals(this.priority, cancelProductOrderInformationRequiredEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelProductOrderInformationRequiredEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, cancelProductOrderInformationRequiredEvent.fieldPath) &&
-        Objects.equals(this.event, cancelProductOrderInformationRequiredEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderInformationRequiredEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEventPayload.java
deleted file mode 100644
index 75bf9e5c494a3fad81630aa5a4108a950133852c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderInformationRequiredEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderInformationRequiredEventPayload   {
-  @JsonProperty("cancelProductOrder")
-  private CancelProductOrder cancelProductOrder = null;
-
-  public CancelProductOrderInformationRequiredEventPayload cancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelProductOrder
-   * @return cancelProductOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrder getCancelProductOrder() {
-    return cancelProductOrder;
-  }
-
-  public void setCancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderInformationRequiredEventPayload cancelProductOrderInformationRequiredEventPayload = (CancelProductOrderInformationRequiredEventPayload) o;
-    return Objects.equals(this.cancelProductOrder, cancelProductOrderInformationRequiredEventPayload.cancelProductOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelProductOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderInformationRequiredEventPayload {\n");
-    
-    sb.append("    cancelProductOrder: ").append(toIndentedString(cancelProductOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEvent.java
deleted file mode 100644
index c0280f588b97658958bd157e3a55b9c42adc313a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CancelProductOrderStateChangeEventPayload event = null;
-
-  public CancelProductOrderStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelProductOrderStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelProductOrderStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelProductOrderStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelProductOrderStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelProductOrderStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelProductOrderStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelProductOrderStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelProductOrderStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelProductOrderStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelProductOrderStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelProductOrderStateChangeEvent event(CancelProductOrderStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrderStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelProductOrderStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderStateChangeEvent cancelProductOrderStateChangeEvent = (CancelProductOrderStateChangeEvent) o;
-    return Objects.equals(this.id, cancelProductOrderStateChangeEvent.id) &&
-        Objects.equals(this.href, cancelProductOrderStateChangeEvent.href) &&
-        Objects.equals(this.eventId, cancelProductOrderStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelProductOrderStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelProductOrderStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelProductOrderStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, cancelProductOrderStateChangeEvent.domain) &&
-        Objects.equals(this.title, cancelProductOrderStateChangeEvent.title) &&
-        Objects.equals(this.description, cancelProductOrderStateChangeEvent.description) &&
-        Objects.equals(this.priority, cancelProductOrderStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelProductOrderStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, cancelProductOrderStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEventPayload.java
deleted file mode 100644
index dde76f6dedf5ced053fee627558b3b944989b302..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/CancelProductOrderStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class CancelProductOrderStateChangeEventPayload   {
-  @JsonProperty("cancelProductOrder")
-  private CancelProductOrder cancelProductOrder = null;
-
-  public CancelProductOrderStateChangeEventPayload cancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelProductOrder
-   * @return cancelProductOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelProductOrder getCancelProductOrder() {
-    return cancelProductOrder;
-  }
-
-  public void setCancelProductOrder(CancelProductOrder cancelProductOrder) {
-    this.cancelProductOrder = cancelProductOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelProductOrderStateChangeEventPayload cancelProductOrderStateChangeEventPayload = (CancelProductOrderStateChangeEventPayload) o;
-    return Objects.equals(this.cancelProductOrder, cancelProductOrderStateChangeEventPayload.cancelProductOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelProductOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelProductOrderStateChangeEventPayload {\n");
-    
-    sb.append("    cancelProductOrder: ").append(toIndentedString(cancelProductOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/po622/model/Characteristic.java
deleted file mode 100644
index d709b73f6509d496f47936f3bea84dec2350548e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Characteristic.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Characteristic   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("value")
-  private Any value = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Characteristic name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the characteristic
-   * @return name
-  **/
-  @Schema(description = "Name of the characteristic")
-      @NotNull
-
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Characteristic valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * Data type of the value of the characteristic
-   * @return valueType
-  **/
-  @Schema(description = "Data type of the value of the characteristic")
-  
-    public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public Characteristic value(Any value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * Get value
-   * @return value
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public Any getValue() {
-    return value;
-  }
-
-  public void setValue(Any value) {
-    this.value = value;
-  }
-
-  public Characteristic baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Characteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Characteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Characteristic characteristic = (Characteristic) o;
-    return Objects.equals(this.name, characteristic.name) &&
-        Objects.equals(this.valueType, characteristic.valueType) &&
-        Objects.equals(this.value, characteristic.value) &&
-        Objects.equals(this.baseType, characteristic.baseType) &&
-        Objects.equals(this.schemaLocation, characteristic.schemaLocation) &&
-        Objects.equals(this.type, characteristic.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, valueType, value, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Characteristic {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/EntityRef.java
deleted file mode 100644
index 97784a5b973ec5087a7b4fcf740e23cc2e9af79d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/EntityRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this._atReferredType, entityRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Error.java b/src/main/java/org/etsi/osl/tmf/po622/model/Error.java
deleted file mode 100644
index ac8498389dde61ee3a7480c70877dab208737c96..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Error.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscription.java
deleted file mode 100644
index 8e67b571679f7177cd309686d0dd1481e16f60a8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscription.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscriptionInput.java
deleted file mode 100644
index 083bc48a4a580153913c1aee74cea0d09702fadf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Money.java b/src/main/java/org/etsi/osl/tmf/po622/model/Money.java
deleted file mode 100644
index 3e92fbf16c72573df5d511163adbff235dbf4777..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Money.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * A base / value business entity used to represent money
- */
-@Schema(description = "A base / value business entity used to represent money")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Money   {
-  @JsonProperty("unit")
-  private String unit = null;
-
-  @JsonProperty("value")
-  private Float value = null;
-
-  public Money unit(String unit) {
-    this.unit = unit;
-    return this;
-  }
-
-  /**
-   * Currency (ISO4217 norm uses 3 letters to define the currency)
-   * @return unit
-  **/
-  @Schema(description = "Currency (ISO4217 norm uses 3 letters to define the currency)")
-  
-    public String getUnit() {
-    return unit;
-  }
-
-  public void setUnit(String unit) {
-    this.unit = unit;
-  }
-
-  public Money value(Float value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * A positive floating point number
-   * @return value
-  **/
-  @Schema(description = "A positive floating point number")
-  
-    public Float getValue() {
-    return value;
-  }
-
-  public void setValue(Float value) {
-    this.value = value;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Money money = (Money) o;
-    return Objects.equals(this.unit, money.unit) &&
-        Objects.equals(this.value, money.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(unit, value);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Money {\n");
-    
-    sb.append("    unit: ").append(toIndentedString(unit)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemActionType.java b/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemActionType.java
deleted file mode 100644
index f9477f20bde99bbf8f17476e4fc68a8c96e40692..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemActionType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * action to be performed on the product
- */
-public enum OrderItemActionType {
-  ADD("add"),
-    MODIFY("modify"),
-    DELETE("delete"),
-    NOCHANGE("noChange");
-
-  private String value;
-
-  OrderItemActionType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OrderItemActionType fromValue(String text) {
-    for (OrderItemActionType b : OrderItemActionType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemRelationship.java b/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemRelationship.java
deleted file mode 100644
index 9ab03386297d958d21bc33f8409754929208a4d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/OrderItemRelationship.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * OrderItemRelationship
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class OrderItemRelationship   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public OrderItemRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  **/
-  @Schema(description = "")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public OrderItemRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * The type of order item relationship
-   * @return relationshipType
-  **/
-  @Schema(description = "The type of order item relationship")
-  
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public OrderItemRelationship baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public OrderItemRelationship schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public OrderItemRelationship type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrderItemRelationship orderItemRelationship = (OrderItemRelationship) o;
-    return Objects.equals(this.id, orderItemRelationship.id) &&
-        Objects.equals(this.relationshipType, orderItemRelationship.relationshipType) &&
-        Objects.equals(this.baseType, orderItemRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, orderItemRelationship.schemaLocation) &&
-        Objects.equals(this.type, orderItemRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, relationshipType, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrderItemRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/OrderPrice.java b/src/main/java/org/etsi/osl/tmf/po622/model/OrderPrice.java
deleted file mode 100644
index ec9f853c6460e70beb1e3cf11aa5c8141d94a459..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/OrderPrice.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * An amount, usually of money, that represents the actual price paid by the Customer for this item or this order
- */
-@Schema(description = "An amount, usually of money, that represents the actual price paid by the Customer for this item or this order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class OrderPrice   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("priceType")
-  private String priceType = null;
-
-  @JsonProperty("recurringChargePeriod")
-  private String recurringChargePeriod = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("price")
-  private Price price = null;
-
-  @JsonProperty("priceAlteration")
-  @Valid
-  private List<PriceAlteration> priceAlteration = null;
-
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPriceRef productOfferingPrice = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public OrderPrice description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail the semantics of this order item price.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail the semantics of this order item price.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrderPrice name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name such as \"Subscription price\".
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name such as \"Subscription price\".")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public OrderPrice priceType(String priceType) {
-    this.priceType = priceType;
-    return this;
-  }
-
-  /**
-   * A category that describes the price, such as recurring, discount, allowance, penalty, and so forth
-   * @return priceType
-  **/
-  @Schema(description = "A category that describes the price, such as recurring, discount, allowance, penalty, and so forth")
-  
-    public String getPriceType() {
-    return priceType;
-  }
-
-  public void setPriceType(String priceType) {
-    this.priceType = priceType;
-  }
-
-  public OrderPrice recurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-    return this;
-  }
-
-  /**
-   * Could be month, week...
-   * @return recurringChargePeriod
-  **/
-  @Schema(description = "Could be month, week...")
-  
-    public String getRecurringChargePeriod() {
-    return recurringChargePeriod;
-  }
-
-  public void setRecurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-  }
-
-  public OrderPrice unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * Could be minutes, GB...
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "Could be minutes, GB...")
-  
-    public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public OrderPrice billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public OrderPrice price(Price price) {
-    this.price = price;
-    return this;
-  }
-
-  /**
-   * Get price
-   * @return price
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Price getPrice() {
-    return price;
-  }
-
-  public void setPrice(Price price) {
-    this.price = price;
-  }
-
-  public OrderPrice priceAlteration(List<PriceAlteration> priceAlteration) {
-    this.priceAlteration = priceAlteration;
-    return this;
-  }
-
-  public OrderPrice addPriceAlterationItem(PriceAlteration priceAlterationItem) {
-    if (this.priceAlteration == null) {
-      this.priceAlteration = new ArrayList<>();
-    }
-    this.priceAlteration.add(priceAlterationItem);
-    return this;
-  }
-
-  /**
-   * a strucuture used to describe a price alteration
-   * @return priceAlteration
-  **/
-  @Schema(description = "a strucuture used to describe a price alteration")
-      @Valid
-    public List<PriceAlteration> getPriceAlteration() {
-    return priceAlteration;
-  }
-
-  public void setPriceAlteration(List<PriceAlteration> priceAlteration) {
-    this.priceAlteration = priceAlteration;
-  }
-
-  public OrderPrice productOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * Get productOfferingPrice
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingPriceRef getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-  public OrderPrice baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public OrderPrice schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public OrderPrice type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrderPrice orderPrice = (OrderPrice) o;
-    return Objects.equals(this.description, orderPrice.description) &&
-        Objects.equals(this.name, orderPrice.name) &&
-        Objects.equals(this.priceType, orderPrice.priceType) &&
-        Objects.equals(this.recurringChargePeriod, orderPrice.recurringChargePeriod) &&
-        Objects.equals(this.unitOfMeasure, orderPrice.unitOfMeasure) &&
-        Objects.equals(this.billingAccount, orderPrice.billingAccount) &&
-        Objects.equals(this.price, orderPrice.price) &&
-        Objects.equals(this.priceAlteration, orderPrice.priceAlteration) &&
-        Objects.equals(this.productOfferingPrice, orderPrice.productOfferingPrice) &&
-        Objects.equals(this.baseType, orderPrice.baseType) &&
-        Objects.equals(this.schemaLocation, orderPrice.schemaLocation) &&
-        Objects.equals(this.type, orderPrice.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, priceType, recurringChargePeriod, unitOfMeasure, billingAccount, price, priceAlteration, productOfferingPrice, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrderPrice {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-    sb.append("    recurringChargePeriod: ").append(toIndentedString(recurringChargePeriod)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    price: ").append(toIndentedString(price)).append("\n");
-    sb.append("    priceAlteration: ").append(toIndentedString(priceAlteration)).append("\n");
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/OrderTerm.java b/src/main/java/org/etsi/osl/tmf/po622/model/OrderTerm.java
deleted file mode 100644
index 999b3db254896118e93a69f90b8c4b553838d8aa..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/OrderTerm.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Quantity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Description of a productTerm linked to this orderItem. This represent a commitment with a duration
- */
-@Schema(description = "Description of a productTerm linked to this orderItem. This represent a commitment with a duration")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class OrderTerm   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("duration")
-  private Quantity duration = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public OrderTerm description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the productOrderTerm
-   * @return description
-  **/
-  @Schema(description = "Description of the productOrderTerm")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public OrderTerm name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the productOrderTerm
-   * @return name
-  **/
-  @Schema(description = "Name of the productOrderTerm")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public OrderTerm duration(Quantity duration) {
-    this.duration = duration;
-    return this;
-  }
-
-  /**
-   * Get duration
-   * @return duration
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Quantity getDuration() {
-    return duration;
-  }
-
-  public void setDuration(Quantity duration) {
-    this.duration = duration;
-  }
-
-  public OrderTerm baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public OrderTerm schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public OrderTerm type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OrderTerm orderTerm = (OrderTerm) o;
-    return Objects.equals(this.description, orderTerm.description) &&
-        Objects.equals(this.name, orderTerm.name) &&
-        Objects.equals(this.duration, orderTerm.duration) &&
-        Objects.equals(this.baseType, orderTerm.baseType) &&
-        Objects.equals(this.schemaLocation, orderTerm.schemaLocation) &&
-        Objects.equals(this.type, orderTerm.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, duration, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OrderTerm {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    duration: ").append(toIndentedString(duration)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/PaymentRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/PaymentRef.java
deleted file mode 100644
index d60169ea1540fdff918f11b562e98ca8a6b09076..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/PaymentRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * If an immediate payment has been done at the product order submission, the payment information are captured and stored (as a reference) in the order.
- */
-@Schema(description = "If an immediate payment has been done at the product order submission, the payment information are captured and stored (as a reference) in the order.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class PaymentRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public PaymentRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PaymentRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PaymentRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A name for the payment
-   * @return name
-  **/
-  @Schema(description = "A name for the payment")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PaymentRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PaymentRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PaymentRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public PaymentRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PaymentRef paymentRef = (PaymentRef) o;
-    return Objects.equals(this.id, paymentRef.id) &&
-        Objects.equals(this.href, paymentRef.href) &&
-        Objects.equals(this.name, paymentRef.name) &&
-        Objects.equals(this.baseType, paymentRef.baseType) &&
-        Objects.equals(this.schemaLocation, paymentRef.schemaLocation) &&
-        Objects.equals(this.type, paymentRef.type) &&
-        Objects.equals(this._atReferredType, paymentRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PaymentRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Place.java b/src/main/java/org/etsi/osl/tmf/po622/model/Place.java
deleted file mode 100644
index 62c96891b445614dd888083ee2f247ec50e55b39..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Place.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Place reference. Place defines the places where the products are sold or delivered.
- */
-@Schema(description = "Place reference. Place defines the places where the products are sold or delivered.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Place   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Place id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Place href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the place
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the place")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Place name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]
-   * @return name
-  **/
-  @Schema(description = "A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Place baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Place schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Place type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Place place = (Place) o;
-    return Objects.equals(this.id, place.id) &&
-        Objects.equals(this.href, place.href) &&
-        Objects.equals(this.name, place.name) &&
-        Objects.equals(this.baseType, place.baseType) &&
-        Objects.equals(this.schemaLocation, place.schemaLocation) &&
-        Objects.equals(this.type, place.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Place {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Price.java b/src/main/java/org/etsi/osl/tmf/po622/model/Price.java
deleted file mode 100644
index e1c950d7cbaa6eebc0234078bbe7542faf8a3605..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Price.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Provides all amounts (tax included, duty free, tax rate), used currency and percentage to apply for Price Alteration.
- */
-@Schema(description = "Provides all amounts (tax included, duty free, tax rate), used currency and percentage to apply for Price Alteration.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Price   {
-  @JsonProperty("percentage")
-  private Float percentage = null;
-
-  @JsonProperty("taxRate")
-  private Float taxRate = null;
-
-  @JsonProperty("dutyFreeAmount")
-  private Money dutyFreeAmount = null;
-
-  @JsonProperty("taxIncludedAmount")
-  private Money taxIncludedAmount = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Price percentage(Float percentage) {
-    this.percentage = percentage;
-    return this;
-  }
-
-  /**
-   * Percentage to apply for ProdOfferPriceAlteration
-   * @return percentage
-  **/
-  @Schema(description = "Percentage to apply for ProdOfferPriceAlteration")
-  
-    public Float getPercentage() {
-    return percentage;
-  }
-
-  public void setPercentage(Float percentage) {
-    this.percentage = percentage;
-  }
-
-  public Price taxRate(Float taxRate) {
-    this.taxRate = taxRate;
-    return this;
-  }
-
-  /**
-   * Tax rate
-   * @return taxRate
-  **/
-  @Schema(description = "Tax rate")
-  
-    public Float getTaxRate() {
-    return taxRate;
-  }
-
-  public void setTaxRate(Float taxRate) {
-    this.taxRate = taxRate;
-  }
-
-  public Price dutyFreeAmount(Money dutyFreeAmount) {
-    this.dutyFreeAmount = dutyFreeAmount;
-    return this;
-  }
-
-  /**
-   * Get dutyFreeAmount
-   * @return dutyFreeAmount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Money getDutyFreeAmount() {
-    return dutyFreeAmount;
-  }
-
-  public void setDutyFreeAmount(Money dutyFreeAmount) {
-    this.dutyFreeAmount = dutyFreeAmount;
-  }
-
-  public Price taxIncludedAmount(Money taxIncludedAmount) {
-    this.taxIncludedAmount = taxIncludedAmount;
-    return this;
-  }
-
-  /**
-   * Get taxIncludedAmount
-   * @return taxIncludedAmount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Money getTaxIncludedAmount() {
-    return taxIncludedAmount;
-  }
-
-  public void setTaxIncludedAmount(Money taxIncludedAmount) {
-    this.taxIncludedAmount = taxIncludedAmount;
-  }
-
-  public Price baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Price schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Price type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Price price = (Price) o;
-    return Objects.equals(this.percentage, price.percentage) &&
-        Objects.equals(this.taxRate, price.taxRate) &&
-        Objects.equals(this.dutyFreeAmount, price.dutyFreeAmount) &&
-        Objects.equals(this.taxIncludedAmount, price.taxIncludedAmount) &&
-        Objects.equals(this.baseType, price.baseType) &&
-        Objects.equals(this.schemaLocation, price.schemaLocation) &&
-        Objects.equals(this.type, price.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(percentage, taxRate, dutyFreeAmount, taxIncludedAmount, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Price {\n");
-    
-    sb.append("    percentage: ").append(toIndentedString(percentage)).append("\n");
-    sb.append("    taxRate: ").append(toIndentedString(taxRate)).append("\n");
-    sb.append("    dutyFreeAmount: ").append(toIndentedString(dutyFreeAmount)).append("\n");
-    sb.append("    taxIncludedAmount: ").append(toIndentedString(taxIncludedAmount)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/PriceAlteration.java b/src/main/java/org/etsi/osl/tmf/po622/model/PriceAlteration.java
deleted file mode 100644
index 5efe9e755634b6d00bca3967c6ceb0d023b74e86..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/PriceAlteration.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Is an amount, usually of money, that modifies the price charged for an order item.
- */
-@Schema(description = "Is an amount, usually of money, that modifies the price charged for an order item.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class PriceAlteration   {
-  @JsonProperty("applicationDuration")
-  private Integer applicationDuration = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("priceType")
-  private String priceType = null;
-
-  @JsonProperty("priority")
-  private Integer priority = null;
-
-  @JsonProperty("recurringChargePeriod")
-  private String recurringChargePeriod = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("price")
-  private Price price = null;
-
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPriceRef productOfferingPrice = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PriceAlteration applicationDuration(Integer applicationDuration) {
-    this.applicationDuration = applicationDuration;
-    return this;
-  }
-
-  /**
-   * Duration during which the alteration applies on the order item price (for instance 2 months free of charge for the recurring charge)
-   * @return applicationDuration
-  **/
-  @Schema(description = "Duration during which the alteration applies on the order item price (for instance 2 months free of charge for the recurring charge)")
-  
-    public Integer getApplicationDuration() {
-    return applicationDuration;
-  }
-
-  public void setApplicationDuration(Integer applicationDuration) {
-    this.applicationDuration = applicationDuration;
-  }
-
-  public PriceAlteration description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail the semantics of this order item price alteration
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail the semantics of this order item price alteration")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PriceAlteration name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the order item price alteration
-   * @return name
-  **/
-  @Schema(description = "Name of the order item price alteration")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PriceAlteration priceType(String priceType) {
-    this.priceType = priceType;
-    return this;
-  }
-
-  /**
-   * A category that describes the price such as recurring, one time and usage.
-   * @return priceType
-  **/
-  @Schema(description = "A category that describes the price such as recurring, one time and usage.")
-      @NotNull
-
-    public String getPriceType() {
-    return priceType;
-  }
-
-  public void setPriceType(String priceType) {
-    this.priceType = priceType;
-  }
-
-  public PriceAlteration priority(Integer priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * Priority level for applying this alteration among all the defined alterations on the order item price
-   * @return priority
-  **/
-  @Schema(description = "Priority level for applying this alteration among all the defined alterations on the order item price")
-  
-    public Integer getPriority() {
-    return priority;
-  }
-
-  public void setPriority(Integer priority) {
-    this.priority = priority;
-  }
-
-  public PriceAlteration recurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-    return this;
-  }
-
-  /**
-   * Could be month, week...
-   * @return recurringChargePeriod
-  **/
-  @Schema(description = "Could be month, week...")
-  
-    public String getRecurringChargePeriod() {
-    return recurringChargePeriod;
-  }
-
-  public void setRecurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-  }
-
-  public PriceAlteration unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * Could be minutes, GB...
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "Could be minutes, GB...")
-  
-    public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public PriceAlteration price(Price price) {
-    this.price = price;
-    return this;
-  }
-
-  /**
-   * Get price
-   * @return price
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public Price getPrice() {
-    return price;
-  }
-
-  public void setPrice(Price price) {
-    this.price = price;
-  }
-
-  public PriceAlteration productOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * Get productOfferingPrice
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingPriceRef getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-  public PriceAlteration baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PriceAlteration schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PriceAlteration type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PriceAlteration priceAlteration = (PriceAlteration) o;
-    return Objects.equals(this.applicationDuration, priceAlteration.applicationDuration) &&
-        Objects.equals(this.description, priceAlteration.description) &&
-        Objects.equals(this.name, priceAlteration.name) &&
-        Objects.equals(this.priceType, priceAlteration.priceType) &&
-        Objects.equals(this.priority, priceAlteration.priority) &&
-        Objects.equals(this.recurringChargePeriod, priceAlteration.recurringChargePeriod) &&
-        Objects.equals(this.unitOfMeasure, priceAlteration.unitOfMeasure) &&
-        Objects.equals(this.price, priceAlteration.price) &&
-        Objects.equals(this.productOfferingPrice, priceAlteration.productOfferingPrice) &&
-        Objects.equals(this.baseType, priceAlteration.baseType) &&
-        Objects.equals(this.schemaLocation, priceAlteration.schemaLocation) &&
-        Objects.equals(this.type, priceAlteration.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(applicationDuration, description, name, priceType, priority, recurringChargePeriod, unitOfMeasure, price, productOfferingPrice, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PriceAlteration {\n");
-    
-    sb.append("    applicationDuration: ").append(toIndentedString(applicationDuration)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    recurringChargePeriod: ").append(toIndentedString(recurringChargePeriod)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    price: ").append(toIndentedString(price)).append("\n");
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/Product.java b/src/main/java/org/etsi/osl/tmf/po622/model/Product.java
deleted file mode 100644
index ee4c02bd2fe8e7b724a442d82d235c4929d458a0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/Product.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A product offering procured by a customer or other interested party playing a party role. A product is realized as one or more service(s) and / or resource(s).
- */
-@Schema(description = "A product offering procured by a customer or other interested party playing a party role. A product is realized as one or more service(s) and / or resource(s).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class Product   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("isBundle")
-  private Boolean isBundle = null;
-
-  @JsonProperty("isCustomerVisible")
-  private Boolean isCustomerVisible = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("orderDate")
-  private OffsetDateTime orderDate = null;
-
-  @JsonProperty("productSerialNumber")
-  private String productSerialNumber = null;
-
-  @JsonProperty("startDate")
-  private OffsetDateTime startDate = null;
-
-  @JsonProperty("terminationDate")
-  private OffsetDateTime terminationDate = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementItemRef> agreement = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("place")
-  @Valid
-  private List<RelatedPlaceRefOrValue> place = null;
-
-  @JsonProperty("product")
-  @Valid
-  private List<ProductRefOrValue> product = null;
-
-  @JsonProperty("productCharacteristic")
-  @Valid
-  private List<Characteristic> productCharacteristic = null;
-
-  @JsonProperty("productOffering")
-  private ProductOfferingRef productOffering = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<RelatedProductOrderItem> productOrderItem = null;
-
-  @JsonProperty("productPrice")
-  @Valid
-  private List<ProductPrice> productPrice = null;
-
-  @JsonProperty("productRelationship")
-  @Valid
-  private List<ProductRelationship> productRelationship = null;
-
-  @JsonProperty("productSpecification")
-  private ProductSpecificationRef productSpecification = null;
-
-  @JsonProperty("productTerm")
-  @Valid
-  private List<ProductTerm> productTerm = null;
-
-  @JsonProperty("realizingResource")
-  @Valid
-  private List<ResourceRef> realizingResource = null;
-
-  @JsonProperty("realizingService")
-  @Valid
-  private List<ServiceRef> realizingService = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("status")
-  private ProductStatusType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Product id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the product
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the product")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Product href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the product
-   * @return href
-  **/
-  @Schema(description = "Reference of the product")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Product description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Is the description of the product. It could be copied from the description of the Product Offering.
-   * @return description
-  **/
-  @Schema(description = "Is the description of the product. It could be copied from the description of the Product Offering.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public Product isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * If true, the product is a ProductBundle which is an instantiation of a BundledProductOffering. If false, the product is a ProductComponent which is an instantiation of a SimpleProductOffering.
-   * @return isBundle
-  **/
-  @Schema(description = "If true, the product is a ProductBundle which is an instantiation of a BundledProductOffering. If false, the product is a ProductComponent which is an instantiation of a SimpleProductOffering.")
-  
-    public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public Product isCustomerVisible(Boolean isCustomerVisible) {
-    this.isCustomerVisible = isCustomerVisible;
-    return this;
-  }
-
-  /**
-   * If true, the product is visible by the customer.
-   * @return isCustomerVisible
-  **/
-  @Schema(description = "If true, the product is visible by the customer.")
-  
-    public Boolean isIsCustomerVisible() {
-    return isCustomerVisible;
-  }
-
-  public void setIsCustomerVisible(Boolean isCustomerVisible) {
-    this.isCustomerVisible = isCustomerVisible;
-  }
-
-  public Product name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the product. It could be the same as the name of the product offering
-   * @return name
-  **/
-  @Schema(description = "Name of the product. It could be the same as the name of the product offering")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Product orderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-    return this;
-  }
-
-  /**
-   * Is the date when the product was ordered
-   * @return orderDate
-  **/
-  @Schema(description = "Is the date when the product was ordered")
-  
-    @Valid
-    public OffsetDateTime getOrderDate() {
-    return orderDate;
-  }
-
-  public void setOrderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-  }
-
-  public Product productSerialNumber(String productSerialNumber) {
-    this.productSerialNumber = productSerialNumber;
-    return this;
-  }
-
-  /**
-   * Is the serial number for the product. This is typically applicable to tangible products e.g. Broadband Router.
-   * @return productSerialNumber
-  **/
-  @Schema(description = "Is the serial number for the product. This is typically applicable to tangible products e.g. Broadband Router.")
-  
-    public String getProductSerialNumber() {
-    return productSerialNumber;
-  }
-
-  public void setProductSerialNumber(String productSerialNumber) {
-    this.productSerialNumber = productSerialNumber;
-  }
-
-  public Product startDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-    return this;
-  }
-
-  /**
-   * Is the date from which the product starts
-   * @return startDate
-  **/
-  @Schema(description = "Is the date from which the product starts")
-  
-    @Valid
-    public OffsetDateTime getStartDate() {
-    return startDate;
-  }
-
-  public void setStartDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-  }
-
-  public Product terminationDate(OffsetDateTime terminationDate) {
-    this.terminationDate = terminationDate;
-    return this;
-  }
-
-  /**
-   * Is the date when the product was terminated
-   * @return terminationDate
-  **/
-  @Schema(description = "Is the date when the product was terminated")
-  
-    @Valid
-    public OffsetDateTime getTerminationDate() {
-    return terminationDate;
-  }
-
-  public void setTerminationDate(OffsetDateTime terminationDate) {
-    this.terminationDate = terminationDate;
-  }
-
-  public Product agreement(List<AgreementItemRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public Product addAgreementItem(AgreementItemRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<AgreementItemRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementItemRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public Product billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public Product place(List<RelatedPlaceRefOrValue> place) {
-    this.place = place;
-    return this;
-  }
-
-  public Product addPlaceItem(RelatedPlaceRefOrValue placeItem) {
-    if (this.place == null) {
-      this.place = new ArrayList<>();
-    }
-    this.place.add(placeItem);
-    return this;
-  }
-
-  /**
-   * Get place
-   * @return place
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedPlaceRefOrValue> getPlace() {
-    return place;
-  }
-
-  public void setPlace(List<RelatedPlaceRefOrValue> place) {
-    this.place = place;
-  }
-
-  public Product product(List<ProductRefOrValue> product) {
-    this.product = product;
-    return this;
-  }
-
-  public Product addProductItem(ProductRefOrValue productItem) {
-    if (this.product == null) {
-      this.product = new ArrayList<>();
-    }
-    this.product.add(productItem);
-    return this;
-  }
-
-  /**
-   * Get product
-   * @return product
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductRefOrValue> getProduct() {
-    return product;
-  }
-
-  public void setProduct(List<ProductRefOrValue> product) {
-    this.product = product;
-  }
-
-  public Product productCharacteristic(List<Characteristic> productCharacteristic) {
-    this.productCharacteristic = productCharacteristic;
-    return this;
-  }
-
-  public Product addProductCharacteristicItem(Characteristic productCharacteristicItem) {
-    if (this.productCharacteristic == null) {
-      this.productCharacteristic = new ArrayList<>();
-    }
-    this.productCharacteristic.add(productCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get productCharacteristic
-   * @return productCharacteristic
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Characteristic> getProductCharacteristic() {
-    return productCharacteristic;
-  }
-
-  public void setProductCharacteristic(List<Characteristic> productCharacteristic) {
-    this.productCharacteristic = productCharacteristic;
-  }
-
-  public Product productOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * Get productOffering
-   * @return productOffering
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingRef getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-  }
-
-  public Product productOrderItem(List<RelatedProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public Product addProductOrderItemItem(RelatedProductOrderItem productOrderItemItem) {
-    if (this.productOrderItem == null) {
-      this.productOrderItem = new ArrayList<>();
-    }
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<RelatedProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public Product productPrice(List<ProductPrice> productPrice) {
-    this.productPrice = productPrice;
-    return this;
-  }
-
-  public Product addProductPriceItem(ProductPrice productPriceItem) {
-    if (this.productPrice == null) {
-      this.productPrice = new ArrayList<>();
-    }
-    this.productPrice.add(productPriceItem);
-    return this;
-  }
-
-  /**
-   * Get productPrice
-   * @return productPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductPrice> getProductPrice() {
-    return productPrice;
-  }
-
-  public void setProductPrice(List<ProductPrice> productPrice) {
-    this.productPrice = productPrice;
-  }
-
-  public Product productRelationship(List<ProductRelationship> productRelationship) {
-    this.productRelationship = productRelationship;
-    return this;
-  }
-
-  public Product addProductRelationshipItem(ProductRelationship productRelationshipItem) {
-    if (this.productRelationship == null) {
-      this.productRelationship = new ArrayList<>();
-    }
-    this.productRelationship.add(productRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get productRelationship
-   * @return productRelationship
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductRelationship> getProductRelationship() {
-    return productRelationship;
-  }
-
-  public void setProductRelationship(List<ProductRelationship> productRelationship) {
-    this.productRelationship = productRelationship;
-  }
-
-  public Product productSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-    return this;
-  }
-
-  /**
-   * Get productSpecification
-   * @return productSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductSpecificationRef getProductSpecification() {
-    return productSpecification;
-  }
-
-  public void setProductSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-  }
-
-  public Product productTerm(List<ProductTerm> productTerm) {
-    this.productTerm = productTerm;
-    return this;
-  }
-
-  public Product addProductTermItem(ProductTerm productTermItem) {
-    if (this.productTerm == null) {
-      this.productTerm = new ArrayList<>();
-    }
-    this.productTerm.add(productTermItem);
-    return this;
-  }
-
-  /**
-   * Get productTerm
-   * @return productTerm
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductTerm> getProductTerm() {
-    return productTerm;
-  }
-
-  public void setProductTerm(List<ProductTerm> productTerm) {
-    this.productTerm = productTerm;
-  }
-
-  public Product realizingResource(List<ResourceRef> realizingResource) {
-    this.realizingResource = realizingResource;
-    return this;
-  }
-
-  public Product addRealizingResourceItem(ResourceRef realizingResourceItem) {
-    if (this.realizingResource == null) {
-      this.realizingResource = new ArrayList<>();
-    }
-    this.realizingResource.add(realizingResourceItem);
-    return this;
-  }
-
-  /**
-   * Get realizingResource
-   * @return realizingResource
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ResourceRef> getRealizingResource() {
-    return realizingResource;
-  }
-
-  public void setRealizingResource(List<ResourceRef> realizingResource) {
-    this.realizingResource = realizingResource;
-  }
-
-  public Product realizingService(List<ServiceRef> realizingService) {
-    this.realizingService = realizingService;
-    return this;
-  }
-
-  public Product addRealizingServiceItem(ServiceRef realizingServiceItem) {
-    if (this.realizingService == null) {
-      this.realizingService = new ArrayList<>();
-    }
-    this.realizingService.add(realizingServiceItem);
-    return this;
-  }
-
-  /**
-   * Get realizingService
-   * @return realizingService
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ServiceRef> getRealizingService() {
-    return realizingService;
-  }
-
-  public void setRealizingService(List<ServiceRef> realizingService) {
-    this.realizingService = realizingService;
-  }
-
-  public Product relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public Product addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public Product status(ProductStatusType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductStatusType getStatus() {
-    return status;
-  }
-
-  public void setStatus(ProductStatusType status) {
-    this.status = status;
-  }
-
-  public Product baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Product schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Product type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Product product = (Product) o;
-    return Objects.equals(this.id, product.id) &&
-        Objects.equals(this.href, product.href) &&
-        Objects.equals(this.description, product.description) &&
-        Objects.equals(this.isBundle, product.isBundle) &&
-        Objects.equals(this.isCustomerVisible, product.isCustomerVisible) &&
-        Objects.equals(this.name, product.name) &&
-        Objects.equals(this.orderDate, product.orderDate) &&
-        Objects.equals(this.productSerialNumber, product.productSerialNumber) &&
-        Objects.equals(this.startDate, product.startDate) &&
-        Objects.equals(this.terminationDate, product.terminationDate) &&
-        Objects.equals(this.agreement, product.agreement) &&
-        Objects.equals(this.billingAccount, product.billingAccount) &&
-        Objects.equals(this.place, product.place) &&
-        Objects.equals(this.product, product.product) &&
-        Objects.equals(this.productCharacteristic, product.productCharacteristic) &&
-        Objects.equals(this.productOffering, product.productOffering) &&
-        Objects.equals(this.productOrderItem, product.productOrderItem) &&
-        Objects.equals(this.productPrice, product.productPrice) &&
-        Objects.equals(this.productRelationship, product.productRelationship) &&
-        Objects.equals(this.productSpecification, product.productSpecification) &&
-        Objects.equals(this.productTerm, product.productTerm) &&
-        Objects.equals(this.realizingResource, product.realizingResource) &&
-        Objects.equals(this.realizingService, product.realizingService) &&
-        Objects.equals(this.relatedParty, product.relatedParty) &&
-        Objects.equals(this.status, product.status) &&
-        Objects.equals(this.baseType, product.baseType) &&
-        Objects.equals(this.schemaLocation, product.schemaLocation) &&
-        Objects.equals(this.type, product.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, isBundle, isCustomerVisible, name, orderDate, productSerialNumber, startDate, terminationDate, agreement, billingAccount, place, product, productCharacteristic, productOffering, productOrderItem, productPrice, productRelationship, productSpecification, productTerm, realizingResource, realizingService, relatedParty, status, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Product {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    isCustomerVisible: ").append(toIndentedString(isCustomerVisible)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-    sb.append("    productSerialNumber: ").append(toIndentedString(productSerialNumber)).append("\n");
-    sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-    sb.append("    terminationDate: ").append(toIndentedString(terminationDate)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    product: ").append(toIndentedString(product)).append("\n");
-    sb.append("    productCharacteristic: ").append(toIndentedString(productCharacteristic)).append("\n");
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    productPrice: ").append(toIndentedString(productPrice)).append("\n");
-    sb.append("    productRelationship: ").append(toIndentedString(productRelationship)).append("\n");
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("    productTerm: ").append(toIndentedString(productTerm)).append("\n");
-    sb.append("    realizingResource: ").append(toIndentedString(realizingResource)).append("\n");
-    sb.append("    realizingService: ").append(toIndentedString(realizingService)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingPriceRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingPriceRef.java
deleted file mode 100644
index 25224fb75af1356ddd1477b5336339fa821c7445..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingPriceRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductPriceOffering reference. An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased
- */
-@Schema(description = "ProductPriceOffering reference. An amount, usually of money, that is asked for or allowed when a ProductOffering is bought, rented, or leased")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOfferingPriceRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOfferingPriceRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingPriceRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingPriceRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingPriceRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingPriceRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingPriceRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductOfferingPriceRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingPriceRef productOfferingPriceRef = (ProductOfferingPriceRef) o;
-    return Objects.equals(this.id, productOfferingPriceRef.id) &&
-        Objects.equals(this.href, productOfferingPriceRef.href) &&
-        Objects.equals(this.name, productOfferingPriceRef.name) &&
-        Objects.equals(this.baseType, productOfferingPriceRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingPriceRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingPriceRef.type) &&
-        Objects.equals(this._atReferredType, productOfferingPriceRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingPriceRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationItemRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationItemRef.java
deleted file mode 100644
index 1c3b20cac3b027f15c73d87ceee921a127eb076c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationItemRef.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * It&#x27;s a productOfferingQualification item that has been executed previously.
- */
-@Schema(description = "It's a productOfferingQualification item that has been executed previously.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOfferingQualificationItemRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("productOfferingQualificationHref")
-  private String productOfferingQualificationHref = null;
-
-  @JsonProperty("productOfferingQualificationId")
-  private String productOfferingQualificationId = null;
-
-  @JsonProperty("productOfferingQualificationName")
-  private String productOfferingQualificationName = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOfferingQualificationItemRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of an item of a product offering qualification
-   * @return id
-  **/
-  @Schema(description = "Id of an item of a product offering qualification")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingQualificationItemRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingQualificationItemRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingQualificationItemRef productOfferingQualificationHref(String productOfferingQualificationHref) {
-    this.productOfferingQualificationHref = productOfferingQualificationHref;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return productOfferingQualificationHref
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getProductOfferingQualificationHref() {
-    return productOfferingQualificationHref;
-  }
-
-  public void setProductOfferingQualificationHref(String productOfferingQualificationHref) {
-    this.productOfferingQualificationHref = productOfferingQualificationHref;
-  }
-
-  public ProductOfferingQualificationItemRef productOfferingQualificationId(String productOfferingQualificationId) {
-    this.productOfferingQualificationId = productOfferingQualificationId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return productOfferingQualificationId
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getProductOfferingQualificationId() {
-    return productOfferingQualificationId;
-  }
-
-  public void setProductOfferingQualificationId(String productOfferingQualificationId) {
-    this.productOfferingQualificationId = productOfferingQualificationId;
-  }
-
-  public ProductOfferingQualificationItemRef productOfferingQualificationName(String productOfferingQualificationName) {
-    this.productOfferingQualificationName = productOfferingQualificationName;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return productOfferingQualificationName
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getProductOfferingQualificationName() {
-    return productOfferingQualificationName;
-  }
-
-  public void setProductOfferingQualificationName(String productOfferingQualificationName) {
-    this.productOfferingQualificationName = productOfferingQualificationName;
-  }
-
-  public ProductOfferingQualificationItemRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingQualificationItemRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingQualificationItemRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductOfferingQualificationItemRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingQualificationItemRef productOfferingQualificationItemRef = (ProductOfferingQualificationItemRef) o;
-    return Objects.equals(this.id, productOfferingQualificationItemRef.id) &&
-        Objects.equals(this.href, productOfferingQualificationItemRef.href) &&
-        Objects.equals(this.name, productOfferingQualificationItemRef.name) &&
-        Objects.equals(this.productOfferingQualificationHref, productOfferingQualificationItemRef.productOfferingQualificationHref) &&
-        Objects.equals(this.productOfferingQualificationId, productOfferingQualificationItemRef.productOfferingQualificationId) &&
-        Objects.equals(this.productOfferingQualificationName, productOfferingQualificationItemRef.productOfferingQualificationName) &&
-        Objects.equals(this.baseType, productOfferingQualificationItemRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingQualificationItemRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingQualificationItemRef.type) &&
-        Objects.equals(this._atReferredType, productOfferingQualificationItemRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, productOfferingQualificationHref, productOfferingQualificationId, productOfferingQualificationName, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingQualificationItemRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    productOfferingQualificationHref: ").append(toIndentedString(productOfferingQualificationHref)).append("\n");
-    sb.append("    productOfferingQualificationId: ").append(toIndentedString(productOfferingQualificationId)).append("\n");
-    sb.append("    productOfferingQualificationName: ").append(toIndentedString(productOfferingQualificationName)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationRef.java
deleted file mode 100644
index ed7f58a5c7aa7b4282f347aad139ba90fb1a2340..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingQualificationRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * It&#x27;s a productOfferingQualification that has been executed previously
- */
-@Schema(description = "It's a productOfferingQualification that has been executed previously")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOfferingQualificationRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOfferingQualificationRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingQualificationRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingQualificationRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingQualificationRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingQualificationRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingQualificationRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductOfferingQualificationRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingQualificationRef productOfferingQualificationRef = (ProductOfferingQualificationRef) o;
-    return Objects.equals(this.id, productOfferingQualificationRef.id) &&
-        Objects.equals(this.href, productOfferingQualificationRef.href) &&
-        Objects.equals(this.name, productOfferingQualificationRef.name) &&
-        Objects.equals(this.baseType, productOfferingQualificationRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingQualificationRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingQualificationRef.type) &&
-        Objects.equals(this._atReferredType, productOfferingQualificationRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingQualificationRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingRef.java
deleted file mode 100644
index f18eb0729c49f94f98f189cb8a2581994518bf2f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOfferingRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.
- */
-@Schema(description = "ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOfferingRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOfferingRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOfferingRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOfferingRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOfferingRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductOfferingRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingRef productOfferingRef = (ProductOfferingRef) o;
-    return Objects.equals(this.id, productOfferingRef.id) &&
-        Objects.equals(this.href, productOfferingRef.href) &&
-        Objects.equals(this.name, productOfferingRef.name) &&
-        Objects.equals(this.baseType, productOfferingRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOfferingRef.schemaLocation) &&
-        Objects.equals(this.type, productOfferingRef.type) &&
-        Objects.equals(this._atReferredType, productOfferingRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrder.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrder.java
deleted file mode 100644
index b8a7a3848a6ed03409dbf75894c338c388a322d8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrder.java
+++ /dev/null
@@ -1,838 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa,
- */
-@Schema(description = "A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa,")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrder   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("cancellationDate")
-  private OffsetDateTime cancellationDate = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("category")
-  private String category = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("expectedCompletionDate")
-  private OffsetDateTime expectedCompletionDate = null;
-
-  @JsonProperty("externalId")
-  private String externalId = null;
-
-  @JsonProperty("notificationContact")
-  private String notificationContact = null;
-
-  @JsonProperty("orderDate")
-  private OffsetDateTime orderDate = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("requestedCompletionDate")
-  private OffsetDateTime requestedCompletionDate = null;
-
-  @JsonProperty("requestedStartDate")
-  private OffsetDateTime requestedStartDate = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("channel")
-  @Valid
-  private List<RelatedChannel> channel = null;
-
-  @JsonProperty("note")
-  @Valid
-  private List<Note> note = null;
-
-  @JsonProperty("orderTotalPrice")
-  @Valid
-  private List<OrderPrice> orderTotalPrice = null;
-
-  @JsonProperty("payment")
-  @Valid
-  private List<PaymentRef> payment = null;
-
-  @JsonProperty("productOfferingQualification")
-  @Valid
-  private List<ProductOfferingQualificationRef> productOfferingQualification = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<ProductOrderItem> productOrderItem = new ArrayList<>();
-
-  @JsonProperty("quote")
-  @Valid
-  private List<QuoteRef> quote = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("state")
-  private ProductOrderStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductOrder id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * ID created on repository side (OM system)
-   * @return id
-  **/
-  @Schema(description = "ID created on repository side (OM system)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrder href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the order
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the order")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOrder cancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled. This is used when order is cancelled. ")
-  
-    @Valid
-    public OffsetDateTime getCancellationDate() {
-    return cancellationDate;
-  }
-
-  public void setCancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-  }
-
-  public ProductOrder cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled. This is used when order is cancelled. ")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public ProductOrder category(String category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)
-   * @return category
-  **/
-  @Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)")
-  
-    public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public ProductOrder completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date when the order was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date when the order was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ProductOrder description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the product order
-   * @return description
-  **/
-  @Schema(description = "Description of the product order")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrder expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Expected delivery date amended by the provider
-   * @return expectedCompletionDate
-  **/
-  @Schema(description = "Expected delivery date amended by the provider")
-  
-    @Valid
-    public OffsetDateTime getExpectedCompletionDate() {
-    return expectedCompletionDate;
-  }
-
-  public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-  }
-
-  public ProductOrder externalId(String externalId) {
-    this.externalId = externalId;
-    return this;
-  }
-
-  /**
-   * ID given by the consumer and only understandable by him (to facilitate his searches afterwards)
-   * @return externalId
-  **/
-  @Schema(description = "ID given by the consumer and only understandable by him (to facilitate his searches afterwards)")
-  
-    public String getExternalId() {
-    return externalId;
-  }
-
-  public void setExternalId(String externalId) {
-    this.externalId = externalId;
-  }
-
-  public ProductOrder notificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-    return this;
-  }
-
-  /**
-   * Contact attached to the order to send back information regarding this order
-   * @return notificationContact
-  **/
-  @Schema(description = "Contact attached to the order to send back information regarding this order")
-  
-    public String getNotificationContact() {
-    return notificationContact;
-  }
-
-  public void setNotificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-  }
-
-  public ProductOrder orderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-    return this;
-  }
-
-  /**
-   * Date when the order was created
-   * @return orderDate
-  **/
-  @Schema(description = "Date when the order was created")
-  
-    @Valid
-    public OffsetDateTime getOrderDate() {
-    return orderDate;
-  }
-
-  public void setOrderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-  }
-
-  public ProductOrder priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)
-   * @return priority
-  **/
-  @Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrder requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Requested delivery date from the requestor perspective
-   * @return requestedCompletionDate
-  **/
-  @Schema(description = "Requested delivery date from the requestor perspective")
-  
-    @Valid
-    public OffsetDateTime getRequestedCompletionDate() {
-    return requestedCompletionDate;
-  }
-
-  public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-  }
-
-  public ProductOrder requestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-    return this;
-  }
-
-  /**
-   * Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. 
-   * @return requestedStartDate
-  **/
-  @Schema(description = "Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. ")
-  
-    @Valid
-    public OffsetDateTime getRequestedStartDate() {
-    return requestedStartDate;
-  }
-
-  public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-  }
-
-  public ProductOrder agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public ProductOrder addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * A reference to an agreement defined in the context of the product order
-   * @return agreement
-  **/
-  @Schema(description = "A reference to an agreement defined in the context of the product order")
-      @Valid
-    public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public ProductOrder billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductOrder channel(List<RelatedChannel> channel) {
-    this.channel = channel;
-    return this;
-  }
-
-  public ProductOrder addChannelItem(RelatedChannel channelItem) {
-    if (this.channel == null) {
-      this.channel = new ArrayList<>();
-    }
-    this.channel.add(channelItem);
-    return this;
-  }
-
-  /**
-   * Get channel
-   * @return channel
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedChannel> getChannel() {
-    return channel;
-  }
-
-  public void setChannel(List<RelatedChannel> channel) {
-    this.channel = channel;
-  }
-
-  public ProductOrder note(List<Note> note) {
-    this.note = note;
-    return this;
-  }
-
-  public ProductOrder addNoteItem(Note noteItem) {
-    if (this.note == null) {
-      this.note = new ArrayList<>();
-    }
-    this.note.add(noteItem);
-    return this;
-  }
-
-  /**
-   * Get note
-   * @return note
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Note> getNote() {
-    return note;
-  }
-
-  public void setNote(List<Note> note) {
-    this.note = note;
-  }
-
-  public ProductOrder orderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-    return this;
-  }
-
-  public ProductOrder addOrderTotalPriceItem(OrderPrice orderTotalPriceItem) {
-    if (this.orderTotalPrice == null) {
-      this.orderTotalPrice = new ArrayList<>();
-    }
-    this.orderTotalPrice.add(orderTotalPriceItem);
-    return this;
-  }
-
-  /**
-   * Get orderTotalPrice
-   * @return orderTotalPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderPrice> getOrderTotalPrice() {
-    return orderTotalPrice;
-  }
-
-  public void setOrderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-  }
-
-  public ProductOrder payment(List<PaymentRef> payment) {
-    this.payment = payment;
-    return this;
-  }
-
-  public ProductOrder addPaymentItem(PaymentRef paymentItem) {
-    if (this.payment == null) {
-      this.payment = new ArrayList<>();
-    }
-    this.payment.add(paymentItem);
-    return this;
-  }
-
-  /**
-   * Get payment
-   * @return payment
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<PaymentRef> getPayment() {
-    return payment;
-  }
-
-  public void setPayment(List<PaymentRef> payment) {
-    this.payment = payment;
-  }
-
-  public ProductOrder productOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-    return this;
-  }
-
-  public ProductOrder addProductOfferingQualificationItem(ProductOfferingQualificationRef productOfferingQualificationItem) {
-    if (this.productOfferingQualification == null) {
-      this.productOfferingQualification = new ArrayList<>();
-    }
-    this.productOfferingQualification.add(productOfferingQualificationItem);
-    return this;
-  }
-
-  /**
-   * Get productOfferingQualification
-   * @return productOfferingQualification
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductOfferingQualificationRef> getProductOfferingQualification() {
-    return productOfferingQualification;
-  }
-
-  public void setProductOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-  }
-
-  public ProductOrder productOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public ProductOrder addProductOrderItemItem(ProductOrderItem productOrderItemItem) {
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<ProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public ProductOrder quote(List<QuoteRef> quote) {
-    this.quote = quote;
-    return this;
-  }
-
-  public ProductOrder addQuoteItem(QuoteRef quoteItem) {
-    if (this.quote == null) {
-      this.quote = new ArrayList<>();
-    }
-    this.quote.add(quoteItem);
-    return this;
-  }
-
-  /**
-   * Get quote
-   * @return quote
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<QuoteRef> getQuote() {
-    return quote;
-  }
-
-  public void setQuote(List<QuoteRef> quote) {
-    this.quote = quote;
-  }
-
-  public ProductOrder relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ProductOrder addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ProductOrder state(ProductOrderStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderStateType getState() {
-    return state;
-  }
-
-  public void setState(ProductOrderStateType state) {
-    this.state = state;
-  }
-
-  public ProductOrder baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOrder schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOrder type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrder productOrder = (ProductOrder) o;
-    return Objects.equals(this.id, productOrder.id) &&
-        Objects.equals(this.href, productOrder.href) &&
-        Objects.equals(this.cancellationDate, productOrder.cancellationDate) &&
-        Objects.equals(this.cancellationReason, productOrder.cancellationReason) &&
-        Objects.equals(this.category, productOrder.category) &&
-        Objects.equals(this.completionDate, productOrder.completionDate) &&
-        Objects.equals(this.description, productOrder.description) &&
-        Objects.equals(this.expectedCompletionDate, productOrder.expectedCompletionDate) &&
-        Objects.equals(this.externalId, productOrder.externalId) &&
-        Objects.equals(this.notificationContact, productOrder.notificationContact) &&
-        Objects.equals(this.orderDate, productOrder.orderDate) &&
-        Objects.equals(this.priority, productOrder.priority) &&
-        Objects.equals(this.requestedCompletionDate, productOrder.requestedCompletionDate) &&
-        Objects.equals(this.requestedStartDate, productOrder.requestedStartDate) &&
-        Objects.equals(this.agreement, productOrder.agreement) &&
-        Objects.equals(this.billingAccount, productOrder.billingAccount) &&
-        Objects.equals(this.channel, productOrder.channel) &&
-        Objects.equals(this.note, productOrder.note) &&
-        Objects.equals(this.orderTotalPrice, productOrder.orderTotalPrice) &&
-        Objects.equals(this.payment, productOrder.payment) &&
-        Objects.equals(this.productOfferingQualification, productOrder.productOfferingQualification) &&
-        Objects.equals(this.productOrderItem, productOrder.productOrderItem) &&
-        Objects.equals(this.quote, productOrder.quote) &&
-        Objects.equals(this.relatedParty, productOrder.relatedParty) &&
-        Objects.equals(this.state, productOrder.state) &&
-        Objects.equals(this.baseType, productOrder.baseType) &&
-        Objects.equals(this.schemaLocation, productOrder.schemaLocation) &&
-        Objects.equals(this.type, productOrder.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, cancellationDate, cancellationReason, category, completionDate, description, expectedCompletionDate, externalId, notificationContact, orderDate, priority, requestedCompletionDate, requestedStartDate, agreement, billingAccount, channel, note, orderTotalPrice, payment, productOfferingQualification, productOrderItem, quote, relatedParty, state, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrder {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    cancellationDate: ").append(toIndentedString(cancellationDate)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-    sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-    sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-    sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-    sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    orderTotalPrice: ").append(toIndentedString(orderTotalPrice)).append("\n");
-    sb.append("    payment: ").append(toIndentedString(payment)).append("\n");
-    sb.append("    productOfferingQualification: ").append(toIndentedString(productOfferingQualification)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    quote: ").append(toIndentedString(quote)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEvent.java
deleted file mode 100644
index 84c8851a582b16709a0d522b01cbf2fdcdb8e641..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ProductOrderAttributeValueChangeEventPayload event = null;
-
-  public ProductOrderAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOrderAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOrderAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOrderAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOrderAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOrderAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOrderAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOrderAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ProductOrderAttributeValueChangeEvent event(ProductOrderAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOrderAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderAttributeValueChangeEvent productOrderAttributeValueChangeEvent = (ProductOrderAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, productOrderAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOrderAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOrderAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOrderAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOrderAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, productOrderAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, productOrderAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, productOrderAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOrderAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, productOrderAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, productOrderAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEventPayload.java
deleted file mode 100644
index 28ebc7cf0a8888fc49274f2baddcc24155d71e10..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderAttributeValueChangeEventPayload   {
-  @JsonProperty("productOrder")
-  private ProductOrder productOrder = null;
-
-  public ProductOrderAttributeValueChangeEventPayload productOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrder getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderAttributeValueChangeEventPayload productOrderAttributeValueChangeEventPayload = (ProductOrderAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.productOrder, productOrderAttributeValueChangeEventPayload.productOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreate.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreate.java
deleted file mode 100644
index 7da8d3d1b95b0772eff6aa965ef22305b6a10141..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreate.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa, Skipped properties: id,href,completionDate,orderDate,state,expectedCompletionDate,productOrderItem.state
- */
-@Schema(description = "A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa, Skipped properties: id,href,completionDate,orderDate,state,expectedCompletionDate,productOrderItem.state")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderCreate   {
-  @JsonProperty("cancellationDate")
-  private OffsetDateTime cancellationDate = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("category")
-  private String category = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("externalId")
-  private String externalId = null;
-
-  @JsonProperty("notificationContact")
-  private String notificationContact = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("requestedCompletionDate")
-  private OffsetDateTime requestedCompletionDate = null;
-
-  @JsonProperty("requestedStartDate")
-  private OffsetDateTime requestedStartDate = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("channel")
-  @Valid
-  private List<RelatedChannel> channel = null;
-
-  @JsonProperty("note")
-  @Valid
-  private List<Note> note = null;
-
-  @JsonProperty("orderTotalPrice")
-  @Valid
-  private List<OrderPrice> orderTotalPrice = null;
-
-  @JsonProperty("payment")
-  @Valid
-  private List<PaymentRef> payment = null;
-
-  @JsonProperty("productOfferingQualification")
-  @Valid
-  private List<ProductOfferingQualificationRef> productOfferingQualification = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<ProductOrderItem> productOrderItem = new ArrayList<>();
-
-  @JsonProperty("quote")
-  @Valid
-  private List<QuoteRef> quote = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductOrderCreate cancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled. This is used when order is cancelled. ")
-  
-    @Valid
-    public OffsetDateTime getCancellationDate() {
-    return cancellationDate;
-  }
-
-  public void setCancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-  }
-
-  public ProductOrderCreate cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled. This is used when order is cancelled. ")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public ProductOrderCreate category(String category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)
-   * @return category
-  **/
-  @Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)")
-  
-    public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public ProductOrderCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the product order
-   * @return description
-  **/
-  @Schema(description = "Description of the product order")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderCreate externalId(String externalId) {
-    this.externalId = externalId;
-    return this;
-  }
-
-  /**
-   * ID given by the consumer and only understandable by him (to facilitate his searches afterwards)
-   * @return externalId
-  **/
-  @Schema(description = "ID given by the consumer and only understandable by him (to facilitate his searches afterwards)")
-  
-    public String getExternalId() {
-    return externalId;
-  }
-
-  public void setExternalId(String externalId) {
-    this.externalId = externalId;
-  }
-
-  public ProductOrderCreate notificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-    return this;
-  }
-
-  /**
-   * Contact attached to the order to send back information regarding this order
-   * @return notificationContact
-  **/
-  @Schema(description = "Contact attached to the order to send back information regarding this order")
-  
-    public String getNotificationContact() {
-    return notificationContact;
-  }
-
-  public void setNotificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-  }
-
-  public ProductOrderCreate priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)
-   * @return priority
-  **/
-  @Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderCreate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Requested delivery date from the requestor perspective
-   * @return requestedCompletionDate
-  **/
-  @Schema(description = "Requested delivery date from the requestor perspective")
-  
-    @Valid
-    public OffsetDateTime getRequestedCompletionDate() {
-    return requestedCompletionDate;
-  }
-
-  public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-  }
-
-  public ProductOrderCreate requestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-    return this;
-  }
-
-  /**
-   * Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. 
-   * @return requestedStartDate
-  **/
-  @Schema(description = "Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. ")
-  
-    @Valid
-    public OffsetDateTime getRequestedStartDate() {
-    return requestedStartDate;
-  }
-
-  public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-  }
-
-  public ProductOrderCreate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public ProductOrderCreate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * A reference to an agreement defined in the context of the product order
-   * @return agreement
-  **/
-  @Schema(description = "A reference to an agreement defined in the context of the product order")
-      @Valid
-    public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public ProductOrderCreate billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductOrderCreate channel(List<RelatedChannel> channel) {
-    this.channel = channel;
-    return this;
-  }
-
-  public ProductOrderCreate addChannelItem(RelatedChannel channelItem) {
-    if (this.channel == null) {
-      this.channel = new ArrayList<>();
-    }
-    this.channel.add(channelItem);
-    return this;
-  }
-
-  /**
-   * Get channel
-   * @return channel
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedChannel> getChannel() {
-    return channel;
-  }
-
-  public void setChannel(List<RelatedChannel> channel) {
-    this.channel = channel;
-  }
-
-  public ProductOrderCreate note(List<Note> note) {
-    this.note = note;
-    return this;
-  }
-
-  public ProductOrderCreate addNoteItem(Note noteItem) {
-    if (this.note == null) {
-      this.note = new ArrayList<>();
-    }
-    this.note.add(noteItem);
-    return this;
-  }
-
-  /**
-   * Get note
-   * @return note
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Note> getNote() {
-    return note;
-  }
-
-  public void setNote(List<Note> note) {
-    this.note = note;
-  }
-
-  public ProductOrderCreate orderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-    return this;
-  }
-
-  public ProductOrderCreate addOrderTotalPriceItem(OrderPrice orderTotalPriceItem) {
-    if (this.orderTotalPrice == null) {
-      this.orderTotalPrice = new ArrayList<>();
-    }
-    this.orderTotalPrice.add(orderTotalPriceItem);
-    return this;
-  }
-
-  /**
-   * Get orderTotalPrice
-   * @return orderTotalPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderPrice> getOrderTotalPrice() {
-    return orderTotalPrice;
-  }
-
-  public void setOrderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-  }
-
-  public ProductOrderCreate payment(List<PaymentRef> payment) {
-    this.payment = payment;
-    return this;
-  }
-
-  public ProductOrderCreate addPaymentItem(PaymentRef paymentItem) {
-    if (this.payment == null) {
-      this.payment = new ArrayList<>();
-    }
-    this.payment.add(paymentItem);
-    return this;
-  }
-
-  /**
-   * Get payment
-   * @return payment
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<PaymentRef> getPayment() {
-    return payment;
-  }
-
-  public void setPayment(List<PaymentRef> payment) {
-    this.payment = payment;
-  }
-
-  public ProductOrderCreate productOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-    return this;
-  }
-
-  public ProductOrderCreate addProductOfferingQualificationItem(ProductOfferingQualificationRef productOfferingQualificationItem) {
-    if (this.productOfferingQualification == null) {
-      this.productOfferingQualification = new ArrayList<>();
-    }
-    this.productOfferingQualification.add(productOfferingQualificationItem);
-    return this;
-  }
-
-  /**
-   * Get productOfferingQualification
-   * @return productOfferingQualification
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductOfferingQualificationRef> getProductOfferingQualification() {
-    return productOfferingQualification;
-  }
-
-  public void setProductOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-  }
-
-  public ProductOrderCreate productOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public ProductOrderCreate addProductOrderItemItem(ProductOrderItem productOrderItemItem) {
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<ProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public ProductOrderCreate quote(List<QuoteRef> quote) {
-    this.quote = quote;
-    return this;
-  }
-
-  public ProductOrderCreate addQuoteItem(QuoteRef quoteItem) {
-    if (this.quote == null) {
-      this.quote = new ArrayList<>();
-    }
-    this.quote.add(quoteItem);
-    return this;
-  }
-
-  /**
-   * Get quote
-   * @return quote
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<QuoteRef> getQuote() {
-    return quote;
-  }
-
-  public void setQuote(List<QuoteRef> quote) {
-    this.quote = quote;
-  }
-
-  public ProductOrderCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ProductOrderCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ProductOrderCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOrderCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOrderCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderCreate productOrderCreate = (ProductOrderCreate) o;
-    return Objects.equals(this.cancellationDate, productOrderCreate.cancellationDate) &&
-        Objects.equals(this.cancellationReason, productOrderCreate.cancellationReason) &&
-        Objects.equals(this.category, productOrderCreate.category) &&
-        Objects.equals(this.description, productOrderCreate.description) &&
-        Objects.equals(this.externalId, productOrderCreate.externalId) &&
-        Objects.equals(this.notificationContact, productOrderCreate.notificationContact) &&
-        Objects.equals(this.priority, productOrderCreate.priority) &&
-        Objects.equals(this.requestedCompletionDate, productOrderCreate.requestedCompletionDate) &&
-        Objects.equals(this.requestedStartDate, productOrderCreate.requestedStartDate) &&
-        Objects.equals(this.agreement, productOrderCreate.agreement) &&
-        Objects.equals(this.billingAccount, productOrderCreate.billingAccount) &&
-        Objects.equals(this.channel, productOrderCreate.channel) &&
-        Objects.equals(this.note, productOrderCreate.note) &&
-        Objects.equals(this.orderTotalPrice, productOrderCreate.orderTotalPrice) &&
-        Objects.equals(this.payment, productOrderCreate.payment) &&
-        Objects.equals(this.productOfferingQualification, productOrderCreate.productOfferingQualification) &&
-        Objects.equals(this.productOrderItem, productOrderCreate.productOrderItem) &&
-        Objects.equals(this.quote, productOrderCreate.quote) &&
-        Objects.equals(this.relatedParty, productOrderCreate.relatedParty) &&
-        Objects.equals(this.baseType, productOrderCreate.baseType) &&
-        Objects.equals(this.schemaLocation, productOrderCreate.schemaLocation) &&
-        Objects.equals(this.type, productOrderCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancellationDate, cancellationReason, category, description, externalId, notificationContact, priority, requestedCompletionDate, requestedStartDate, agreement, billingAccount, channel, note, orderTotalPrice, payment, productOfferingQualification, productOrderItem, quote, relatedParty, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderCreate {\n");
-    
-    sb.append("    cancellationDate: ").append(toIndentedString(cancellationDate)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-    sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-    sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    orderTotalPrice: ").append(toIndentedString(orderTotalPrice)).append("\n");
-    sb.append("    payment: ").append(toIndentedString(payment)).append("\n");
-    sb.append("    productOfferingQualification: ").append(toIndentedString(productOfferingQualification)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    quote: ").append(toIndentedString(quote)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEvent.java
deleted file mode 100644
index 4bbbc94ec5f7bc3ba9aed107aec04832793ef214..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOrderCreateEventPayload event = null;
-
-  public ProductOrderCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrderCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOrderCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOrderCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOrderCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOrderCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOrderCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOrderCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOrderCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOrderCreateEvent event(ProductOrderCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOrderCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderCreateEvent productOrderCreateEvent = (ProductOrderCreateEvent) o;
-    return Objects.equals(this.id, productOrderCreateEvent.id) &&
-        Objects.equals(this.href, productOrderCreateEvent.href) &&
-        Objects.equals(this.eventId, productOrderCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, productOrderCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, productOrderCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, productOrderCreateEvent.correlationId) &&
-        Objects.equals(this.domain, productOrderCreateEvent.domain) &&
-        Objects.equals(this.title, productOrderCreateEvent.title) &&
-        Objects.equals(this.description, productOrderCreateEvent.description) &&
-        Objects.equals(this.priority, productOrderCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOrderCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, productOrderCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEventPayload.java
deleted file mode 100644
index f89b45db0ec823740a0bc988b02e50497b56bdc5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderCreateEventPayload   {
-  @JsonProperty("productOrder")
-  private ProductOrder productOrder = null;
-
-  public ProductOrderCreateEventPayload productOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrder getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderCreateEventPayload productOrderCreateEventPayload = (ProductOrderCreateEventPayload) o;
-    return Objects.equals(this.productOrder, productOrderCreateEventPayload.productOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderCreateEventPayload {\n");
-    
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEvent.java
deleted file mode 100644
index dd87d1c2594fba8e898da2403214a417ca8db98f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOrderDeleteEventPayload event = null;
-
-  public ProductOrderDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrderDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOrderDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOrderDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOrderDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOrderDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOrderDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOrderDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOrderDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOrderDeleteEvent event(ProductOrderDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOrderDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderDeleteEvent productOrderDeleteEvent = (ProductOrderDeleteEvent) o;
-    return Objects.equals(this.id, productOrderDeleteEvent.id) &&
-        Objects.equals(this.href, productOrderDeleteEvent.href) &&
-        Objects.equals(this.eventId, productOrderDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, productOrderDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, productOrderDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, productOrderDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, productOrderDeleteEvent.domain) &&
-        Objects.equals(this.title, productOrderDeleteEvent.title) &&
-        Objects.equals(this.description, productOrderDeleteEvent.description) &&
-        Objects.equals(this.priority, productOrderDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOrderDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, productOrderDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEventPayload.java
deleted file mode 100644
index 94de1d9401fe89347312f8f2c2dacf029dfcb130..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderDeleteEventPayload   {
-  @JsonProperty("productOrder")
-  private ProductOrder productOrder = null;
-
-  public ProductOrderDeleteEventPayload productOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrder getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderDeleteEventPayload productOrderDeleteEventPayload = (ProductOrderDeleteEventPayload) o;
-    return Objects.equals(this.productOrder, productOrderDeleteEventPayload.productOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderDeleteEventPayload {\n");
-    
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEvent.java
deleted file mode 100644
index 38a85af6c8b9818eea00504db1d7c9abaf391876..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderInformationRequiredEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ProductOrderInformationRequiredEventPayload event = null;
-
-  public ProductOrderInformationRequiredEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOrderInformationRequiredEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOrderInformationRequiredEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOrderInformationRequiredEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOrderInformationRequiredEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOrderInformationRequiredEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOrderInformationRequiredEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderInformationRequiredEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderInformationRequiredEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOrderInformationRequiredEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ProductOrderInformationRequiredEvent event(ProductOrderInformationRequiredEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderInformationRequiredEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOrderInformationRequiredEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderInformationRequiredEvent productOrderInformationRequiredEvent = (ProductOrderInformationRequiredEvent) o;
-    return Objects.equals(this.eventId, productOrderInformationRequiredEvent.eventId) &&
-        Objects.equals(this.eventTime, productOrderInformationRequiredEvent.eventTime) &&
-        Objects.equals(this.eventType, productOrderInformationRequiredEvent.eventType) &&
-        Objects.equals(this.correlationId, productOrderInformationRequiredEvent.correlationId) &&
-        Objects.equals(this.domain, productOrderInformationRequiredEvent.domain) &&
-        Objects.equals(this.title, productOrderInformationRequiredEvent.title) &&
-        Objects.equals(this.description, productOrderInformationRequiredEvent.description) &&
-        Objects.equals(this.priority, productOrderInformationRequiredEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOrderInformationRequiredEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, productOrderInformationRequiredEvent.fieldPath) &&
-        Objects.equals(this.event, productOrderInformationRequiredEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderInformationRequiredEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEventPayload.java
deleted file mode 100644
index 603295d4eb3468dba906c2eb5d27701a4f76da6e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderInformationRequiredEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderInformationRequiredEventPayload   {
-  @JsonProperty("productOrder")
-  private ProductOrder productOrder = null;
-
-  public ProductOrderInformationRequiredEventPayload productOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrder getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderInformationRequiredEventPayload productOrderInformationRequiredEventPayload = (ProductOrderInformationRequiredEventPayload) o;
-    return Objects.equals(this.productOrder, productOrderInformationRequiredEventPayload.productOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderInformationRequiredEventPayload {\n");
-    
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItem.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItem.java
deleted file mode 100644
index a2dcbb8d0562635acd83bc54fc289b228d4cb21b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItem.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An identified part of the order. A product order is decomposed into one or more order items.
- */
-@Schema(description = "An identified part of the order. A product order is decomposed into one or more order items.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderItem   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("quantity")
-  private Integer quantity = null;
-
-  @JsonProperty("action")
-  private OrderItemActionType action = null;
-
-  @JsonProperty("appointment")
-  private AppointmentRef appointment = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("itemPrice")
-  @Valid
-  private List<OrderPrice> itemPrice = null;
-
-  @JsonProperty("itemTerm")
-  @Valid
-  private List<OrderTerm> itemTerm = null;
-
-  @JsonProperty("itemTotalPrice")
-  @Valid
-  private List<OrderPrice> itemTotalPrice = null;
-
-  @JsonProperty("payment")
-  @Valid
-  private List<PaymentRef> payment = null;
-
-  @JsonProperty("product")
-  private ProductRefOrValue product = null;
-
-  @JsonProperty("productOffering")
-  private ProductOfferingRef productOffering = null;
-
-  @JsonProperty("productOfferingQualificationItem")
-  private ProductOfferingQualificationItemRef productOfferingQualificationItem = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<ProductOrderItem> productOrderItem = null;
-
-  @JsonProperty("productOrderItemRelationship")
-  @Valid
-  private List<OrderItemRelationship> productOrderItemRelationship = null;
-
-  @JsonProperty("qualification")
-  @Valid
-  private List<ProductOfferingQualificationRef> qualification = null;
-
-  @JsonProperty("quoteItem")
-  private QuoteItemRef quoteItem = null;
-
-  @JsonProperty("state")
-  private ProductOrderItemStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductOrderItem id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the line item (generally it is a sequence number 01, 02, 03, ...)
-   * @return id
-  **/
-  @Schema(description = "Identifier of the line item (generally it is a sequence number 01, 02, 03, ...)")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrderItem quantity(Integer quantity) {
-    this.quantity = quantity;
-    return this;
-  }
-
-  /**
-   * Quantity ordered
-   * @return quantity
-  **/
-  @Schema(description = "Quantity ordered")
-  
-    public Integer getQuantity() {
-    return quantity;
-  }
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  public ProductOrderItem action(OrderItemActionType action) {
-    this.action = action;
-    return this;
-  }
-
-  /**
-   * Get action
-   * @return action
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public OrderItemActionType getAction() {
-    return action;
-  }
-
-  public void setAction(OrderItemActionType action) {
-    this.action = action;
-  }
-
-  public ProductOrderItem appointment(AppointmentRef appointment) {
-    this.appointment = appointment;
-    return this;
-  }
-
-  /**
-   * Get appointment
-   * @return appointment
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AppointmentRef getAppointment() {
-    return appointment;
-  }
-
-  public void setAppointment(AppointmentRef appointment) {
-    this.appointment = appointment;
-  }
-
-  public ProductOrderItem billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductOrderItem itemPrice(List<OrderPrice> itemPrice) {
-    this.itemPrice = itemPrice;
-    return this;
-  }
-
-  public ProductOrderItem addItemPriceItem(OrderPrice itemPriceItem) {
-    if (this.itemPrice == null) {
-      this.itemPrice = new ArrayList<>();
-    }
-    this.itemPrice.add(itemPriceItem);
-    return this;
-  }
-
-  /**
-   * Get itemPrice
-   * @return itemPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderPrice> getItemPrice() {
-    return itemPrice;
-  }
-
-  public void setItemPrice(List<OrderPrice> itemPrice) {
-    this.itemPrice = itemPrice;
-  }
-
-  public ProductOrderItem itemTerm(List<OrderTerm> itemTerm) {
-    this.itemTerm = itemTerm;
-    return this;
-  }
-
-  public ProductOrderItem addItemTermItem(OrderTerm itemTermItem) {
-    if (this.itemTerm == null) {
-      this.itemTerm = new ArrayList<>();
-    }
-    this.itemTerm.add(itemTermItem);
-    return this;
-  }
-
-  /**
-   * Get itemTerm
-   * @return itemTerm
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderTerm> getItemTerm() {
-    return itemTerm;
-  }
-
-  public void setItemTerm(List<OrderTerm> itemTerm) {
-    this.itemTerm = itemTerm;
-  }
-
-  public ProductOrderItem itemTotalPrice(List<OrderPrice> itemTotalPrice) {
-    this.itemTotalPrice = itemTotalPrice;
-    return this;
-  }
-
-  public ProductOrderItem addItemTotalPriceItem(OrderPrice itemTotalPriceItem) {
-    if (this.itemTotalPrice == null) {
-      this.itemTotalPrice = new ArrayList<>();
-    }
-    this.itemTotalPrice.add(itemTotalPriceItem);
-    return this;
-  }
-
-  /**
-   * Get itemTotalPrice
-   * @return itemTotalPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderPrice> getItemTotalPrice() {
-    return itemTotalPrice;
-  }
-
-  public void setItemTotalPrice(List<OrderPrice> itemTotalPrice) {
-    this.itemTotalPrice = itemTotalPrice;
-  }
-
-  public ProductOrderItem payment(List<PaymentRef> payment) {
-    this.payment = payment;
-    return this;
-  }
-
-  public ProductOrderItem addPaymentItem(PaymentRef paymentItem) {
-    if (this.payment == null) {
-      this.payment = new ArrayList<>();
-    }
-    this.payment.add(paymentItem);
-    return this;
-  }
-
-  /**
-   * Get payment
-   * @return payment
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<PaymentRef> getPayment() {
-    return payment;
-  }
-
-  public void setPayment(List<PaymentRef> payment) {
-    this.payment = payment;
-  }
-
-  public ProductOrderItem product(ProductRefOrValue product) {
-    this.product = product;
-    return this;
-  }
-
-  /**
-   * Get product
-   * @return product
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductRefOrValue getProduct() {
-    return product;
-  }
-
-  public void setProduct(ProductRefOrValue product) {
-    this.product = product;
-  }
-
-  public ProductOrderItem productOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * Get productOffering
-   * @return productOffering
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingRef getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-  }
-
-  public ProductOrderItem productOfferingQualificationItem(ProductOfferingQualificationItemRef productOfferingQualificationItem) {
-    this.productOfferingQualificationItem = productOfferingQualificationItem;
-    return this;
-  }
-
-  /**
-   * Get productOfferingQualificationItem
-   * @return productOfferingQualificationItem
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingQualificationItemRef getProductOfferingQualificationItem() {
-    return productOfferingQualificationItem;
-  }
-
-  public void setProductOfferingQualificationItem(ProductOfferingQualificationItemRef productOfferingQualificationItem) {
-    this.productOfferingQualificationItem = productOfferingQualificationItem;
-  }
-
-  public ProductOrderItem productOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public ProductOrderItem addProductOrderItemItem(ProductOrderItem productOrderItemItem) {
-    if (this.productOrderItem == null) {
-      this.productOrderItem = new ArrayList<>();
-    }
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public ProductOrderItem productOrderItemRelationship(List<OrderItemRelationship> productOrderItemRelationship) {
-    this.productOrderItemRelationship = productOrderItemRelationship;
-    return this;
-  }
-
-  public ProductOrderItem addProductOrderItemRelationshipItem(OrderItemRelationship productOrderItemRelationshipItem) {
-    if (this.productOrderItemRelationship == null) {
-      this.productOrderItemRelationship = new ArrayList<>();
-    }
-    this.productOrderItemRelationship.add(productOrderItemRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItemRelationship
-   * @return productOrderItemRelationship
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderItemRelationship> getProductOrderItemRelationship() {
-    return productOrderItemRelationship;
-  }
-
-  public void setProductOrderItemRelationship(List<OrderItemRelationship> productOrderItemRelationship) {
-    this.productOrderItemRelationship = productOrderItemRelationship;
-  }
-
-  public ProductOrderItem qualification(List<ProductOfferingQualificationRef> qualification) {
-    this.qualification = qualification;
-    return this;
-  }
-
-  public ProductOrderItem addQualificationItem(ProductOfferingQualificationRef qualificationItem) {
-    if (this.qualification == null) {
-      this.qualification = new ArrayList<>();
-    }
-    this.qualification.add(qualificationItem);
-    return this;
-  }
-
-  /**
-   * Get qualification
-   * @return qualification
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductOfferingQualificationRef> getQualification() {
-    return qualification;
-  }
-
-  public void setQualification(List<ProductOfferingQualificationRef> qualification) {
-    this.qualification = qualification;
-  }
-
-  public ProductOrderItem quoteItem(QuoteItemRef quoteItem) {
-    this.quoteItem = quoteItem;
-    return this;
-  }
-
-  /**
-   * Get quoteItem
-   * @return quoteItem
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public QuoteItemRef getQuoteItem() {
-    return quoteItem;
-  }
-
-  public void setQuoteItem(QuoteItemRef quoteItem) {
-    this.quoteItem = quoteItem;
-  }
-
-  public ProductOrderItem state(ProductOrderItemStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderItemStateType getState() {
-    return state;
-  }
-
-  public void setState(ProductOrderItemStateType state) {
-    this.state = state;
-  }
-
-  public ProductOrderItem baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOrderItem schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOrderItem type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderItem productOrderItem = (ProductOrderItem) o;
-    return Objects.equals(this.id, productOrderItem.id) &&
-        Objects.equals(this.quantity, productOrderItem.quantity) &&
-        Objects.equals(this.action, productOrderItem.action) &&
-        Objects.equals(this.appointment, productOrderItem.appointment) &&
-        Objects.equals(this.billingAccount, productOrderItem.billingAccount) &&
-        Objects.equals(this.itemPrice, productOrderItem.itemPrice) &&
-        Objects.equals(this.itemTerm, productOrderItem.itemTerm) &&
-        Objects.equals(this.itemTotalPrice, productOrderItem.itemTotalPrice) &&
-        Objects.equals(this.payment, productOrderItem.payment) &&
-        Objects.equals(this.product, productOrderItem.product) &&
-        Objects.equals(this.productOffering, productOrderItem.productOffering) &&
-        Objects.equals(this.productOfferingQualificationItem, productOrderItem.productOfferingQualificationItem) &&
-        Objects.equals(this.productOrderItem, productOrderItem.productOrderItem) &&
-        Objects.equals(this.productOrderItemRelationship, productOrderItem.productOrderItemRelationship) &&
-        Objects.equals(this.qualification, productOrderItem.qualification) &&
-        Objects.equals(this.quoteItem, productOrderItem.quoteItem) &&
-        Objects.equals(this.state, productOrderItem.state) &&
-        Objects.equals(this.baseType, productOrderItem.baseType) &&
-        Objects.equals(this.schemaLocation, productOrderItem.schemaLocation) &&
-        Objects.equals(this.type, productOrderItem.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, quantity, action, appointment, billingAccount, itemPrice, itemTerm, itemTotalPrice, payment, product, productOffering, productOfferingQualificationItem, productOrderItem, productOrderItemRelationship, qualification, quoteItem, state, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderItem {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    action: ").append(toIndentedString(action)).append("\n");
-    sb.append("    appointment: ").append(toIndentedString(appointment)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    itemPrice: ").append(toIndentedString(itemPrice)).append("\n");
-    sb.append("    itemTerm: ").append(toIndentedString(itemTerm)).append("\n");
-    sb.append("    itemTotalPrice: ").append(toIndentedString(itemTotalPrice)).append("\n");
-    sb.append("    payment: ").append(toIndentedString(payment)).append("\n");
-    sb.append("    product: ").append(toIndentedString(product)).append("\n");
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    productOfferingQualificationItem: ").append(toIndentedString(productOfferingQualificationItem)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    productOrderItemRelationship: ").append(toIndentedString(productOrderItemRelationship)).append("\n");
-    sb.append("    qualification: ").append(toIndentedString(qualification)).append("\n");
-    sb.append("    quoteItem: ").append(toIndentedString(quoteItem)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItemStateType.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItemStateType.java
deleted file mode 100644
index 1fff283fd0a1aeb933020610f5adabe6b1e3ea56..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderItemStateType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of the product order item
- */
-public enum ProductOrderItemStateType {
-  ACKNOWLEDGED("acknowledged"),
-    REJECTED("rejected"),
-    PENDING("pending"),
-    HELD("held"),
-    INPROGRESS("inProgress"),
-    CANCELLED("cancelled"),
-    COMPLETED("completed"),
-    FAILED("failed"),
-    ASSESSINGCANCELLATION("assessingCancellation"),
-    PENDINGCANCELLATION("pendingCancellation");
-
-  private String value;
-
-  ProductOrderItemStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ProductOrderItemStateType fromValue(String text) {
-    for (ProductOrderItemStateType b : ProductOrderItemStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderRef.java
deleted file mode 100644
index 3f9c0ebc819f15942017179da9d4f0832b4de5da..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductOrder (ProductOrder) .The product order which the recommendation is related with.
- */
-@Schema(description = "ProductOrder (ProductOrder) .The product order which the recommendation is related with.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOrderRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrderRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOrderRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductOrderRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOrderRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOrderRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductOrderRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderRef productOrderRef = (ProductOrderRef) o;
-    return Objects.equals(this.id, productOrderRef.id) &&
-        Objects.equals(this.href, productOrderRef.href) &&
-        Objects.equals(this.name, productOrderRef.name) &&
-        Objects.equals(this.baseType, productOrderRef.baseType) &&
-        Objects.equals(this.schemaLocation, productOrderRef.schemaLocation) &&
-        Objects.equals(this.type, productOrderRef.type) &&
-        Objects.equals(this._atReferredType, productOrderRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEvent.java
deleted file mode 100644
index 613e5c7d861858e5e1e5ccb22b6cdd8feffeac0c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ProductOrderStateChangeEventPayload event = null;
-
-  public ProductOrderStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOrderStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOrderStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ProductOrderStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ProductOrderStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ProductOrderStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ProductOrderStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ProductOrderStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ProductOrderStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ProductOrderStateChangeEvent event(ProductOrderStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ProductOrderStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderStateChangeEvent productOrderStateChangeEvent = (ProductOrderStateChangeEvent) o;
-    return Objects.equals(this.id, productOrderStateChangeEvent.id) &&
-        Objects.equals(this.href, productOrderStateChangeEvent.href) &&
-        Objects.equals(this.eventId, productOrderStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, productOrderStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, productOrderStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, productOrderStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, productOrderStateChangeEvent.domain) &&
-        Objects.equals(this.title, productOrderStateChangeEvent.title) &&
-        Objects.equals(this.description, productOrderStateChangeEvent.description) &&
-        Objects.equals(this.priority, productOrderStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, productOrderStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, productOrderStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEventPayload.java
deleted file mode 100644
index 3ca7b78837b469f4a93552919ec81a02123d7a7b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderStateChangeEventPayload   {
-  @JsonProperty("productOrder")
-  private ProductOrder productOrder = null;
-
-  public ProductOrderStateChangeEventPayload productOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-    return this;
-  }
-
-  /**
-   * Get productOrder
-   * @return productOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrder getProductOrder() {
-    return productOrder;
-  }
-
-  public void setProductOrder(ProductOrder productOrder) {
-    this.productOrder = productOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderStateChangeEventPayload productOrderStateChangeEventPayload = (ProductOrderStateChangeEventPayload) o;
-    return Objects.equals(this.productOrder, productOrderStateChangeEventPayload.productOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(productOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderStateChangeEventPayload {\n");
-    
-    sb.append("    productOrder: ").append(toIndentedString(productOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateType.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateType.java
deleted file mode 100644
index f6766150efc32f11df5816e670cc786786a5211b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderStateType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of the order
- */
-public enum ProductOrderStateType {
-  ACKNOWLEDGED("acknowledged"),
-    REJECTED("rejected"),
-    PENDING("pending"),
-    HELD("held"),
-    INPROGRESS("inProgress"),
-    CANCELLED("cancelled"),
-    COMPLETED("completed"),
-    FAILED("failed"),
-    PARTIAL("partial"),
-    ASSESSINGCANCELLATION("assessingCancellation"),
-    PENDINGCANCELLATION("pendingCancellation");
-
-  private String value;
-
-  ProductOrderStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ProductOrderStateType fromValue(String text) {
-    for (ProductOrderStateType b : ProductOrderStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderUpdate.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderUpdate.java
deleted file mode 100644
index ddef47a6244d23c6a0ea947b73a76637b3a8f965..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductOrderUpdate.java
+++ /dev/null
@@ -1,765 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa, Skipped properties: id,href,orderDate
- */
-@Schema(description = "A Product Order is a type of order which  can  be used to place an order between a customer and a service provider or between a service provider and a partner and vice versa, Skipped properties: id,href,orderDate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductOrderUpdate   {
-  @JsonProperty("cancellationDate")
-  private OffsetDateTime cancellationDate = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("category")
-  private String category = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("expectedCompletionDate")
-  private OffsetDateTime expectedCompletionDate = null;
-
-  @JsonProperty("externalId")
-  private String externalId = null;
-
-  @JsonProperty("notificationContact")
-  private String notificationContact = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("requestedCompletionDate")
-  private OffsetDateTime requestedCompletionDate = null;
-
-  @JsonProperty("requestedStartDate")
-  private OffsetDateTime requestedStartDate = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("channel")
-  @Valid
-  private List<RelatedChannel> channel = null;
-
-  @JsonProperty("note")
-  @Valid
-  private List<Note> note = null;
-
-  @JsonProperty("orderTotalPrice")
-  @Valid
-  private List<OrderPrice> orderTotalPrice = null;
-
-  @JsonProperty("payment")
-  @Valid
-  private List<PaymentRef> payment = null;
-
-  @JsonProperty("productOfferingQualification")
-  @Valid
-  private List<ProductOfferingQualificationRef> productOfferingQualification = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<ProductOrderItem> productOrderItem = new ArrayList<>();
-
-  @JsonProperty("quote")
-  @Valid
-  private List<QuoteRef> quote = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("state")
-  private ProductOrderStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductOrderUpdate cancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled. This is used when order is cancelled. ")
-  
-    @Valid
-    public OffsetDateTime getCancellationDate() {
-    return cancellationDate;
-  }
-
-  public void setCancellationDate(OffsetDateTime cancellationDate) {
-    this.cancellationDate = cancellationDate;
-  }
-
-  public ProductOrderUpdate cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled. This is used when order is cancelled. 
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled. This is used when order is cancelled. ")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public ProductOrderUpdate category(String category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)
-   * @return category
-  **/
-  @Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system (e.g. \"enterprise\", \"residential\", ...)")
-  
-    public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public ProductOrderUpdate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date when the order was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date when the order was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ProductOrderUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the product order
-   * @return description
-  **/
-  @Schema(description = "Description of the product order")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductOrderUpdate expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Expected delivery date amended by the provider
-   * @return expectedCompletionDate
-  **/
-  @Schema(description = "Expected delivery date amended by the provider")
-  
-    @Valid
-    public OffsetDateTime getExpectedCompletionDate() {
-    return expectedCompletionDate;
-  }
-
-  public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-  }
-
-  public ProductOrderUpdate externalId(String externalId) {
-    this.externalId = externalId;
-    return this;
-  }
-
-  /**
-   * ID given by the consumer and only understandable by him (to facilitate his searches afterwards)
-   * @return externalId
-  **/
-  @Schema(description = "ID given by the consumer and only understandable by him (to facilitate his searches afterwards)")
-  
-    public String getExternalId() {
-    return externalId;
-  }
-
-  public void setExternalId(String externalId) {
-    this.externalId = externalId;
-  }
-
-  public ProductOrderUpdate notificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-    return this;
-  }
-
-  /**
-   * Contact attached to the order to send back information regarding this order
-   * @return notificationContact
-  **/
-  @Schema(description = "Contact attached to the order to send back information regarding this order")
-  
-    public String getNotificationContact() {
-    return notificationContact;
-  }
-
-  public void setNotificationContact(String notificationContact) {
-    this.notificationContact = notificationContact;
-  }
-
-  public ProductOrderUpdate priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)
-   * @return priority
-  **/
-  @Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ProductOrderUpdate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Requested delivery date from the requestor perspective
-   * @return requestedCompletionDate
-  **/
-  @Schema(description = "Requested delivery date from the requestor perspective")
-  
-    @Valid
-    public OffsetDateTime getRequestedCompletionDate() {
-    return requestedCompletionDate;
-  }
-
-  public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-  }
-
-  public ProductOrderUpdate requestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-    return this;
-  }
-
-  /**
-   * Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. 
-   * @return requestedStartDate
-  **/
-  @Schema(description = "Order fulfillment start date wished by the requestor. This is used when, for any reason, requestor cannot allow seller to begin to operationally begin the fulfillment before a date. ")
-  
-    @Valid
-    public OffsetDateTime getRequestedStartDate() {
-    return requestedStartDate;
-  }
-
-  public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-  }
-
-  public ProductOrderUpdate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public ProductOrderUpdate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * A reference to an agreement defined in the context of the product order
-   * @return agreement
-  **/
-  @Schema(description = "A reference to an agreement defined in the context of the product order")
-      @Valid
-    public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public ProductOrderUpdate billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductOrderUpdate channel(List<RelatedChannel> channel) {
-    this.channel = channel;
-    return this;
-  }
-
-  public ProductOrderUpdate addChannelItem(RelatedChannel channelItem) {
-    if (this.channel == null) {
-      this.channel = new ArrayList<>();
-    }
-    this.channel.add(channelItem);
-    return this;
-  }
-
-  /**
-   * Get channel
-   * @return channel
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedChannel> getChannel() {
-    return channel;
-  }
-
-  public void setChannel(List<RelatedChannel> channel) {
-    this.channel = channel;
-  }
-
-  public ProductOrderUpdate note(List<Note> note) {
-    this.note = note;
-    return this;
-  }
-
-  public ProductOrderUpdate addNoteItem(Note noteItem) {
-    if (this.note == null) {
-      this.note = new ArrayList<>();
-    }
-    this.note.add(noteItem);
-    return this;
-  }
-
-  /**
-   * Get note
-   * @return note
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Note> getNote() {
-    return note;
-  }
-
-  public void setNote(List<Note> note) {
-    this.note = note;
-  }
-
-  public ProductOrderUpdate orderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-    return this;
-  }
-
-  public ProductOrderUpdate addOrderTotalPriceItem(OrderPrice orderTotalPriceItem) {
-    if (this.orderTotalPrice == null) {
-      this.orderTotalPrice = new ArrayList<>();
-    }
-    this.orderTotalPrice.add(orderTotalPriceItem);
-    return this;
-  }
-
-  /**
-   * Get orderTotalPrice
-   * @return orderTotalPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<OrderPrice> getOrderTotalPrice() {
-    return orderTotalPrice;
-  }
-
-  public void setOrderTotalPrice(List<OrderPrice> orderTotalPrice) {
-    this.orderTotalPrice = orderTotalPrice;
-  }
-
-  public ProductOrderUpdate payment(List<PaymentRef> payment) {
-    this.payment = payment;
-    return this;
-  }
-
-  public ProductOrderUpdate addPaymentItem(PaymentRef paymentItem) {
-    if (this.payment == null) {
-      this.payment = new ArrayList<>();
-    }
-    this.payment.add(paymentItem);
-    return this;
-  }
-
-  /**
-   * Get payment
-   * @return payment
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<PaymentRef> getPayment() {
-    return payment;
-  }
-
-  public void setPayment(List<PaymentRef> payment) {
-    this.payment = payment;
-  }
-
-  public ProductOrderUpdate productOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-    return this;
-  }
-
-  public ProductOrderUpdate addProductOfferingQualificationItem(ProductOfferingQualificationRef productOfferingQualificationItem) {
-    if (this.productOfferingQualification == null) {
-      this.productOfferingQualification = new ArrayList<>();
-    }
-    this.productOfferingQualification.add(productOfferingQualificationItem);
-    return this;
-  }
-
-  /**
-   * Get productOfferingQualification
-   * @return productOfferingQualification
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductOfferingQualificationRef> getProductOfferingQualification() {
-    return productOfferingQualification;
-  }
-
-  public void setProductOfferingQualification(List<ProductOfferingQualificationRef> productOfferingQualification) {
-    this.productOfferingQualification = productOfferingQualification;
-  }
-
-  public ProductOrderUpdate productOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public ProductOrderUpdate addProductOrderItemItem(ProductOrderItem productOrderItemItem) {
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<ProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<ProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public ProductOrderUpdate quote(List<QuoteRef> quote) {
-    this.quote = quote;
-    return this;
-  }
-
-  public ProductOrderUpdate addQuoteItem(QuoteRef quoteItem) {
-    if (this.quote == null) {
-      this.quote = new ArrayList<>();
-    }
-    this.quote.add(quoteItem);
-    return this;
-  }
-
-  /**
-   * Get quote
-   * @return quote
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<QuoteRef> getQuote() {
-    return quote;
-  }
-
-  public void setQuote(List<QuoteRef> quote) {
-    this.quote = quote;
-  }
-
-  public ProductOrderUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ProductOrderUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ProductOrderUpdate state(ProductOrderStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOrderStateType getState() {
-    return state;
-  }
-
-  public void setState(ProductOrderStateType state) {
-    this.state = state;
-  }
-
-  public ProductOrderUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductOrderUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductOrderUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOrderUpdate productOrderUpdate = (ProductOrderUpdate) o;
-    return Objects.equals(this.cancellationDate, productOrderUpdate.cancellationDate) &&
-        Objects.equals(this.cancellationReason, productOrderUpdate.cancellationReason) &&
-        Objects.equals(this.category, productOrderUpdate.category) &&
-        Objects.equals(this.completionDate, productOrderUpdate.completionDate) &&
-        Objects.equals(this.description, productOrderUpdate.description) &&
-        Objects.equals(this.expectedCompletionDate, productOrderUpdate.expectedCompletionDate) &&
-        Objects.equals(this.externalId, productOrderUpdate.externalId) &&
-        Objects.equals(this.notificationContact, productOrderUpdate.notificationContact) &&
-        Objects.equals(this.priority, productOrderUpdate.priority) &&
-        Objects.equals(this.requestedCompletionDate, productOrderUpdate.requestedCompletionDate) &&
-        Objects.equals(this.requestedStartDate, productOrderUpdate.requestedStartDate) &&
-        Objects.equals(this.agreement, productOrderUpdate.agreement) &&
-        Objects.equals(this.billingAccount, productOrderUpdate.billingAccount) &&
-        Objects.equals(this.channel, productOrderUpdate.channel) &&
-        Objects.equals(this.note, productOrderUpdate.note) &&
-        Objects.equals(this.orderTotalPrice, productOrderUpdate.orderTotalPrice) &&
-        Objects.equals(this.payment, productOrderUpdate.payment) &&
-        Objects.equals(this.productOfferingQualification, productOrderUpdate.productOfferingQualification) &&
-        Objects.equals(this.productOrderItem, productOrderUpdate.productOrderItem) &&
-        Objects.equals(this.quote, productOrderUpdate.quote) &&
-        Objects.equals(this.relatedParty, productOrderUpdate.relatedParty) &&
-        Objects.equals(this.state, productOrderUpdate.state) &&
-        Objects.equals(this.baseType, productOrderUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, productOrderUpdate.schemaLocation) &&
-        Objects.equals(this.type, productOrderUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancellationDate, cancellationReason, category, completionDate, description, expectedCompletionDate, externalId, notificationContact, priority, requestedCompletionDate, requestedStartDate, agreement, billingAccount, channel, note, orderTotalPrice, payment, productOfferingQualification, productOrderItem, quote, relatedParty, state, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOrderUpdate {\n");
-    
-    sb.append("    cancellationDate: ").append(toIndentedString(cancellationDate)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-    sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-    sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-    sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    channel: ").append(toIndentedString(channel)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    orderTotalPrice: ").append(toIndentedString(orderTotalPrice)).append("\n");
-    sb.append("    payment: ").append(toIndentedString(payment)).append("\n");
-    sb.append("    productOfferingQualification: ").append(toIndentedString(productOfferingQualification)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    quote: ").append(toIndentedString(quote)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductPrice.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductPrice.java
deleted file mode 100644
index 58f6b58d781a484245c61ca0fb069e5b48133b01..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductPrice.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An amount, usually of money, that represents the actual price paid by a Customer for a purchase, a rent or a lease of a Product. The price is valid for a defined period of time.
- */
-@Schema(description = "An amount, usually of money, that represents the actual price paid by a Customer for a purchase, a rent or a lease of a Product. The price is valid for a defined period of time.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductPrice   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("priceType")
-  private String priceType = null;
-
-  @JsonProperty("recurringChargePeriod")
-  private String recurringChargePeriod = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("price")
-  private Price price = null;
-
-  @JsonProperty("productOfferingPrice")
-  private ProductOfferingPriceRef productOfferingPrice = null;
-
-  @JsonProperty("productPriceAlteration")
-  @Valid
-  private List<PriceAlteration> productPriceAlteration = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductPrice description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail the semantics of this product price.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail the semantics of this product price.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductPrice name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A short descriptive name such as \"Subscription price\".
-   * @return name
-  **/
-  @Schema(description = "A short descriptive name such as \"Subscription price\".")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductPrice priceType(String priceType) {
-    this.priceType = priceType;
-    return this;
-  }
-
-  /**
-   * A category that describes the price, such as recurring, discount, allowance, penalty, and so forth.
-   * @return priceType
-  **/
-  @Schema(description = "A category that describes the price, such as recurring, discount, allowance, penalty, and so forth.")
-      @NotNull
-
-    public String getPriceType() {
-    return priceType;
-  }
-
-  public void setPriceType(String priceType) {
-    this.priceType = priceType;
-  }
-
-  public ProductPrice recurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-    return this;
-  }
-
-  /**
-   * Could be month, week...
-   * @return recurringChargePeriod
-  **/
-  @Schema(description = "Could be month, week...")
-  
-    public String getRecurringChargePeriod() {
-    return recurringChargePeriod;
-  }
-
-  public void setRecurringChargePeriod(String recurringChargePeriod) {
-    this.recurringChargePeriod = recurringChargePeriod;
-  }
-
-  public ProductPrice unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * Could be minutes, GB...
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "Could be minutes, GB...")
-  
-    public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public ProductPrice billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductPrice price(Price price) {
-    this.price = price;
-    return this;
-  }
-
-  /**
-   * Get price
-   * @return price
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public Price getPrice() {
-    return price;
-  }
-
-  public void setPrice(Price price) {
-    this.price = price;
-  }
-
-  public ProductPrice productOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-    return this;
-  }
-
-  /**
-   * Get productOfferingPrice
-   * @return productOfferingPrice
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingPriceRef getProductOfferingPrice() {
-    return productOfferingPrice;
-  }
-
-  public void setProductOfferingPrice(ProductOfferingPriceRef productOfferingPrice) {
-    this.productOfferingPrice = productOfferingPrice;
-  }
-
-  public ProductPrice productPriceAlteration(List<PriceAlteration> productPriceAlteration) {
-    this.productPriceAlteration = productPriceAlteration;
-    return this;
-  }
-
-  public ProductPrice addProductPriceAlterationItem(PriceAlteration productPriceAlterationItem) {
-    if (this.productPriceAlteration == null) {
-      this.productPriceAlteration = new ArrayList<>();
-    }
-    this.productPriceAlteration.add(productPriceAlterationItem);
-    return this;
-  }
-
-  /**
-   * Get productPriceAlteration
-   * @return productPriceAlteration
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<PriceAlteration> getProductPriceAlteration() {
-    return productPriceAlteration;
-  }
-
-  public void setProductPriceAlteration(List<PriceAlteration> productPriceAlteration) {
-    this.productPriceAlteration = productPriceAlteration;
-  }
-
-  public ProductPrice baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductPrice schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductPrice type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductPrice productPrice = (ProductPrice) o;
-    return Objects.equals(this.description, productPrice.description) &&
-        Objects.equals(this.name, productPrice.name) &&
-        Objects.equals(this.priceType, productPrice.priceType) &&
-        Objects.equals(this.recurringChargePeriod, productPrice.recurringChargePeriod) &&
-        Objects.equals(this.unitOfMeasure, productPrice.unitOfMeasure) &&
-        Objects.equals(this.billingAccount, productPrice.billingAccount) &&
-        Objects.equals(this.price, productPrice.price) &&
-        Objects.equals(this.productOfferingPrice, productPrice.productOfferingPrice) &&
-        Objects.equals(this.productPriceAlteration, productPrice.productPriceAlteration) &&
-        Objects.equals(this.baseType, productPrice.baseType) &&
-        Objects.equals(this.schemaLocation, productPrice.schemaLocation) &&
-        Objects.equals(this.type, productPrice.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, priceType, recurringChargePeriod, unitOfMeasure, billingAccount, price, productOfferingPrice, productPriceAlteration, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductPrice {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    priceType: ").append(toIndentedString(priceType)).append("\n");
-    sb.append("    recurringChargePeriod: ").append(toIndentedString(recurringChargePeriod)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    price: ").append(toIndentedString(price)).append("\n");
-    sb.append("    productOfferingPrice: ").append(toIndentedString(productOfferingPrice)).append("\n");
-    sb.append("    productPriceAlteration: ").append(toIndentedString(productPriceAlteration)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductRef.java
deleted file mode 100644
index 92d6d9cd96796c22a37f4fd2ce577fb14806c7ff..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRef.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ProductRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductRef productRef = (ProductRef) o;
-    return Objects.equals(this.id, productRef.id) &&
-        Objects.equals(this.href, productRef.href) &&
-        Objects.equals(this.name, productRef.name) &&
-        Objects.equals(this.baseType, productRef.baseType) &&
-        Objects.equals(this.schemaLocation, productRef.schemaLocation) &&
-        Objects.equals(this.type, productRef.type) &&
-        Objects.equals(this._atReferredType, productRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRefOrValue.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductRefOrValue.java
deleted file mode 100644
index c77a6ed7d9376834d228c4e10263436d31d12a96..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRefOrValue.java
+++ /dev/null
@@ -1,880 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A product to be created defined by value or existing defined by reference. The polymorphic attributes @type, @schemaLocation &amp; @referredType are related to the product entity and not the RelatedProductRefOrValue class itself
- */
-@Schema(description = "A product to be created defined by value or existing defined by reference. The polymorphic attributes @type, @schemaLocation & @referredType are related to the product entity and not the RelatedProductRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("isBundle")
-  private Boolean isBundle = null;
-
-  @JsonProperty("isCustomerVisible")
-  private Boolean isCustomerVisible = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("orderDate")
-  private OffsetDateTime orderDate = null;
-
-  @JsonProperty("productSerialNumber")
-  private String productSerialNumber = null;
-
-  @JsonProperty("startDate")
-  private OffsetDateTime startDate = null;
-
-  @JsonProperty("terminationDate")
-  private OffsetDateTime terminationDate = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementItemRef> agreement = null;
-
-  @JsonProperty("billingAccount")
-  private BillingAccountRef billingAccount = null;
-
-  @JsonProperty("place")
-  @Valid
-  private List<RelatedPlaceRefOrValue> place = null;
-
-  @JsonProperty("product")
-  @Valid
-  private List<ProductRefOrValue> product = null;
-
-  @JsonProperty("productCharacteristic")
-  @Valid
-  private List<Characteristic> productCharacteristic = null;
-
-  @JsonProperty("productOffering")
-  private ProductOfferingRef productOffering = null;
-
-  @JsonProperty("productOrderItem")
-  @Valid
-  private List<RelatedProductOrderItem> productOrderItem = null;
-
-  @JsonProperty("productPrice")
-  @Valid
-  private List<ProductPrice> productPrice = null;
-
-  @JsonProperty("productRelationship")
-  @Valid
-  private List<ProductRelationship> productRelationship = null;
-
-  @JsonProperty("productSpecification")
-  private ProductSpecificationRef productSpecification = null;
-
-  @JsonProperty("productTerm")
-  @Valid
-  private List<ProductTerm> productTerm = null;
-
-  @JsonProperty("realizingResource")
-  @Valid
-  private List<ResourceRef> realizingResource = null;
-
-  @JsonProperty("realizingService")
-  @Valid
-  private List<ServiceRef> realizingService = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("status")
-  private ProductStatusType status = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the product
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the product")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the product
-   * @return href
-  **/
-  @Schema(description = "Reference of the product")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductRefOrValue description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Is the description of the product. It could be copied from the description of the Product Offering.
-   * @return description
-  **/
-  @Schema(description = "Is the description of the product. It could be copied from the description of the Product Offering.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductRefOrValue isBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-    return this;
-  }
-
-  /**
-   * If true, the product is a ProductBundle which is an instantiation of a BundledProductOffering. If false, the product is a ProductComponent which is an instantiation of a SimpleProductOffering.
-   * @return isBundle
-  **/
-  @Schema(description = "If true, the product is a ProductBundle which is an instantiation of a BundledProductOffering. If false, the product is a ProductComponent which is an instantiation of a SimpleProductOffering.")
-  
-    public Boolean isIsBundle() {
-    return isBundle;
-  }
-
-  public void setIsBundle(Boolean isBundle) {
-    this.isBundle = isBundle;
-  }
-
-  public ProductRefOrValue isCustomerVisible(Boolean isCustomerVisible) {
-    this.isCustomerVisible = isCustomerVisible;
-    return this;
-  }
-
-  /**
-   * If true, the product is visible by the customer.
-   * @return isCustomerVisible
-  **/
-  @Schema(description = "If true, the product is visible by the customer.")
-  
-    public Boolean isIsCustomerVisible() {
-    return isCustomerVisible;
-  }
-
-  public void setIsCustomerVisible(Boolean isCustomerVisible) {
-    this.isCustomerVisible = isCustomerVisible;
-  }
-
-  public ProductRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the product. It could be the same as the name of the product offering
-   * @return name
-  **/
-  @Schema(description = "Name of the product. It could be the same as the name of the product offering")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductRefOrValue orderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-    return this;
-  }
-
-  /**
-   * Is the date when the product was ordered
-   * @return orderDate
-  **/
-  @Schema(description = "Is the date when the product was ordered")
-  
-    @Valid
-    public OffsetDateTime getOrderDate() {
-    return orderDate;
-  }
-
-  public void setOrderDate(OffsetDateTime orderDate) {
-    this.orderDate = orderDate;
-  }
-
-  public ProductRefOrValue productSerialNumber(String productSerialNumber) {
-    this.productSerialNumber = productSerialNumber;
-    return this;
-  }
-
-  /**
-   * Is the serial number for the product. This is typically applicable to tangible products e.g. Broadband Router.
-   * @return productSerialNumber
-  **/
-  @Schema(description = "Is the serial number for the product. This is typically applicable to tangible products e.g. Broadband Router.")
-  
-    public String getProductSerialNumber() {
-    return productSerialNumber;
-  }
-
-  public void setProductSerialNumber(String productSerialNumber) {
-    this.productSerialNumber = productSerialNumber;
-  }
-
-  public ProductRefOrValue startDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-    return this;
-  }
-
-  /**
-   * Is the date from which the product starts
-   * @return startDate
-  **/
-  @Schema(description = "Is the date from which the product starts")
-  
-    @Valid
-    public OffsetDateTime getStartDate() {
-    return startDate;
-  }
-
-  public void setStartDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-  }
-
-  public ProductRefOrValue terminationDate(OffsetDateTime terminationDate) {
-    this.terminationDate = terminationDate;
-    return this;
-  }
-
-  /**
-   * Is the date when the product was terminated
-   * @return terminationDate
-  **/
-  @Schema(description = "Is the date when the product was terminated")
-  
-    @Valid
-    public OffsetDateTime getTerminationDate() {
-    return terminationDate;
-  }
-
-  public void setTerminationDate(OffsetDateTime terminationDate) {
-    this.terminationDate = terminationDate;
-  }
-
-  public ProductRefOrValue agreement(List<AgreementItemRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public ProductRefOrValue addAgreementItem(AgreementItemRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<AgreementItemRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementItemRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public ProductRefOrValue billingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-    return this;
-  }
-
-  /**
-   * Get billingAccount
-   * @return billingAccount
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public BillingAccountRef getBillingAccount() {
-    return billingAccount;
-  }
-
-  public void setBillingAccount(BillingAccountRef billingAccount) {
-    this.billingAccount = billingAccount;
-  }
-
-  public ProductRefOrValue place(List<RelatedPlaceRefOrValue> place) {
-    this.place = place;
-    return this;
-  }
-
-  public ProductRefOrValue addPlaceItem(RelatedPlaceRefOrValue placeItem) {
-    if (this.place == null) {
-      this.place = new ArrayList<>();
-    }
-    this.place.add(placeItem);
-    return this;
-  }
-
-  /**
-   * Get place
-   * @return place
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedPlaceRefOrValue> getPlace() {
-    return place;
-  }
-
-  public void setPlace(List<RelatedPlaceRefOrValue> place) {
-    this.place = place;
-  }
-
-  public ProductRefOrValue product(List<ProductRefOrValue> product) {
-    this.product = product;
-    return this;
-  }
-
-  public ProductRefOrValue addProductItem(ProductRefOrValue productItem) {
-    if (this.product == null) {
-      this.product = new ArrayList<>();
-    }
-    this.product.add(productItem);
-    return this;
-  }
-
-  /**
-   * Get product
-   * @return product
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductRefOrValue> getProduct() {
-    return product;
-  }
-
-  public void setProduct(List<ProductRefOrValue> product) {
-    this.product = product;
-  }
-
-  public ProductRefOrValue productCharacteristic(List<Characteristic> productCharacteristic) {
-    this.productCharacteristic = productCharacteristic;
-    return this;
-  }
-
-  public ProductRefOrValue addProductCharacteristicItem(Characteristic productCharacteristicItem) {
-    if (this.productCharacteristic == null) {
-      this.productCharacteristic = new ArrayList<>();
-    }
-    this.productCharacteristic.add(productCharacteristicItem);
-    return this;
-  }
-
-  /**
-   * Get productCharacteristic
-   * @return productCharacteristic
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Characteristic> getProductCharacteristic() {
-    return productCharacteristic;
-  }
-
-  public void setProductCharacteristic(List<Characteristic> productCharacteristic) {
-    this.productCharacteristic = productCharacteristic;
-  }
-
-  public ProductRefOrValue productOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-    return this;
-  }
-
-  /**
-   * Get productOffering
-   * @return productOffering
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductOfferingRef getProductOffering() {
-    return productOffering;
-  }
-
-  public void setProductOffering(ProductOfferingRef productOffering) {
-    this.productOffering = productOffering;
-  }
-
-  public ProductRefOrValue productOrderItem(List<RelatedProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-    return this;
-  }
-
-  public ProductRefOrValue addProductOrderItemItem(RelatedProductOrderItem productOrderItemItem) {
-    if (this.productOrderItem == null) {
-      this.productOrderItem = new ArrayList<>();
-    }
-    this.productOrderItem.add(productOrderItemItem);
-    return this;
-  }
-
-  /**
-   * Get productOrderItem
-   * @return productOrderItem
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedProductOrderItem> getProductOrderItem() {
-    return productOrderItem;
-  }
-
-  public void setProductOrderItem(List<RelatedProductOrderItem> productOrderItem) {
-    this.productOrderItem = productOrderItem;
-  }
-
-  public ProductRefOrValue productPrice(List<ProductPrice> productPrice) {
-    this.productPrice = productPrice;
-    return this;
-  }
-
-  public ProductRefOrValue addProductPriceItem(ProductPrice productPriceItem) {
-    if (this.productPrice == null) {
-      this.productPrice = new ArrayList<>();
-    }
-    this.productPrice.add(productPriceItem);
-    return this;
-  }
-
-  /**
-   * Get productPrice
-   * @return productPrice
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductPrice> getProductPrice() {
-    return productPrice;
-  }
-
-  public void setProductPrice(List<ProductPrice> productPrice) {
-    this.productPrice = productPrice;
-  }
-
-  public ProductRefOrValue productRelationship(List<ProductRelationship> productRelationship) {
-    this.productRelationship = productRelationship;
-    return this;
-  }
-
-  public ProductRefOrValue addProductRelationshipItem(ProductRelationship productRelationshipItem) {
-    if (this.productRelationship == null) {
-      this.productRelationship = new ArrayList<>();
-    }
-    this.productRelationship.add(productRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get productRelationship
-   * @return productRelationship
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductRelationship> getProductRelationship() {
-    return productRelationship;
-  }
-
-  public void setProductRelationship(List<ProductRelationship> productRelationship) {
-    this.productRelationship = productRelationship;
-  }
-
-  public ProductRefOrValue productSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-    return this;
-  }
-
-  /**
-   * Get productSpecification
-   * @return productSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductSpecificationRef getProductSpecification() {
-    return productSpecification;
-  }
-
-  public void setProductSpecification(ProductSpecificationRef productSpecification) {
-    this.productSpecification = productSpecification;
-  }
-
-  public ProductRefOrValue productTerm(List<ProductTerm> productTerm) {
-    this.productTerm = productTerm;
-    return this;
-  }
-
-  public ProductRefOrValue addProductTermItem(ProductTerm productTermItem) {
-    if (this.productTerm == null) {
-      this.productTerm = new ArrayList<>();
-    }
-    this.productTerm.add(productTermItem);
-    return this;
-  }
-
-  /**
-   * Get productTerm
-   * @return productTerm
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ProductTerm> getProductTerm() {
-    return productTerm;
-  }
-
-  public void setProductTerm(List<ProductTerm> productTerm) {
-    this.productTerm = productTerm;
-  }
-
-  public ProductRefOrValue realizingResource(List<ResourceRef> realizingResource) {
-    this.realizingResource = realizingResource;
-    return this;
-  }
-
-  public ProductRefOrValue addRealizingResourceItem(ResourceRef realizingResourceItem) {
-    if (this.realizingResource == null) {
-      this.realizingResource = new ArrayList<>();
-    }
-    this.realizingResource.add(realizingResourceItem);
-    return this;
-  }
-
-  /**
-   * Get realizingResource
-   * @return realizingResource
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ResourceRef> getRealizingResource() {
-    return realizingResource;
-  }
-
-  public void setRealizingResource(List<ResourceRef> realizingResource) {
-    this.realizingResource = realizingResource;
-  }
-
-  public ProductRefOrValue realizingService(List<ServiceRef> realizingService) {
-    this.realizingService = realizingService;
-    return this;
-  }
-
-  public ProductRefOrValue addRealizingServiceItem(ServiceRef realizingServiceItem) {
-    if (this.realizingService == null) {
-      this.realizingService = new ArrayList<>();
-    }
-    this.realizingService.add(realizingServiceItem);
-    return this;
-  }
-
-  /**
-   * Get realizingService
-   * @return realizingService
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ServiceRef> getRealizingService() {
-    return realizingService;
-  }
-
-  public void setRealizingService(List<ServiceRef> realizingService) {
-    this.realizingService = realizingService;
-  }
-
-  public ProductRefOrValue relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ProductRefOrValue addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ProductRefOrValue status(ProductStatusType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ProductStatusType getStatus() {
-    return status;
-  }
-
-  public void setStatus(ProductStatusType status) {
-    this.status = status;
-  }
-
-  public ProductRefOrValue baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductRefOrValue schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductRefOrValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductRefOrValue _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductRefOrValue productRefOrValue = (ProductRefOrValue) o;
-    return Objects.equals(this.id, productRefOrValue.id) &&
-        Objects.equals(this.href, productRefOrValue.href) &&
-        Objects.equals(this.description, productRefOrValue.description) &&
-        Objects.equals(this.isBundle, productRefOrValue.isBundle) &&
-        Objects.equals(this.isCustomerVisible, productRefOrValue.isCustomerVisible) &&
-        Objects.equals(this.name, productRefOrValue.name) &&
-        Objects.equals(this.orderDate, productRefOrValue.orderDate) &&
-        Objects.equals(this.productSerialNumber, productRefOrValue.productSerialNumber) &&
-        Objects.equals(this.startDate, productRefOrValue.startDate) &&
-        Objects.equals(this.terminationDate, productRefOrValue.terminationDate) &&
-        Objects.equals(this.agreement, productRefOrValue.agreement) &&
-        Objects.equals(this.billingAccount, productRefOrValue.billingAccount) &&
-        Objects.equals(this.place, productRefOrValue.place) &&
-        Objects.equals(this.product, productRefOrValue.product) &&
-        Objects.equals(this.productCharacteristic, productRefOrValue.productCharacteristic) &&
-        Objects.equals(this.productOffering, productRefOrValue.productOffering) &&
-        Objects.equals(this.productOrderItem, productRefOrValue.productOrderItem) &&
-        Objects.equals(this.productPrice, productRefOrValue.productPrice) &&
-        Objects.equals(this.productRelationship, productRefOrValue.productRelationship) &&
-        Objects.equals(this.productSpecification, productRefOrValue.productSpecification) &&
-        Objects.equals(this.productTerm, productRefOrValue.productTerm) &&
-        Objects.equals(this.realizingResource, productRefOrValue.realizingResource) &&
-        Objects.equals(this.realizingService, productRefOrValue.realizingService) &&
-        Objects.equals(this.relatedParty, productRefOrValue.relatedParty) &&
-        Objects.equals(this.status, productRefOrValue.status) &&
-        Objects.equals(this.baseType, productRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, productRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, productRefOrValue.type) &&
-        Objects.equals(this._atReferredType, productRefOrValue._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, isBundle, isCustomerVisible, name, orderDate, productSerialNumber, startDate, terminationDate, agreement, billingAccount, place, product, productCharacteristic, productOffering, productOrderItem, productPrice, productRelationship, productSpecification, productTerm, realizingResource, realizingService, relatedParty, status, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    isCustomerVisible: ").append(toIndentedString(isCustomerVisible)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-    sb.append("    productSerialNumber: ").append(toIndentedString(productSerialNumber)).append("\n");
-    sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-    sb.append("    terminationDate: ").append(toIndentedString(terminationDate)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    billingAccount: ").append(toIndentedString(billingAccount)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    product: ").append(toIndentedString(product)).append("\n");
-    sb.append("    productCharacteristic: ").append(toIndentedString(productCharacteristic)).append("\n");
-    sb.append("    productOffering: ").append(toIndentedString(productOffering)).append("\n");
-    sb.append("    productOrderItem: ").append(toIndentedString(productOrderItem)).append("\n");
-    sb.append("    productPrice: ").append(toIndentedString(productPrice)).append("\n");
-    sb.append("    productRelationship: ").append(toIndentedString(productRelationship)).append("\n");
-    sb.append("    productSpecification: ").append(toIndentedString(productSpecification)).append("\n");
-    sb.append("    productTerm: ").append(toIndentedString(productTerm)).append("\n");
-    sb.append("    realizingResource: ").append(toIndentedString(realizingResource)).append("\n");
-    sb.append("    realizingService: ").append(toIndentedString(realizingService)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRelationship.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductRelationship.java
deleted file mode 100644
index 309c363c0e25411a3456f91e810dce8a6c05eead..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductRelationship.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Linked products to the one instantiate, such as [bundled] if the product is a bundle and you want to describe the bundled products inside this bundle; [reliesOn] if the product needs another already owned product to rely on (e.g. an option on an already owned mobile access product) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful
- */
-@Schema(description = "Linked products to the one instantiate, such as [bundled] if the product is a bundle and you want to describe the bundled products inside this bundle; [reliesOn] if the product needs another already owned product to rely on (e.g. an option on an already owned mobile access product) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductRelationship   {
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("product")
-  private ProductRefOrValue product = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of the product relationship, such as [bundled] if the product is a bundle and you want to describe the bundled products inside this bundle; [reliesOn] if the product needs another already owned product to rely on (e.g. an option on an already owned mobile access product) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of the product relationship, such as [bundled] if the product is a bundle and you want to describe the bundled products inside this bundle; [reliesOn] if the product needs another already owned product to rely on (e.g. an option on an already owned mobile access product) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful")
-      @NotNull
-
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public ProductRelationship product(ProductRefOrValue product) {
-    this.product = product;
-    return this;
-  }
-
-  /**
-   * Get product
-   * @return product
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public ProductRefOrValue getProduct() {
-    return product;
-  }
-
-  public void setProduct(ProductRefOrValue product) {
-    this.product = product;
-  }
-
-  public ProductRelationship baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductRelationship schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductRelationship type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductRelationship productRelationship = (ProductRelationship) o;
-    return Objects.equals(this.relationshipType, productRelationship.relationshipType) &&
-        Objects.equals(this.product, productRelationship.product) &&
-        Objects.equals(this.baseType, productRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, productRelationship.schemaLocation) &&
-        Objects.equals(this.type, productRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(relationshipType, product, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductRelationship {\n");
-    
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    product: ").append(toIndentedString(product)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductSpecificationRef.java
deleted file mode 100644
index 02b30f6eabf04b7f5d1bc2ca9f68285d6f25a260..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductSpecificationRef.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Product specification reference: A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.
- */
-@Schema(description = "Product specification reference: A ProductSpecification is a detailed description of a tangible or intangible object made available externally in the form of a ProductOffering to customers or other parties playing a party role.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductSpecificationRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("version")
-  private String version = null;
-
-  @JsonProperty("targetProductSchema")
-  private TargetProductSchema targetProductSchema = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductSpecificationRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductSpecificationRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductSpecificationRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductSpecificationRef version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Version of the product specification
-   * @return version
-  **/
-  @Schema(description = "Version of the product specification")
-  
-    public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ProductSpecificationRef targetProductSchema(TargetProductSchema targetProductSchema) {
-    this.targetProductSchema = targetProductSchema;
-    return this;
-  }
-
-  /**
-   * Get targetProductSchema
-   * @return targetProductSchema
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TargetProductSchema getTargetProductSchema() {
-    return targetProductSchema;
-  }
-
-  public void setTargetProductSchema(TargetProductSchema targetProductSchema) {
-    this.targetProductSchema = targetProductSchema;
-  }
-
-  public ProductSpecificationRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductSpecificationRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductSpecificationRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public ProductSpecificationRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductSpecificationRef productSpecificationRef = (ProductSpecificationRef) o;
-    return Objects.equals(this.id, productSpecificationRef.id) &&
-        Objects.equals(this.href, productSpecificationRef.href) &&
-        Objects.equals(this.name, productSpecificationRef.name) &&
-        Objects.equals(this.version, productSpecificationRef.version) &&
-        Objects.equals(this.targetProductSchema, productSpecificationRef.targetProductSchema) &&
-        Objects.equals(this.baseType, productSpecificationRef.baseType) &&
-        Objects.equals(this.schemaLocation, productSpecificationRef.schemaLocation) &&
-        Objects.equals(this.type, productSpecificationRef.type) &&
-        Objects.equals(this._atReferredType, productSpecificationRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, version, targetProductSchema, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductSpecificationRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    targetProductSchema: ").append(toIndentedString(targetProductSchema)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductStatusType.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductStatusType.java
deleted file mode 100644
index a5717e066d0c3717710f46a6e3990c226d98c1c4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductStatusType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the status of the product
- */
-public enum ProductStatusType {
-  CREATED("created"),
-    PENDINGACTIVE("pendingActive"),
-    CANCELLED("cancelled"),
-    ACTIVE("active"),
-    PENDINGTERMINATE("pendingTerminate"),
-    TERMINATED("terminated"),
-    SUSPENDED("suspended"),
-    ABORTED_("aborted ");
-
-  private String value;
-
-  ProductStatusType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ProductStatusType fromValue(String text) {
-    for (ProductStatusType b : ProductStatusType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/ProductTerm.java b/src/main/java/org/etsi/osl/tmf/po622/model/ProductTerm.java
deleted file mode 100644
index b43c08941c5fb2b816d01bad7edbc5b845e2edd5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/ProductTerm.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Quantity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Description of a productTerm linked to this product. This represent a commitment with a duration
- */
-@Schema(description = "Description of a productTerm linked to this product. This represent a commitment with a duration")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class ProductTerm   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("duration")
-  private Quantity duration = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ProductTerm description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the productTerm
-   * @return description
-  **/
-  @Schema(description = "Description of the productTerm")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ProductTerm name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the productTerm
-   * @return name
-  **/
-  @Schema(description = "Name of the productTerm")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ProductTerm duration(Quantity duration) {
-    this.duration = duration;
-    return this;
-  }
-
-  /**
-   * Get duration
-   * @return duration
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Quantity getDuration() {
-    return duration;
-  }
-
-  public void setDuration(Quantity duration) {
-    this.duration = duration;
-  }
-
-  public ProductTerm validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ProductTerm baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ProductTerm schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ProductTerm type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductTerm productTerm = (ProductTerm) o;
-    return Objects.equals(this.description, productTerm.description) &&
-        Objects.equals(this.name, productTerm.name) &&
-        Objects.equals(this.duration, productTerm.duration) &&
-        Objects.equals(this.validFor, productTerm.validFor) &&
-        Objects.equals(this.baseType, productTerm.baseType) &&
-        Objects.equals(this.schemaLocation, productTerm.schemaLocation) &&
-        Objects.equals(this.type, productTerm.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, duration, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductTerm {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    duration: ").append(toIndentedString(duration)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/QuoteItemRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/QuoteItemRef.java
deleted file mode 100644
index 9ce513c9081d879f26f86c1967208918a531ed3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/QuoteItemRef.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * It&#x27;s a Quote item that has been executed previously.
- */
-@Schema(description = "It's a Quote item that has been executed previously.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class QuoteItemRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("quoteHref")
-  private String quoteHref = null;
-
-  @JsonProperty("quoteId")
-  private String quoteId = null;
-
-  @JsonProperty("quoteName")
-  private String quoteName = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public QuoteItemRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of an item of a quote
-   * @return id
-  **/
-  @Schema(description = "Id of an item of a quote")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public QuoteItemRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public QuoteItemRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public QuoteItemRef quoteHref(String quoteHref) {
-    this.quoteHref = quoteHref;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return quoteHref
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getQuoteHref() {
-    return quoteHref;
-  }
-
-  public void setQuoteHref(String quoteHref) {
-    this.quoteHref = quoteHref;
-  }
-
-  public QuoteItemRef quoteId(String quoteId) {
-    this.quoteId = quoteId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return quoteId
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getQuoteId() {
-    return quoteId;
-  }
-
-  public void setQuoteId(String quoteId) {
-    this.quoteId = quoteId;
-  }
-
-  public QuoteItemRef quoteName(String quoteName) {
-    this.quoteName = quoteName;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return quoteName
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getQuoteName() {
-    return quoteName;
-  }
-
-  public void setQuoteName(String quoteName) {
-    this.quoteName = quoteName;
-  }
-
-  public QuoteItemRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public QuoteItemRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public QuoteItemRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public QuoteItemRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    QuoteItemRef quoteItemRef = (QuoteItemRef) o;
-    return Objects.equals(this.id, quoteItemRef.id) &&
-        Objects.equals(this.href, quoteItemRef.href) &&
-        Objects.equals(this.name, quoteItemRef.name) &&
-        Objects.equals(this.quoteHref, quoteItemRef.quoteHref) &&
-        Objects.equals(this.quoteId, quoteItemRef.quoteId) &&
-        Objects.equals(this.quoteName, quoteItemRef.quoteName) &&
-        Objects.equals(this.baseType, quoteItemRef.baseType) &&
-        Objects.equals(this.schemaLocation, quoteItemRef.schemaLocation) &&
-        Objects.equals(this.type, quoteItemRef.type) &&
-        Objects.equals(this._atReferredType, quoteItemRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, quoteHref, quoteId, quoteName, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class QuoteItemRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    quoteHref: ").append(toIndentedString(quoteHref)).append("\n");
-    sb.append("    quoteId: ").append(toIndentedString(quoteId)).append("\n");
-    sb.append("    quoteName: ").append(toIndentedString(quoteName)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/QuoteRef.java b/src/main/java/org/etsi/osl/tmf/po622/model/QuoteRef.java
deleted file mode 100644
index 39278ba46f5f8c0cb72b4a6e597ced2a8c61dd7d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/QuoteRef.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * It&#x27;s a Quote that has been executed previously
- */
-@Schema(description = "It's a Quote that has been executed previously")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class QuoteRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public QuoteRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public QuoteRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public QuoteRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public QuoteRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public QuoteRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public QuoteRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public QuoteRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    QuoteRef quoteRef = (QuoteRef) o;
-    return Objects.equals(this.id, quoteRef.id) &&
-        Objects.equals(this.href, quoteRef.href) &&
-        Objects.equals(this.name, quoteRef.name) &&
-        Objects.equals(this.baseType, quoteRef.baseType) &&
-        Objects.equals(this.schemaLocation, quoteRef.schemaLocation) &&
-        Objects.equals(this.type, quoteRef.type) &&
-        Objects.equals(this._atReferredType, quoteRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class QuoteRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedChannel.java b/src/main/java/org/etsi/osl/tmf/po622/model/RelatedChannel.java
deleted file mode 100644
index 6b824312249222904d660bb018a256b11e020f9d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedChannel.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Related channel to another entity. May be online web, mobile app, social ,etc.
- */
-@Schema(description = "Related channel to another entity. May be online web, mobile app, social ,etc.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class RelatedChannel   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public RelatedChannel id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public RelatedChannel href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public RelatedChannel name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the channel.
-   * @return name
-  **/
-  @Schema(description = "Name of the channel.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public RelatedChannel role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Role playing by the channel.
-   * @return role
-  **/
-  @Schema(description = "Role playing by the channel.")
-  
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedChannel baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public RelatedChannel schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public RelatedChannel type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public RelatedChannel _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedChannel relatedChannel = (RelatedChannel) o;
-    return Objects.equals(this.id, relatedChannel.id) &&
-        Objects.equals(this.href, relatedChannel.href) &&
-        Objects.equals(this.name, relatedChannel.name) &&
-        Objects.equals(this.role, relatedChannel.role) &&
-        Objects.equals(this.baseType, relatedChannel.baseType) &&
-        Objects.equals(this.schemaLocation, relatedChannel.schemaLocation) &&
-        Objects.equals(this.type, relatedChannel.type) &&
-        Objects.equals(this._atReferredType, relatedChannel._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, role, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedChannel {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedPlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/po622/model/RelatedPlaceRefOrValue.java
deleted file mode 100644
index 36ef6140ce63b69f063dac3326baf0fc4e330319..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedPlaceRefOrValue.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation &amp; @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself
- */
-@Schema(description = "Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation & @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class RelatedPlaceRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public RelatedPlaceRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public RelatedPlaceRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the place
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the place")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public RelatedPlaceRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]
-   * @return name
-  **/
-  @Schema(description = "A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public RelatedPlaceRefOrValue role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Get role
-   * @return role
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedPlaceRefOrValue baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public RelatedPlaceRefOrValue schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public RelatedPlaceRefOrValue type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public RelatedPlaceRefOrValue _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedPlaceRefOrValue relatedPlaceRefOrValue = (RelatedPlaceRefOrValue) o;
-    return Objects.equals(this.id, relatedPlaceRefOrValue.id) &&
-        Objects.equals(this.href, relatedPlaceRefOrValue.href) &&
-        Objects.equals(this.name, relatedPlaceRefOrValue.name) &&
-        Objects.equals(this.role, relatedPlaceRefOrValue.role) &&
-        Objects.equals(this.baseType, relatedPlaceRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, relatedPlaceRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, relatedPlaceRefOrValue.type) &&
-        Objects.equals(this._atReferredType, relatedPlaceRefOrValue._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, role, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedPlaceRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedProductOrderItem.java b/src/main/java/org/etsi/osl/tmf/po622/model/RelatedProductOrderItem.java
deleted file mode 100644
index f9e567e8288d6ab697c2380384911d1a282ed784..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/RelatedProductOrderItem.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * RelatedProductOrderItem (ProductOrder item) .The product order item which triggered product creation/change/termination.
- */
-@Schema(description = "RelatedProductOrderItem (ProductOrder item) .The product order item which triggered product creation/change/termination.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class RelatedProductOrderItem   {
-  @JsonProperty("orderItemAction")
-  private String orderItemAction = null;
-
-  @JsonProperty("orderItemId")
-  private String orderItemId = null;
-
-  @JsonProperty("productOrderHref")
-  private String productOrderHref = null;
-
-  @JsonProperty("productOrderId")
-  private String productOrderId = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public RelatedProductOrderItem orderItemAction(String orderItemAction) {
-    this.orderItemAction = orderItemAction;
-    return this;
-  }
-
-  /**
-   * Action of the order item for this product
-   * @return orderItemAction
-  **/
-  @Schema(description = "Action of the order item for this product")
-  
-    public String getOrderItemAction() {
-    return orderItemAction;
-  }
-
-  public void setOrderItemAction(String orderItemAction) {
-    this.orderItemAction = orderItemAction;
-  }
-
-  public RelatedProductOrderItem orderItemId(String orderItemId) {
-    this.orderItemId = orderItemId;
-    return this;
-  }
-
-  /**
-   * Identifier of the order item where the product was managed
-   * @return orderItemId
-  **/
-  @Schema(description = "Identifier of the order item where the product was managed")
-      @NotNull
-
-    public String getOrderItemId() {
-    return orderItemId;
-  }
-
-  public void setOrderItemId(String orderItemId) {
-    this.orderItemId = orderItemId;
-  }
-
-  public RelatedProductOrderItem productOrderHref(String productOrderHref) {
-    this.productOrderHref = productOrderHref;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return productOrderHref
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getProductOrderHref() {
-    return productOrderHref;
-  }
-
-  public void setProductOrderHref(String productOrderHref) {
-    this.productOrderHref = productOrderHref;
-  }
-
-  public RelatedProductOrderItem productOrderId(String productOrderId) {
-    this.productOrderId = productOrderId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return productOrderId
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getProductOrderId() {
-    return productOrderId;
-  }
-
-  public void setProductOrderId(String productOrderId) {
-    this.productOrderId = productOrderId;
-  }
-
-  public RelatedProductOrderItem role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * role of the product order item for this product
-   * @return role
-  **/
-  @Schema(description = "role of the product order item for this product")
-  
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedProductOrderItem baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public RelatedProductOrderItem schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public RelatedProductOrderItem type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public RelatedProductOrderItem _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedProductOrderItem relatedProductOrderItem = (RelatedProductOrderItem) o;
-    return Objects.equals(this.orderItemAction, relatedProductOrderItem.orderItemAction) &&
-        Objects.equals(this.orderItemId, relatedProductOrderItem.orderItemId) &&
-        Objects.equals(this.productOrderHref, relatedProductOrderItem.productOrderHref) &&
-        Objects.equals(this.productOrderId, relatedProductOrderItem.productOrderId) &&
-        Objects.equals(this.role, relatedProductOrderItem.role) &&
-        Objects.equals(this.baseType, relatedProductOrderItem.baseType) &&
-        Objects.equals(this.schemaLocation, relatedProductOrderItem.schemaLocation) &&
-        Objects.equals(this.type, relatedProductOrderItem.type) &&
-        Objects.equals(this._atReferredType, relatedProductOrderItem._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(orderItemAction, orderItemId, productOrderHref, productOrderId, role, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedProductOrderItem {\n");
-    
-    sb.append("    orderItemAction: ").append(toIndentedString(orderItemAction)).append("\n");
-    sb.append("    orderItemId: ").append(toIndentedString(orderItemId)).append("\n");
-    sb.append("    productOrderHref: ").append(toIndentedString(productOrderHref)).append("\n");
-    sb.append("    productOrderId: ").append(toIndentedString(productOrderId)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/TargetProductSchema.java b/src/main/java/org/etsi/osl/tmf/po622/model/TargetProductSchema.java
deleted file mode 100644
index 34205af02aa50605d33c1a173787219687bb3af8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/TargetProductSchema.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The reference object to the schema and type of target product which is described by product specification
- */
-@Schema(description = "The reference object to the schema and type of target product which is described by product specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-10-30T10:29:21.184964400+02:00[Europe/Athens]")
-public class TargetProductSchema   {
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public TargetProductSchema baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public TargetProductSchema schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing the target product
-   * @return schemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing the target product")
-      @NotNull
-
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public TargetProductSchema type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Class type of the target product
-   * @return type
-  **/
-  @Schema(description = "Class type of the target product")
-      @NotNull
-
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetProductSchema targetProductSchema = (TargetProductSchema) o;
-    return Objects.equals(this.baseType, targetProductSchema.baseType) &&
-        Objects.equals(this.schemaLocation, targetProductSchema.schemaLocation) &&
-        Objects.equals(this.type, targetProductSchema.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetProductSchema {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/po622/model/TaskStateType.java b/src/main/java/org/etsi/osl/tmf/po622/model/TaskStateType.java
deleted file mode 100644
index de78141f9019db2376eb7134c23bd09ff007cc06..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/po622/model/TaskStateType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.po622.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of a task
- */
-public enum TaskStateType {
-  ACKNOWLEDGED("acknowledged"),
-    TERMINATEDWITHERROR("terminatedWithError"),
-    INPROGRESS("inProgress"),
-    DONE("done");
-
-  private String value;
-
-  TaskStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static TaskStateType fromValue(String text) {
-    for (TaskStateType b : TaskStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/prm669/model/Characteristic.java
deleted file mode 100644
index c0ca3cf990a1c82da38ddc388ca43dc04d3e0d72..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/Characteristic.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class Characteristic   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("value")
-  private Any value = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Characteristic name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the characteristic
-   * @return name
-  **/
-  @Schema(description = "Name of the characteristic")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Characteristic valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * Data type of the value of the characteristic
-   * @return valueType
-  **/
-  @Schema(description = "Data type of the value of the characteristic")
-
-
-  public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public Characteristic value(Any value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * The value of the characteristic
-   * @return value
-  **/
-  @Schema(description = "The value of the characteristic")
-  @NotNull
-
-  @Valid
-
-  public Any getValue() {
-    return value;
-  }
-
-  public void setValue(Any value) {
-    this.value = value;
-  }
-
-  public Characteristic baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Characteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Characteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Characteristic characteristic = (Characteristic) o;
-    return Objects.equals(this.name, characteristic.name) &&
-        Objects.equals(this.valueType, characteristic.valueType) &&
-        Objects.equals(this.value, characteristic.value) &&
-        Objects.equals(this.baseType, characteristic.baseType) &&
-        Objects.equals(this.schemaLocation, characteristic.schemaLocation) &&
-        Objects.equals(this.type, characteristic.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, valueType, value, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Characteristic {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/ContactMedium.java b/src/main/java/org/etsi/osl/tmf/prm669/model/ContactMedium.java
deleted file mode 100644
index 8497c7ff506c81c7ec415b767e9ac94727d9a792..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/ContactMedium.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Indicates the contact medium that could be used to contact the party.
- */
-@Schema(description = "Indicates the contact medium that could be used to contact the party.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class ContactMedium   {
-  @JsonProperty("mediumType")
-  private String mediumType = null;
-
-  @JsonProperty("preferred")
-  private Boolean preferred = null;
-
-  @JsonProperty("characteristic")
-  private MediumCharacteristic characteristic = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ContactMedium mediumType(String mediumType) {
-    this.mediumType = mediumType;
-    return this;
-  }
-
-  /**
-   * Type of the contact medium, such as: email address, telephone number, postal address
-   * @return mediumType
-  **/
-  @Schema(description = "Type of the contact medium, such as: email address, telephone number, postal address")
-  @NotNull
-
-
-  public String getMediumType() {
-    return mediumType;
-  }
-
-  public void setMediumType(String mediumType) {
-    this.mediumType = mediumType;
-  }
-
-  public ContactMedium preferred(Boolean preferred) {
-    this.preferred = preferred;
-    return this;
-  }
-
-  /**
-   * If true, indicates that is the preferred contact medium
-   * @return preferred
-  **/
-  @Schema(description = "If true, indicates that is the preferred contact medium")
-
-
-  public Boolean isPreferred() {
-    return preferred;
-  }
-
-  public void setPreferred(Boolean preferred) {
-    this.preferred = preferred;
-  }
-
-  public ContactMedium characteristic(MediumCharacteristic characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  /**
-   * Any additional characteristic(s) of this contact medium
-   * @return characteristic
-  **/
-  @Schema(description = "Any additional characteristic(s) of this contact medium")
-  @NotNull
-
-  @Valid
-
-  public MediumCharacteristic getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(MediumCharacteristic characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public ContactMedium validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the contact medium is valid for
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the contact medium is valid for")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ContactMedium baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ContactMedium schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ContactMedium type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ContactMedium contactMedium = (ContactMedium) o;
-    return Objects.equals(this.mediumType, contactMedium.mediumType) &&
-        Objects.equals(this.preferred, contactMedium.preferred) &&
-        Objects.equals(this.characteristic, contactMedium.characteristic) &&
-        Objects.equals(this.validFor, contactMedium.validFor) &&
-        Objects.equals(this.baseType, contactMedium.baseType) &&
-        Objects.equals(this.schemaLocation, contactMedium.schemaLocation) &&
-        Objects.equals(this.type, contactMedium.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mediumType, preferred, characteristic, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ContactMedium {\n");
-    
-    sb.append("    mediumType: ").append(toIndentedString(mediumType)).append("\n");
-    sb.append("    preferred: ").append(toIndentedString(preferred)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/CreditProfile.java b/src/main/java/org/etsi/osl/tmf/prm669/model/CreditProfile.java
deleted file mode 100644
index de9a143ee47797d9b77a0da7c6e8d5e0487b91cd..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/CreditProfile.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Credit profile for the party (containing credit scoring, ...). By default only the current credit profile  is retrieved. It can be used as a list to give the party credit profiles history, the first one in the list will be the current one.
- */
-@Schema(description = "Credit profile for the party (containing credit scoring, ...). By default only the current credit profile  is retrieved. It can be used as a list to give the party credit profiles history, the first one in the list will be the current one.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class CreditProfile   {
-  @JsonProperty("creditProfileDate")
-  private OffsetDateTime creditProfileDate = null;
-
-  @JsonProperty("creditRiskRating")
-  private Integer creditRiskRating = null;
-
-  @JsonProperty("creditScore")
-  private Integer creditScore = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public CreditProfile creditProfileDate(OffsetDateTime creditProfileDate) {
-    this.creditProfileDate = creditProfileDate;
-    return this;
-  }
-
-  /**
-   * The date the profile was established
-   * @return creditProfileDate
-  **/
-  @Schema(description = "The date the profile was established")
-  @NotNull
-
-  @Valid
-
-  public OffsetDateTime getCreditProfileDate() {
-    return creditProfileDate;
-  }
-
-  public void setCreditProfileDate(OffsetDateTime creditProfileDate) {
-    this.creditProfileDate = creditProfileDate;
-  }
-
-  public CreditProfile creditRiskRating(Integer creditRiskRating) {
-    this.creditRiskRating = creditRiskRating;
-    return this;
-  }
-
-  /**
-   * This is an integer whose value is used to rate the risk
-   * @return creditRiskRating
-  **/
-  @Schema(description = "This is an integer whose value is used to rate the risk")
-
-
-  public Integer getCreditRiskRating() {
-    return creditRiskRating;
-  }
-
-  public void setCreditRiskRating(Integer creditRiskRating) {
-    this.creditRiskRating = creditRiskRating;
-  }
-
-  public CreditProfile creditScore(Integer creditScore) {
-    this.creditScore = creditScore;
-    return this;
-  }
-
-  /**
-   * A measure of a person or organizations creditworthiness calculated on the basis of a combination of factors such as their income and credit history
-   * @return creditScore
-  **/
-  @Schema(description = "A measure of a person or organizations creditworthiness calculated on the basis of a combination of factors such as their income and credit history")
-
-
-  public Integer getCreditScore() {
-    return creditScore;
-  }
-
-  public void setCreditScore(Integer creditScore) {
-    this.creditScore = creditScore;
-  }
-
-  public CreditProfile validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the profile is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the profile is valid")
-  @NotNull
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CreditProfile baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CreditProfile schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CreditProfile type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CreditProfile creditProfile = (CreditProfile) o;
-    return Objects.equals(this.creditProfileDate, creditProfile.creditProfileDate) &&
-        Objects.equals(this.creditRiskRating, creditProfile.creditRiskRating) &&
-        Objects.equals(this.creditScore, creditProfile.creditScore) &&
-        Objects.equals(this.validFor, creditProfile.validFor) &&
-        Objects.equals(this.baseType, creditProfile.baseType) &&
-        Objects.equals(this.schemaLocation, creditProfile.schemaLocation) &&
-        Objects.equals(this.type, creditProfile.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(creditProfileDate, creditRiskRating, creditScore, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CreditProfile {\n");
-    
-    sb.append("    creditProfileDate: ").append(toIndentedString(creditProfileDate)).append("\n");
-    sb.append("    creditRiskRating: ").append(toIndentedString(creditRiskRating)).append("\n");
-    sb.append("    creditScore: ").append(toIndentedString(creditScore)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/prm669/model/EntityRef.java
deleted file mode 100644
index cd7ce4b389cec5f22ddf97d817dae148820d745c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/EntityRef.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public EntityRef schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public EntityRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/Error.java b/src/main/java/org/etsi/osl/tmf/prm669/model/Error.java
deleted file mode 100644
index 270d236c4e27582b1b82616e322b29d078d70896..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscription.java
deleted file mode 100644
index ad26059d8714f578bdf45096dcebb20d39e9920b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscriptionInput.java
deleted file mode 100644
index 3e31831f43b8098ba2293a4df51354e0e3aeb316..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/MediumCharacteristic.java b/src/main/java/org/etsi/osl/tmf/prm669/model/MediumCharacteristic.java
deleted file mode 100644
index a118541fc73d03d6dfe0cb90707bf818b2ef4c65..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/MediumCharacteristic.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)
- */
-@Schema(description = "Describes the contact medium characteristics that could be used to contact a party (an individual or an organization)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class MediumCharacteristic   {
-  @JsonProperty("city")
-  private String city = null;
-
-  @JsonProperty("contactType")
-  private String contactType = null;
-
-  @JsonProperty("country")
-  private String country = null;
-
-  @JsonProperty("emailAddress")
-  private String emailAddress = null;
-
-  @JsonProperty("faxNumber")
-  private String faxNumber = null;
-
-  @JsonProperty("phoneNumber")
-  private String phoneNumber = null;
-
-  @JsonProperty("postCode")
-  private String postCode = null;
-
-  @JsonProperty("socialNetworkId")
-  private String socialNetworkId = null;
-
-  @JsonProperty("stateOrProvince")
-  private String stateOrProvince = null;
-
-  @JsonProperty("street1")
-  private String street1 = null;
-
-  @JsonProperty("street2")
-  private String street2 = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public MediumCharacteristic city(String city) {
-    this.city = city;
-    return this;
-  }
-
-  /**
-   * The city
-   * @return city
-  **/
-  @Schema(description = "The city")
-
-
-  public String getCity() {
-    return city;
-  }
-
-  public void setCity(String city) {
-    this.city = city;
-  }
-
-  public MediumCharacteristic contactType(String contactType) {
-    this.contactType = contactType;
-    return this;
-  }
-
-  /**
-   * The type of contact, for example: phone number such as mobile, fixed home, fixed office. postal address such as shipping instalation…
-   * @return contactType
-  **/
-  @Schema(description = "The type of contact, for example: phone number such as mobile, fixed home, fixed office. postal address such as shipping instalation…")
-
-
-  public String getContactType() {
-    return contactType;
-  }
-
-  public void setContactType(String contactType) {
-    this.contactType = contactType;
-  }
-
-  public MediumCharacteristic country(String country) {
-    this.country = country;
-    return this;
-  }
-
-  /**
-   * The country
-   * @return country
-  **/
-  @Schema(description = "The country")
-
-
-  public String getCountry() {
-    return country;
-  }
-
-  public void setCountry(String country) {
-    this.country = country;
-  }
-
-  public MediumCharacteristic emailAddress(String emailAddress) {
-    this.emailAddress = emailAddress;
-    return this;
-  }
-
-  /**
-   * Full email address in standard format
-   * @return emailAddress
-  **/
-  @Schema(description = "Full email address in standard format")
-
-
-  public String getEmailAddress() {
-    return emailAddress;
-  }
-
-  public void setEmailAddress(String emailAddress) {
-    this.emailAddress = emailAddress;
-  }
-
-  public MediumCharacteristic faxNumber(String faxNumber) {
-    this.faxNumber = faxNumber;
-    return this;
-  }
-
-  /**
-   * The fax number of the contact
-   * @return faxNumber
-  **/
-  @Schema(description = "The fax number of the contact")
-
-
-  public String getFaxNumber() {
-    return faxNumber;
-  }
-
-  public void setFaxNumber(String faxNumber) {
-    this.faxNumber = faxNumber;
-  }
-
-  public MediumCharacteristic phoneNumber(String phoneNumber) {
-    this.phoneNumber = phoneNumber;
-    return this;
-  }
-
-  /**
-   * The primary phone number of the contact
-   * @return phoneNumber
-  **/
-  @Schema(description = "The primary phone number of the contact")
-
-
-  public String getPhoneNumber() {
-    return phoneNumber;
-  }
-
-  public void setPhoneNumber(String phoneNumber) {
-    this.phoneNumber = phoneNumber;
-  }
-
-  public MediumCharacteristic postCode(String postCode) {
-    this.postCode = postCode;
-    return this;
-  }
-
-  /**
-   * Postcode
-   * @return postCode
-  **/
-  @Schema(description = "Postcode")
-
-
-  public String getPostCode() {
-    return postCode;
-  }
-
-  public void setPostCode(String postCode) {
-    this.postCode = postCode;
-  }
-
-  public MediumCharacteristic socialNetworkId(String socialNetworkId) {
-    this.socialNetworkId = socialNetworkId;
-    return this;
-  }
-
-  /**
-   * Identifier as a member of a social network
-   * @return socialNetworkId
-  **/
-  @Schema(description = "Identifier as a member of a social network")
-
-
-  public String getSocialNetworkId() {
-    return socialNetworkId;
-  }
-
-  public void setSocialNetworkId(String socialNetworkId) {
-    this.socialNetworkId = socialNetworkId;
-  }
-
-  public MediumCharacteristic stateOrProvince(String stateOrProvince) {
-    this.stateOrProvince = stateOrProvince;
-    return this;
-  }
-
-  /**
-   * State or province
-   * @return stateOrProvince
-  **/
-  @Schema(description = "State or province")
-
-
-  public String getStateOrProvince() {
-    return stateOrProvince;
-  }
-
-  public void setStateOrProvince(String stateOrProvince) {
-    this.stateOrProvince = stateOrProvince;
-  }
-
-  public MediumCharacteristic street1(String street1) {
-    this.street1 = street1;
-    return this;
-  }
-
-  /**
-   * Describes the street
-   * @return street1
-  **/
-  @Schema(description = "Describes the street")
-
-
-  public String getStreet1() {
-    return street1;
-  }
-
-  public void setStreet1(String street1) {
-    this.street1 = street1;
-  }
-
-  public MediumCharacteristic street2(String street2) {
-    this.street2 = street2;
-    return this;
-  }
-
-  /**
-   * Complementary street description
-   * @return street2
-  **/
-  @Schema(description = "Complementary street description")
-
-
-  public String getStreet2() {
-    return street2;
-  }
-
-  public void setStreet2(String street2) {
-    this.street2 = street2;
-  }
-
-  public MediumCharacteristic baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public MediumCharacteristic schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public MediumCharacteristic type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MediumCharacteristic mediumCharacteristic = (MediumCharacteristic) o;
-    return Objects.equals(this.city, mediumCharacteristic.city) &&
-        Objects.equals(this.contactType, mediumCharacteristic.contactType) &&
-        Objects.equals(this.country, mediumCharacteristic.country) &&
-        Objects.equals(this.emailAddress, mediumCharacteristic.emailAddress) &&
-        Objects.equals(this.faxNumber, mediumCharacteristic.faxNumber) &&
-        Objects.equals(this.phoneNumber, mediumCharacteristic.phoneNumber) &&
-        Objects.equals(this.postCode, mediumCharacteristic.postCode) &&
-        Objects.equals(this.socialNetworkId, mediumCharacteristic.socialNetworkId) &&
-        Objects.equals(this.stateOrProvince, mediumCharacteristic.stateOrProvince) &&
-        Objects.equals(this.street1, mediumCharacteristic.street1) &&
-        Objects.equals(this.street2, mediumCharacteristic.street2) &&
-        Objects.equals(this.baseType, mediumCharacteristic.baseType) &&
-        Objects.equals(this.schemaLocation, mediumCharacteristic.schemaLocation) &&
-        Objects.equals(this.type, mediumCharacteristic.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(city, contactType, country, emailAddress, faxNumber, phoneNumber, postCode, socialNetworkId, stateOrProvince, street1, street2, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MediumCharacteristic {\n");
-    
-    sb.append("    city: ").append(toIndentedString(city)).append("\n");
-    sb.append("    contactType: ").append(toIndentedString(contactType)).append("\n");
-    sb.append("    country: ").append(toIndentedString(country)).append("\n");
-    sb.append("    emailAddress: ").append(toIndentedString(emailAddress)).append("\n");
-    sb.append("    faxNumber: ").append(toIndentedString(faxNumber)).append("\n");
-    sb.append("    phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n");
-    sb.append("    postCode: ").append(toIndentedString(postCode)).append("\n");
-    sb.append("    socialNetworkId: ").append(toIndentedString(socialNetworkId)).append("\n");
-    sb.append("    stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");
-    sb.append("    street1: ").append(toIndentedString(street1)).append("\n");
-    sb.append("    street2: ").append(toIndentedString(street2)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRole.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRole.java
deleted file mode 100644
index db0583cccc103506a61ec66e44adb7d3ed4229ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRole.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.am666.model.AccountRef;
-import org.etsi.osl.tmf.am666.model.PaymentMethodRef;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The part played by a party in a given context.
- */
-@Schema(description = "The part played by a party in a given context.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRole   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("statusReason")
-  private String statusReason = null;
-
-  @JsonProperty("account")
-  @Valid
-  private List<AccountRef> account = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  private List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("creditProfile")
-  @Valid
-  private List<CreditProfile> creditProfile = null;
-
-  @JsonProperty("engagedParty")
-  private RelatedParty engagedParty = null;
-
-  @JsonProperty("paymentMethod")
-  @Valid
-  private List<PaymentMethodRef> paymentMethod = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyRole id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier for PartyRoles
-   * @return id
-  **/
-  @Schema(description = "Unique identifier for PartyRoles")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyRole href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Url used to reference the party role.
-   * @return href
-  **/
-  @Schema(description = "Url used to reference the party role.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyRole name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyRole status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Used to track the lifecycle status of the party role.
-   * @return status
-  **/
-  @Schema(description = "Used to track the lifecycle status of the party role.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public PartyRole statusReason(String statusReason) {
-    this.statusReason = statusReason;
-    return this;
-  }
-
-  /**
-   * A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.
-   * @return statusReason
-  **/
-  @Schema(description = "A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.")
-
-
-  public String getStatusReason() {
-    return statusReason;
-  }
-
-  public void setStatusReason(String statusReason) {
-    this.statusReason = statusReason;
-  }
-
-  public PartyRole account(List<AccountRef> account) {
-    this.account = account;
-    return this;
-  }
-
-  public PartyRole addAccountItem(AccountRef accountItem) {
-    if (this.account == null) {
-      this.account = new ArrayList<>();
-    }
-    this.account.add(accountItem);
-    return this;
-  }
-
-  /**
-   * Get account
-   * @return account
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRef> getAccount() {
-    return account;
-  }
-
-  public void setAccount(List<AccountRef> account) {
-    this.account = account;
-  }
-
-  public PartyRole agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public PartyRole addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public PartyRole characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public PartyRole addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Describes the characteristic of a party role.
-   * @return characteristic
-  **/
-  @Schema(description = "Describes the characteristic of a party role.")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public PartyRole contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public PartyRole addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public PartyRole creditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-    return this;
-  }
-
-  public PartyRole addCreditProfileItem(CreditProfile creditProfileItem) {
-    if (this.creditProfile == null) {
-      this.creditProfile = new ArrayList<>();
-    }
-    this.creditProfile.add(creditProfileItem);
-    return this;
-  }
-
-  /**
-   * Get creditProfile
-   * @return creditProfile
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<CreditProfile> getCreditProfile() {
-    return creditProfile;
-  }
-
-  public void setCreditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-  }
-
-  public PartyRole engagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-    return this;
-  }
-
-  /**
-   * Get engagedParty
-   * @return engagedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public RelatedParty getEngagedParty() {
-    return engagedParty;
-  }
-
-  public void setEngagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-  }
-
-  public PartyRole paymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  public PartyRole addPaymentMethodItem(PaymentMethodRef paymentMethodItem) {
-    if (this.paymentMethod == null) {
-      this.paymentMethod = new ArrayList<>();
-    }
-    this.paymentMethod.add(paymentMethodItem);
-    return this;
-  }
-
-  /**
-   * Get paymentMethod
-   * @return paymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentMethodRef> getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public PartyRole relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyRole addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyRole validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the PartyRole is valid for.
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the PartyRole is valid for.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public PartyRole baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyRole schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyRole type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRole partyRole = (PartyRole) o;
-    return Objects.equals(this.id, partyRole.id) &&
-        Objects.equals(this.href, partyRole.href) &&
-        Objects.equals(this.name, partyRole.name) &&
-        Objects.equals(this.status, partyRole.status) &&
-        Objects.equals(this.statusReason, partyRole.statusReason) &&
-        Objects.equals(this.account, partyRole.account) &&
-        Objects.equals(this.agreement, partyRole.agreement) &&
-        Objects.equals(this.characteristic, partyRole.characteristic) &&
-        Objects.equals(this.contactMedium, partyRole.contactMedium) &&
-        Objects.equals(this.creditProfile, partyRole.creditProfile) &&
-        Objects.equals(this.engagedParty, partyRole.engagedParty) &&
-        Objects.equals(this.paymentMethod, partyRole.paymentMethod) &&
-        Objects.equals(this.relatedParty, partyRole.relatedParty) &&
-        Objects.equals(this.validFor, partyRole.validFor) &&
-        Objects.equals(this.baseType, partyRole.baseType) &&
-        Objects.equals(this.schemaLocation, partyRole.schemaLocation) &&
-        Objects.equals(this.type, partyRole.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, status, statusReason, account, agreement, characteristic, contactMedium, creditProfile, engagedParty, paymentMethod, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRole {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-    sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEvent.java
deleted file mode 100644
index 01f55705bd2367bc4391baa7ebb0bd1e9ca2da3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private PartyRoleAttributeValueChangeEventPayload event = null;
-
-  public PartyRoleAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyRoleAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyRoleAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyRoleAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyRoleAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyRoleAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyRoleAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyRoleAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyRoleAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyRoleAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public PartyRoleAttributeValueChangeEvent event(PartyRoleAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyRoleAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyRoleAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleAttributeValueChangeEvent partyRoleAttributeValueChangeEvent = (PartyRoleAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, partyRoleAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, partyRoleAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, partyRoleAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, partyRoleAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, partyRoleAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, partyRoleAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, partyRoleAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, partyRoleAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyRoleAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, partyRoleAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, partyRoleAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEventPayload.java
deleted file mode 100644
index 3ee09885ebbdde55b219aff199348d41b0550702..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleAttributeValueChangeEventPayload   {
-  @JsonProperty("partyRole")
-  private PartyRole partyRole = null;
-
-  public PartyRoleAttributeValueChangeEventPayload partyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyRole
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyRole getPartyRole() {
-    return partyRole;
-  }
-
-  public void setPartyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleAttributeValueChangeEventPayload partyRoleAttributeValueChangeEventPayload = (PartyRoleAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.partyRole, partyRoleAttributeValueChangeEventPayload.partyRole);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyRole);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    partyRole: ").append(toIndentedString(partyRole)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreate.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreate.java
deleted file mode 100644
index 436574c9e6bca7691ab55647f47bbf53643963f8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreate.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.am666.model.AccountRef;
-import org.etsi.osl.tmf.am666.model.PaymentMethodRef;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The part played by a party in a given context. Skipped properties: id,href
- */
-@Schema(description = "The part played by a party in a given context. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleCreate   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("statusReason")
-  private String statusReason = null;
-
-  @JsonProperty("account")
-  @Valid
-  private List<AccountRef> account = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  private List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("creditProfile")
-  @Valid
-  private List<CreditProfile> creditProfile = null;
-
-  @JsonProperty("engagedParty")
-  private RelatedParty engagedParty = null;
-
-  @JsonProperty("paymentMethod")
-  @Valid
-  private List<PaymentMethodRef> paymentMethod = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyRoleCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyRoleCreate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Used to track the lifecycle status of the party role.
-   * @return status
-  **/
-  @Schema(description = "Used to track the lifecycle status of the party role.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public PartyRoleCreate statusReason(String statusReason) {
-    this.statusReason = statusReason;
-    return this;
-  }
-
-  /**
-   * A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.
-   * @return statusReason
-  **/
-  @Schema(description = "A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.")
-
-
-  public String getStatusReason() {
-    return statusReason;
-  }
-
-  public void setStatusReason(String statusReason) {
-    this.statusReason = statusReason;
-  }
-
-  public PartyRoleCreate account(List<AccountRef> account) {
-    this.account = account;
-    return this;
-  }
-
-  public PartyRoleCreate addAccountItem(AccountRef accountItem) {
-    if (this.account == null) {
-      this.account = new ArrayList<>();
-    }
-    this.account.add(accountItem);
-    return this;
-  }
-
-  /**
-   * Get account
-   * @return account
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRef> getAccount() {
-    return account;
-  }
-
-  public void setAccount(List<AccountRef> account) {
-    this.account = account;
-  }
-
-  public PartyRoleCreate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public PartyRoleCreate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public PartyRoleCreate characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public PartyRoleCreate addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Describes the characteristic of a party role.
-   * @return characteristic
-  **/
-  @Schema(description = "Describes the characteristic of a party role.")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public PartyRoleCreate contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public PartyRoleCreate addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public PartyRoleCreate creditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-    return this;
-  }
-
-  public PartyRoleCreate addCreditProfileItem(CreditProfile creditProfileItem) {
-    if (this.creditProfile == null) {
-      this.creditProfile = new ArrayList<>();
-    }
-    this.creditProfile.add(creditProfileItem);
-    return this;
-  }
-
-  /**
-   * Get creditProfile
-   * @return creditProfile
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<CreditProfile> getCreditProfile() {
-    return creditProfile;
-  }
-
-  public void setCreditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-  }
-
-  public PartyRoleCreate engagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-    return this;
-  }
-
-  /**
-   * Get engagedParty
-   * @return engagedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public RelatedParty getEngagedParty() {
-    return engagedParty;
-  }
-
-  public void setEngagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-  }
-
-  public PartyRoleCreate paymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  public PartyRoleCreate addPaymentMethodItem(PaymentMethodRef paymentMethodItem) {
-    if (this.paymentMethod == null) {
-      this.paymentMethod = new ArrayList<>();
-    }
-    this.paymentMethod.add(paymentMethodItem);
-    return this;
-  }
-
-  /**
-   * Get paymentMethod
-   * @return paymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentMethodRef> getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public PartyRoleCreate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyRoleCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyRoleCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the PartyRole is valid for.
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the PartyRole is valid for.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public PartyRoleCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyRoleCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyRoleCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleCreate partyRoleCreate = (PartyRoleCreate) o;
-    return Objects.equals(this.name, partyRoleCreate.name) &&
-        Objects.equals(this.status, partyRoleCreate.status) &&
-        Objects.equals(this.statusReason, partyRoleCreate.statusReason) &&
-        Objects.equals(this.account, partyRoleCreate.account) &&
-        Objects.equals(this.agreement, partyRoleCreate.agreement) &&
-        Objects.equals(this.characteristic, partyRoleCreate.characteristic) &&
-        Objects.equals(this.contactMedium, partyRoleCreate.contactMedium) &&
-        Objects.equals(this.creditProfile, partyRoleCreate.creditProfile) &&
-        Objects.equals(this.engagedParty, partyRoleCreate.engagedParty) &&
-        Objects.equals(this.paymentMethod, partyRoleCreate.paymentMethod) &&
-        Objects.equals(this.relatedParty, partyRoleCreate.relatedParty) &&
-        Objects.equals(this.validFor, partyRoleCreate.validFor) &&
-        Objects.equals(this.baseType, partyRoleCreate.baseType) &&
-        Objects.equals(this.schemaLocation, partyRoleCreate.schemaLocation) &&
-        Objects.equals(this.type, partyRoleCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, status, statusReason, account, agreement, characteristic, contactMedium, creditProfile, engagedParty, paymentMethod, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-    sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEvent.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEvent.java
deleted file mode 100644
index 4bd8d32624b18ba043bf68baa0214f6fdadde34f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private PartyRoleCreateEventPayload event = null;
-
-  public PartyRoleCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyRoleCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyRoleCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyRoleCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyRoleCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyRoleCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyRoleCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyRoleCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyRoleCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyRoleCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyRoleCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyRoleCreateEvent event(PartyRoleCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyRoleCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyRoleCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleCreateEvent partyRoleCreateEvent = (PartyRoleCreateEvent) o;
-    return Objects.equals(this.id, partyRoleCreateEvent.id) &&
-        Objects.equals(this.href, partyRoleCreateEvent.href) &&
-        Objects.equals(this.eventId, partyRoleCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, partyRoleCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, partyRoleCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, partyRoleCreateEvent.correlationId) &&
-        Objects.equals(this.domain, partyRoleCreateEvent.domain) &&
-        Objects.equals(this.title, partyRoleCreateEvent.title) &&
-        Objects.equals(this.description, partyRoleCreateEvent.description) &&
-        Objects.equals(this.priority, partyRoleCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyRoleCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, partyRoleCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEventPayload.java
deleted file mode 100644
index 4c9b20b93d8887f9d33ddaffeadbee87e7c42f93..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleCreateEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleCreateEventPayload   {
-  @JsonProperty("partyRole")
-  private PartyRole partyRole = null;
-
-  public PartyRoleCreateEventPayload partyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyRole
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyRole getPartyRole() {
-    return partyRole;
-  }
-
-  public void setPartyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleCreateEventPayload partyRoleCreateEventPayload = (PartyRoleCreateEventPayload) o;
-    return Objects.equals(this.partyRole, partyRoleCreateEventPayload.partyRole);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyRole);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleCreateEventPayload {\n");
-    
-    sb.append("    partyRole: ").append(toIndentedString(partyRole)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEvent.java
deleted file mode 100644
index 081ecd9f664facba03bfb15647dc8a5e7e380503..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private PartyRoleDeleteEventPayload event = null;
-
-  public PartyRoleDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyRoleDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyRoleDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyRoleDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyRoleDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyRoleDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyRoleDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyRoleDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyRoleDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyRoleDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyRoleDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyRoleDeleteEvent event(PartyRoleDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyRoleDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyRoleDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleDeleteEvent partyRoleDeleteEvent = (PartyRoleDeleteEvent) o;
-    return Objects.equals(this.id, partyRoleDeleteEvent.id) &&
-        Objects.equals(this.href, partyRoleDeleteEvent.href) &&
-        Objects.equals(this.eventId, partyRoleDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, partyRoleDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, partyRoleDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, partyRoleDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, partyRoleDeleteEvent.domain) &&
-        Objects.equals(this.title, partyRoleDeleteEvent.title) &&
-        Objects.equals(this.description, partyRoleDeleteEvent.description) &&
-        Objects.equals(this.priority, partyRoleDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyRoleDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, partyRoleDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEventPayload.java
deleted file mode 100644
index 709198c9f14834650b503c0276dc138d60048bb4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleDeleteEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleDeleteEventPayload   {
-  @JsonProperty("partyRole")
-  private PartyRole partyRole = null;
-
-  public PartyRoleDeleteEventPayload partyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyRole
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyRole getPartyRole() {
-    return partyRole;
-  }
-
-  public void setPartyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleDeleteEventPayload partyRoleDeleteEventPayload = (PartyRoleDeleteEventPayload) o;
-    return Objects.equals(this.partyRole, partyRoleDeleteEventPayload.partyRole);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyRole);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleDeleteEventPayload {\n");
-    
-    sb.append("    partyRole: ").append(toIndentedString(partyRole)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEvent.java
deleted file mode 100644
index fd5c519794a8985adb1a66c25b2fa380b5b1f1a7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEvent.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private PartyRoleStateChangeEventPayload event = null;
-
-  public PartyRoleStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the resource involved in the event
-   * @return id
-  **/
-  @Schema(description = "Identifier of the resource involved in the event")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public PartyRoleStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the resource involved in the event
-   * @return href
-  **/
-  @Schema(description = "Reference of the resource involved in the event")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public PartyRoleStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public PartyRoleStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public PartyRoleStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public PartyRoleStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public PartyRoleStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public PartyRoleStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public PartyRoleStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explanatory of the event.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public PartyRoleStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public PartyRoleStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public PartyRoleStateChangeEvent event(PartyRoleStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event payload linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event payload linked to the involved resource object")
-
-  @Valid
-
-  public PartyRoleStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(PartyRoleStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleStateChangeEvent partyRoleStateChangeEvent = (PartyRoleStateChangeEvent) o;
-    return Objects.equals(this.id, partyRoleStateChangeEvent.id) &&
-        Objects.equals(this.href, partyRoleStateChangeEvent.href) &&
-        Objects.equals(this.eventId, partyRoleStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, partyRoleStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, partyRoleStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, partyRoleStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, partyRoleStateChangeEvent.domain) &&
-        Objects.equals(this.title, partyRoleStateChangeEvent.title) &&
-        Objects.equals(this.description, partyRoleStateChangeEvent.description) &&
-        Objects.equals(this.priority, partyRoleStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, partyRoleStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, partyRoleStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEventPayload.java
deleted file mode 100644
index db8acc51a106754f88edb9d47b02a6e83dbeb445..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleStateChangeEventPayload.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleStateChangeEventPayload   {
-  @JsonProperty("partyRole")
-  private PartyRole partyRole = null;
-
-  public PartyRoleStateChangeEventPayload partyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return partyRole
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public PartyRole getPartyRole() {
-    return partyRole;
-  }
-
-  public void setPartyRole(PartyRole partyRole) {
-    this.partyRole = partyRole;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleStateChangeEventPayload partyRoleStateChangeEventPayload = (PartyRoleStateChangeEventPayload) o;
-    return Objects.equals(this.partyRole, partyRoleStateChangeEventPayload.partyRole);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(partyRole);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleStateChangeEventPayload {\n");
-    
-    sb.append("    partyRole: ").append(toIndentedString(partyRole)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleUpdate.java b/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleUpdate.java
deleted file mode 100644
index 560acbf57d3d663530af95c02abcb01228744bce..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/PartyRoleUpdate.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.am651.model.AgreementRef;
-import org.etsi.osl.tmf.am666.model.AccountRef;
-import org.etsi.osl.tmf.am666.model.PaymentMethodRef;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The part played by a party in a given context. Skipped properties: id,href
- */
-@Schema(description = "The part played by a party in a given context. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T23:20:50.154+03:00")
-
-public class PartyRoleUpdate   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("statusReason")
-  private String statusReason = null;
-
-  @JsonProperty("account")
-  @Valid
-  private List<AccountRef> account = null;
-
-  @JsonProperty("agreement")
-  @Valid
-  private List<AgreementRef> agreement = null;
-
-  @JsonProperty("characteristic")
-  @Valid
-  private List<Characteristic> characteristic = null;
-
-  @JsonProperty("contactMedium")
-  @Valid
-  private List<ContactMedium> contactMedium = null;
-
-  @JsonProperty("creditProfile")
-  @Valid
-  private List<CreditProfile> creditProfile = null;
-
-  @JsonProperty("engagedParty")
-  private RelatedParty engagedParty = null;
-
-  @JsonProperty("paymentMethod")
-  @Valid
-  private List<PaymentMethodRef> paymentMethod = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public PartyRoleUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which the PartyRole is known and distinguished from other PartyRoles.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public PartyRoleUpdate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Used to track the lifecycle status of the party role.
-   * @return status
-  **/
-  @Schema(description = "Used to track the lifecycle status of the party role.")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public PartyRoleUpdate statusReason(String statusReason) {
-    this.statusReason = statusReason;
-    return this;
-  }
-
-  /**
-   * A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.
-   * @return statusReason
-  **/
-  @Schema(description = "A string providing an explanation on the value of the status lifecycle. For instance if the status is Rejected, statusReason will provide the reason for rejection.")
-
-
-  public String getStatusReason() {
-    return statusReason;
-  }
-
-  public void setStatusReason(String statusReason) {
-    this.statusReason = statusReason;
-  }
-
-  public PartyRoleUpdate account(List<AccountRef> account) {
-    this.account = account;
-    return this;
-  }
-
-  public PartyRoleUpdate addAccountItem(AccountRef accountItem) {
-    if (this.account == null) {
-      this.account = new ArrayList<>();
-    }
-    this.account.add(accountItem);
-    return this;
-  }
-
-  /**
-   * Get account
-   * @return account
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AccountRef> getAccount() {
-    return account;
-  }
-
-  public void setAccount(List<AccountRef> account) {
-    this.account = account;
-  }
-
-  public PartyRoleUpdate agreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-    return this;
-  }
-
-  public PartyRoleUpdate addAgreementItem(AgreementRef agreementItem) {
-    if (this.agreement == null) {
-      this.agreement = new ArrayList<>();
-    }
-    this.agreement.add(agreementItem);
-    return this;
-  }
-
-  /**
-   * Get agreement
-   * @return agreement
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<AgreementRef> getAgreement() {
-    return agreement;
-  }
-
-  public void setAgreement(List<AgreementRef> agreement) {
-    this.agreement = agreement;
-  }
-
-  public PartyRoleUpdate characteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-    return this;
-  }
-
-  public PartyRoleUpdate addCharacteristicItem(Characteristic characteristicItem) {
-    if (this.characteristic == null) {
-      this.characteristic = new ArrayList<>();
-    }
-    this.characteristic.add(characteristicItem);
-    return this;
-  }
-
-  /**
-   * Describes the characteristic of a party role.
-   * @return characteristic
-  **/
-  @Schema(description = "Describes the characteristic of a party role.")
-
-  @Valid
-
-  public List<Characteristic> getCharacteristic() {
-    return characteristic;
-  }
-
-  public void setCharacteristic(List<Characteristic> characteristic) {
-    this.characteristic = characteristic;
-  }
-
-  public PartyRoleUpdate contactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-    return this;
-  }
-
-  public PartyRoleUpdate addContactMediumItem(ContactMedium contactMediumItem) {
-    if (this.contactMedium == null) {
-      this.contactMedium = new ArrayList<>();
-    }
-    this.contactMedium.add(contactMediumItem);
-    return this;
-  }
-
-  /**
-   * Get contactMedium
-   * @return contactMedium
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ContactMedium> getContactMedium() {
-    return contactMedium;
-  }
-
-  public void setContactMedium(List<ContactMedium> contactMedium) {
-    this.contactMedium = contactMedium;
-  }
-
-  public PartyRoleUpdate creditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-    return this;
-  }
-
-  public PartyRoleUpdate addCreditProfileItem(CreditProfile creditProfileItem) {
-    if (this.creditProfile == null) {
-      this.creditProfile = new ArrayList<>();
-    }
-    this.creditProfile.add(creditProfileItem);
-    return this;
-  }
-
-  /**
-   * Get creditProfile
-   * @return creditProfile
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<CreditProfile> getCreditProfile() {
-    return creditProfile;
-  }
-
-  public void setCreditProfile(List<CreditProfile> creditProfile) {
-    this.creditProfile = creditProfile;
-  }
-
-  public PartyRoleUpdate engagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-    return this;
-  }
-
-  /**
-   * Get engagedParty
-   * @return engagedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public RelatedParty getEngagedParty() {
-    return engagedParty;
-  }
-
-  public void setEngagedParty(RelatedParty engagedParty) {
-    this.engagedParty = engagedParty;
-  }
-
-  public PartyRoleUpdate paymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-    return this;
-  }
-
-  public PartyRoleUpdate addPaymentMethodItem(PaymentMethodRef paymentMethodItem) {
-    if (this.paymentMethod == null) {
-      this.paymentMethod = new ArrayList<>();
-    }
-    this.paymentMethod.add(paymentMethodItem);
-    return this;
-  }
-
-  /**
-   * Get paymentMethod
-   * @return paymentMethod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<PaymentMethodRef> getPaymentMethod() {
-    return paymentMethod;
-  }
-
-  public void setPaymentMethod(List<PaymentMethodRef> paymentMethod) {
-    this.paymentMethod = paymentMethod;
-  }
-
-  public PartyRoleUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public PartyRoleUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public PartyRoleUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The time period that the PartyRole is valid for.
-   * @return validFor
-  **/
-  @Schema(description = "The time period that the PartyRole is valid for.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public PartyRoleUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public PartyRoleUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public PartyRoleUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PartyRoleUpdate partyRoleUpdate = (PartyRoleUpdate) o;
-    return Objects.equals(this.name, partyRoleUpdate.name) &&
-        Objects.equals(this.status, partyRoleUpdate.status) &&
-        Objects.equals(this.statusReason, partyRoleUpdate.statusReason) &&
-        Objects.equals(this.account, partyRoleUpdate.account) &&
-        Objects.equals(this.agreement, partyRoleUpdate.agreement) &&
-        Objects.equals(this.characteristic, partyRoleUpdate.characteristic) &&
-        Objects.equals(this.contactMedium, partyRoleUpdate.contactMedium) &&
-        Objects.equals(this.creditProfile, partyRoleUpdate.creditProfile) &&
-        Objects.equals(this.engagedParty, partyRoleUpdate.engagedParty) &&
-        Objects.equals(this.paymentMethod, partyRoleUpdate.paymentMethod) &&
-        Objects.equals(this.relatedParty, partyRoleUpdate.relatedParty) &&
-        Objects.equals(this.validFor, partyRoleUpdate.validFor) &&
-        Objects.equals(this.baseType, partyRoleUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, partyRoleUpdate.schemaLocation) &&
-        Objects.equals(this.type, partyRoleUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, status, statusReason, account, agreement, characteristic, contactMedium, creditProfile, engagedParty, paymentMethod, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PartyRoleUpdate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    statusReason: ").append(toIndentedString(statusReason)).append("\n");
-    sb.append("    account: ").append(toIndentedString(account)).append("\n");
-    sb.append("    agreement: ").append(toIndentedString(agreement)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    contactMedium: ").append(toIndentedString(contactMedium)).append("\n");
-    sb.append("    creditProfile: ").append(toIndentedString(creditProfile)).append("\n");
-    sb.append("    engagedParty: ").append(toIndentedString(engagedParty)).append("\n");
-    sb.append("    paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/prm669/model/RelatedParty.java b/src/main/java/org/etsi/osl/tmf/prm669/model/RelatedParty.java
deleted file mode 100644
index f2a3ab6e6cc946c7913959e016faae0b551718af..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/prm669/model/RelatedParty.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.prm669.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * RelatedParty reference. A related party defines party or party role linked to
- * a specific entity.
- * 
- * From https://engage.tmforum.org/communities/community-home/digestviewer/viewthread?MessageKey=0f5269cd-fe03-4efe-a8e5-064a12bae529&CommunityKey=d543b8ba-9d3a-4121-85ce-5b68e6c31ce5&tab=digestviewer#bm0f5269cd-fe03-4efe-a8e5-064a12bae529
- * 
- * Related Party is intended to provide a reference to either a Party (RelatedParty.role will be blank) or a PartyRole (RelatedParty.role will have the name of the role). Related Party is not in itself a managed entity.
- * If a Party plays multiple roles, there will be a PartyRole (or concrete subclass) for each such role. Suppose John Doe works for H.A.L computers as the communications expert, and H.A.L. uses NXT Communications for its business wireline services. John Doe also has personal cellphone service from NXT for himself and his daughter.
- * So:
-
-    There will be an Individual (subclass of Party) with first name John, last name Doe
-    There will be an Organization (subclass of Party) with name H.A.L.
-    There will be a Customer (subclass of PartyRole) with name John Doe, and the engagedParty for this Customer will be the Individual John Doe
-    There will be a Customer (subclass of PartyRole) with name H.A.L., and the engagedParty for this Customer will be the Organization H.A.L.
-    There will be a PartyRole with name John Doe and role Contact, and the engagedParty for this PartyRole will be the Individual John Doe
-    The Customer H.A.L. will have a RelatedParty that points to the John Doe PartyRole
-    
-    
- */
-@Schema(description = "RelatedParty reference. A related party defines party or party role linked to a specific entity.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "RelatedParty")
-public class RelatedParty extends BaseRootNamedEntity{
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("extendedInfo")
-	private String extendedInfo = null;
-	
-	
-	
-	public RelatedParty() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-	
-	public RelatedParty( RelatedParty rp) {
-		this.name = rp.getName();
-		this.role = rp.getRole();
-		this.referredType = rp.getReferredType();
-		this.id = rp.getId();
-	}
-	
-	public RelatedParty id(String id) {
-		this.id = id;
-		return this;
-	}
-	
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	
-	public RelatedParty role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * Role of the related party.
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "Role of the related party.")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	
-	public RelatedParty referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-	
-	
-
-	/**
-	 * @return the extendedInfo
-	 */
-	public String getExtendedInfo() {
-		return extendedInfo;
-	}
-
-	/**
-	 * @param extendedInfo the extendedInfo to set
-	 */
-	public void setExtendedInfo(String extendedInfo) {
-		this.extendedInfo = extendedInfo;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		RelatedParty relatedParty = (RelatedParty) o;
-		return Objects.equals(this.id, relatedParty.id) && Objects.equals(this.href, relatedParty.href)
-				&& Objects.equals(this.name, relatedParty.name) && Objects.equals(this.role, relatedParty.role)
-				&& Objects.equals(this.baseType, relatedParty.baseType)
-				&& Objects.equals(this.schemaLocation, relatedParty.schemaLocation)
-				&& Objects.equals(this.type, relatedParty.type)
-				&& Objects.equals(this.referredType, relatedParty.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, role, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class RelatedParty {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    extendedInfo: ").append(toIndentedString(extendedInfo)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionPointSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionPointSpecificationRef.java
deleted file mode 100644
index 3e59061787124b20e8d95c8140c7185eb77e9fbc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionPointSpecificationRef.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Connection point specification reference. A connection point provides a
- * service access point (SAP) for input and/or output of the resource function.
- */
-@Schema(description = "Connection point specification reference. A connection point provides a service access point (SAP) for input and/or output of the resource function.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "ConnectionPointSpecRef")
-public class ConnectionPointSpecificationRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public ConnectionPointSpecificationRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	@NotNull
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public ConnectionPointSpecificationRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ConnectionPointSpecificationRef name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the related entity.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the related entity.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ConnectionPointSpecificationRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Connection point specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Connection point specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-
-	public ConnectionPointSpecificationRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ConnectionPointSpecificationRef connectionPointSpecificationRef = (ConnectionPointSpecificationRef) o;
-		return Objects.equals(this.id, connectionPointSpecificationRef.id)
-				&& Objects.equals(this.href, connectionPointSpecificationRef.href)
-				&& Objects.equals(this.name, connectionPointSpecificationRef.name)
-				&& Objects.equals(this.version, connectionPointSpecificationRef.version)
-				&& Objects.equals(this.baseType, connectionPointSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, connectionPointSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, connectionPointSpecificationRef.type)
-				&& Objects.equals(this._atReferredType, connectionPointSpecificationRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, version, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ConnectionPointSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionSpecification.java
deleted file mode 100644
index ac8ee63de50b01944ff0b03198e5efc9a3b46950..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConnectionSpecification.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A specification for an edge in a resource graph.
- */
-@Schema(description = "A specification for an edge in a resource graph.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "ConnectionSpec")
-public class ConnectionSpecification extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("associationType")
-	private String associationType = null;
-
-	@JsonProperty("endpointSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<EndpointSpecificationRef> endpointSpecification = new HashSet<>();
-
-	public ConnectionSpecification id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier for graph edge specification.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier for graph edge specification.")
-
-
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	public ConnectionSpecification href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ConnectionSpecification associationType(String associationType) {
-		this.associationType = associationType;
-		return this;
-	}
-
-	/**
-	 * Association type.
-	 * 
-	 * @return associationType
-	 **/
-	@Schema(description = "Association type.")
-	@NotNull
-
-	public String getAssociationType() {
-		return associationType;
-	}
-
-	public void setAssociationType(String associationType) {
-		this.associationType = associationType;
-	}
-
-	public ConnectionSpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Descriptive name for graph edge specification.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Descriptive name for graph edge specification.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ConnectionSpecification endpointSpecification(Set<EndpointSpecificationRef> endpointSpecification) {
-		this.endpointSpecification = endpointSpecification;
-		return this;
-	}
-
-	public ConnectionSpecification addEndpointSpecificationItem(EndpointSpecificationRef endpointSpecificationItem) {
-		this.endpointSpecification.add(endpointSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * Specifications for resource graph vertices connected by this edge.
-	 * 
-	 * @return endpointSpecification
-	 **/
-	@Schema(description = "Specifications for resource graph vertices connected by this edge.")
-	@NotNull
-	@Valid
-	@Size(min = 1)
-	public Set<EndpointSpecificationRef> getEndpointSpecification() {
-		return endpointSpecification;
-	}
-
-	public void setEndpointSpecification( Set<EndpointSpecificationRef> endpointSpecification) {
-		this.endpointSpecification = endpointSpecification;
-	}
-
-	public ConnectionSpecification _atBaseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-	}
-
-	public ConnectionSpecification _atSchemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-	}
-
-	public ConnectionSpecification _atType(String _atType) {
-		this.type = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class Extensible name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String _atType) {
-		this.type = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ConnectionSpecification connectionSpecification = (ConnectionSpecification) o;
-		return Objects.equals(this.id, connectionSpecification.id)
-				&& Objects.equals(this.href, connectionSpecification.href)
-				&& Objects.equals(this.associationType, connectionSpecification.associationType)
-				&& Objects.equals(this.name, connectionSpecification.name)
-				&& Objects.equals(this.endpointSpecification, connectionSpecification.endpointSpecification)
-				&& Objects.equals(this.baseType, connectionSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, connectionSpecification.schemaLocation)
-				&& Objects.equals(this.type, connectionSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, associationType, name, endpointSpecification, baseType, schemaLocation,
-				type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ConnectionSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    associationType: ").append(toIndentedString(associationType)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    endpointSpecification: ").append(toIndentedString(endpointSpecification)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConstraintRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ConstraintRef.java
deleted file mode 100644
index c442dab8158dcf9463f2fe8e9d7b9b352b2254e3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ConstraintRef.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.
- */
-@Schema(description = "Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMConstraintRef")
-@Table(name = "RCMConstraintRef")
-public class ConstraintRef extends BaseRootNamedEntity  {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("version")
-  private String version = null;
-
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ConstraintRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * reference id to the target constraint
-   * @return id
-  **/
-  @Schema(description = "reference id to the target constraint")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ConstraintRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference to the target constraint
-   * @return href
-  **/
-  @Schema(description = "Hyperlink reference to the target constraint")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ConstraintRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name given to the constraint
-   * @return name
-  **/
-  @Schema(description = "Name given to the constraint")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ConstraintRef version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * constraint version
-   * @return version
-  **/
-  @Schema(description = "constraint version")
-  
-    public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  
-
-  public ConstraintRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The (class) type of the referred constraint
-   * @return _atReferredType
-  **/
-  @Schema(description = "The (class) type of the referred constraint")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ConstraintRef constraintRef = (ConstraintRef) o;
-    return Objects.equals(this.id, constraintRef.id) &&
-        Objects.equals(this.href, constraintRef.href) &&
-        Objects.equals(this.name, constraintRef.name) &&
-        Objects.equals(this.version, constraintRef.version) &&
-        Objects.equals(this.baseType, constraintRef.baseType) &&
-        Objects.equals(this.schemaLocation, constraintRef.schemaLocation) &&
-        Objects.equals(this.type, constraintRef.type) &&
-        Objects.equals(this._atReferredType, constraintRef._atReferredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ConstraintRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/EndpointSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/EndpointSpecificationRef.java
deleted file mode 100644
index 5ed410371449463109f3674f1bce547252fcb7da..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/EndpointSpecificationRef.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A specification for a vertex in a resource graph.
- */
-@Schema(description = "A specification for a vertex in a resource graph.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "EndpointSpecRef")
-public class EndpointSpecificationRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("isRoot")
-	private Boolean isRoot = true;
-
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("connectionPointSpecification")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private ConnectionPointSpecificationRef connectionPointSpecification = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public EndpointSpecificationRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	@NotNull
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public EndpointSpecificationRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public EndpointSpecificationRef isRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-		return this;
-	}
-
-	/**
-	 * Directionality: true when endpoint is a source, false when a sink. If true
-	 * for all endpoints connectivity is bidirectional. Default is true.
-	 * 
-	 * @return isRoot
-	 **/
-	@Schema(description = "Directionality: true when endpoint is a source, false when a sink. If true for all endpoints connectivity is bidirectional. Default is true.")
-
-	public Boolean isIsRoot() {
-		return isRoot;
-	}
-
-	public void setIsRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-	}
-
-	public EndpointSpecificationRef name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the related entity.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the related entity.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public EndpointSpecificationRef role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * Role of the Resource Function.
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "Role of the Resource Function.")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public EndpointSpecificationRef connectionPointSpecification(
-			ConnectionPointSpecificationRef connectionPointSpecification) {
-		this.connectionPointSpecification = connectionPointSpecification;
-		return this;
-	}
-
-	/**
-	 * Get connectionPointSpecification
-	 * 
-	 * @return connectionPointSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ConnectionPointSpecificationRef getConnectionPointSpecification() {
-		return connectionPointSpecification;
-	}
-
-	public void setConnectionPointSpecification(ConnectionPointSpecificationRef connectionPointSpecification) {
-		this.connectionPointSpecification = connectionPointSpecification;
-	}
-
-
-	public EndpointSpecificationRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EndpointSpecificationRef endpointSpecificationRef = (EndpointSpecificationRef) o;
-		return Objects.equals(this.id, endpointSpecificationRef.id)
-				&& Objects.equals(this.href, endpointSpecificationRef.href)
-				&& Objects.equals(this.isRoot, endpointSpecificationRef.isRoot)
-				&& Objects.equals(this.name, endpointSpecificationRef.name)
-				&& Objects.equals(this.role, endpointSpecificationRef.role)
-				&& Objects.equals(this.connectionPointSpecification,
-						endpointSpecificationRef.connectionPointSpecification)
-				&& Objects.equals(this.baseType, endpointSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, endpointSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, endpointSpecificationRef.type)
-				&& Objects.equals(this._atReferredType, endpointSpecificationRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, isRoot, name, role, connectionPointSpecification, baseType, schemaLocation,
-				type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class EndpointSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    connectionPointSpecification: ").append(toIndentedString(connectionPointSpecification))
-				.append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/EntityRef.java
deleted file mode 100644
index 50148c1d46ad2fe56418a1d20e5770ab150840d0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/EntityRef.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-@Entity(name = "RCMEntityRef")
-@Table(name = "RCMEntityRef")
-public class EntityRef  extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public EntityRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.baseType, entityRef.baseType) &&
-        Objects.equals(this.schemaLocation, entityRef.schemaLocation) &&
-        Objects.equals(this.type, entityRef.type) &&
-        Objects.equals(this._atReferredType, entityRef._atReferredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/Error.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/Error.java
deleted file mode 100644
index 67d1cbbb50d593e9d30d077b5c9925db4b0022d5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/Error.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public Error _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public Error _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this._atBaseType, error._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, error._atSchemaLocation) &&
-        Objects.equals(this._atType, error._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscription.java
deleted file mode 100644
index 3940f251ff67372c9f7a1752d9e5452de12599b0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscription.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscriptionInput.java
deleted file mode 100644
index d5bb058596884c3e8837058ccb7b44948804068b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJob.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJob.java
deleted file mode 100644
index 515cfe37a33dd308e4c3876412bc79a325220e01..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJob.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to export resources to a file
- */
-@Schema(description = "Represents a task used to export resources to a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ExportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the export job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the export job")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the export job
-   * @return href
-  **/
-  @Schema(description = "Reference of the export job")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ExportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-  
-    public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-  
-    @Valid
-    public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-  
-    public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-  
-    public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJob query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-  
-    public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJob status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ExportJob _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ExportJob _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ExportJob _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJob exportJob = (ExportJob) o;
-    return Objects.equals(this.id, exportJob.id) &&
-        Objects.equals(this.href, exportJob.href) &&
-        Objects.equals(this.completionDate, exportJob.completionDate) &&
-        Objects.equals(this.contentType, exportJob.contentType) &&
-        Objects.equals(this.creationDate, exportJob.creationDate) &&
-        Objects.equals(this.errorLog, exportJob.errorLog) &&
-        Objects.equals(this.path, exportJob.path) &&
-        Objects.equals(this.query, exportJob.query) &&
-        Objects.equals(this.url, exportJob.url) &&
-        Objects.equals(this.status, exportJob.status) &&
-        Objects.equals(this._atBaseType, exportJob._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, exportJob._atSchemaLocation) &&
-        Objects.equals(this._atType, exportJob._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, query, url, status, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreate.java
deleted file mode 100644
index 7286abe6421d48dc4d1bfc548b8c6649a9ea8265..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreate.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to export resources to a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to export resources to a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ExportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-  
-    public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-  
-    @Valid
-    public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-  
-    public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-  
-    public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJobCreate query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-      @NotNull
-
-    public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJobCreate status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ExportJobCreate _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ExportJobCreate _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ExportJobCreate _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobCreate exportJobCreate = (ExportJobCreate) o;
-    return Objects.equals(this.completionDate, exportJobCreate.completionDate) &&
-        Objects.equals(this.contentType, exportJobCreate.contentType) &&
-        Objects.equals(this.creationDate, exportJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, exportJobCreate.errorLog) &&
-        Objects.equals(this.path, exportJobCreate.path) &&
-        Objects.equals(this.query, exportJobCreate.query) &&
-        Objects.equals(this.url, exportJobCreate.url) &&
-        Objects.equals(this.status, exportJobCreate.status) &&
-        Objects.equals(this._atBaseType, exportJobCreate._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, exportJobCreate._atSchemaLocation) &&
-        Objects.equals(this._atType, exportJobCreate._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, query, url, status, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEvent.java
deleted file mode 100644
index 669d691e68369703c4c47b11dedf0f06551e2ead..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJobCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ExportJobCreateEventPayload event = null;
-
-  public ExportJobCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExportJobCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ExportJobCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ExportJobCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ExportJobCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ExportJobCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ExportJobCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ExportJobCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ExportJobCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ExportJobCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ExportJobCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ExportJobCreateEvent event(ExportJobCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ExportJobCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ExportJobCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobCreateEvent exportJobCreateEvent = (ExportJobCreateEvent) o;
-    return Objects.equals(this.id, exportJobCreateEvent.id) &&
-        Objects.equals(this.href, exportJobCreateEvent.href) &&
-        Objects.equals(this.eventId, exportJobCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, exportJobCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, exportJobCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, exportJobCreateEvent.correlationId) &&
-        Objects.equals(this.domain, exportJobCreateEvent.domain) &&
-        Objects.equals(this.title, exportJobCreateEvent.title) &&
-        Objects.equals(this.description, exportJobCreateEvent.description) &&
-        Objects.equals(this.priority, exportJobCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, exportJobCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, exportJobCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEventPayload.java
deleted file mode 100644
index ca725725840749428f8eb7ecdffcaaf37644aa29..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJobCreateEventPayload   {
-  @JsonProperty("exportJob")
-  private ExportJob exportJob = null;
-
-  public ExportJobCreateEventPayload exportJob(ExportJob exportJob) {
-    this.exportJob = exportJob;
-    return this;
-  }
-
-  /**
-   * Get exportJob
-   * @return exportJob
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ExportJob getExportJob() {
-    return exportJob;
-  }
-
-  public void setExportJob(ExportJob exportJob) {
-    this.exportJob = exportJob;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobCreateEventPayload exportJobCreateEventPayload = (ExportJobCreateEventPayload) o;
-    return Objects.equals(this.exportJob, exportJobCreateEventPayload.exportJob);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(exportJob);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobCreateEventPayload {\n");
-    
-    sb.append("    exportJob: ").append(toIndentedString(exportJob)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEvent.java
deleted file mode 100644
index f87937f75d31c88cae10ff1549c66a233fee6b33..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJobStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ExportJobStateChangeEventPayload event = null;
-
-  public ExportJobStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExportJobStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ExportJobStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ExportJobStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ExportJobStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ExportJobStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ExportJobStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ExportJobStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ExportJobStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ExportJobStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ExportJobStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ExportJobStateChangeEvent event(ExportJobStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ExportJobStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ExportJobStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobStateChangeEvent exportJobStateChangeEvent = (ExportJobStateChangeEvent) o;
-    return Objects.equals(this.id, exportJobStateChangeEvent.id) &&
-        Objects.equals(this.href, exportJobStateChangeEvent.href) &&
-        Objects.equals(this.eventId, exportJobStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, exportJobStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, exportJobStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, exportJobStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, exportJobStateChangeEvent.domain) &&
-        Objects.equals(this.title, exportJobStateChangeEvent.title) &&
-        Objects.equals(this.description, exportJobStateChangeEvent.description) &&
-        Objects.equals(this.priority, exportJobStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, exportJobStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, exportJobStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEventPayload.java
deleted file mode 100644
index 49df85bc60307096ec8f244275f3c1d96e10a09a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ExportJobStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ExportJobStateChangeEventPayload   {
-  @JsonProperty("exportJob")
-  private ExportJob exportJob = null;
-
-  public ExportJobStateChangeEventPayload exportJob(ExportJob exportJob) {
-    this.exportJob = exportJob;
-    return this;
-  }
-
-  /**
-   * Get exportJob
-   * @return exportJob
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ExportJob getExportJob() {
-    return exportJob;
-  }
-
-  public void setExportJob(ExportJob exportJob) {
-    this.exportJob = exportJob;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobStateChangeEventPayload exportJobStateChangeEventPayload = (ExportJobStateChangeEventPayload) o;
-    return Objects.equals(this.exportJob, exportJobStateChangeEventPayload.exportJob);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(exportJob);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobStateChangeEventPayload {\n");
-    
-    sb.append("    exportJob: ").append(toIndentedString(exportJob)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecification.java
deleted file mode 100644
index 5b73ad5eb689a87b51763fbe4bcdc2354e0c8483..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecification.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * Specification for applicable configuration features for a resource
- * specification.
- */
-@Schema(description = "Specification for applicable configuration features for a resource specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMFeatureSpec")
-public class FeatureSpecification extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("isEnabled")
-	private Boolean isEnabled = null;
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("constraint")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConstraintRef> constraint = new HashSet<>();
-
-	@JsonProperty("featureSpecCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<FeatureSpecificationCharacteristic> featureSpecCharacteristic = new HashSet<>();
-
-	@JsonProperty("featureSpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<FeatureSpecificationRelationship> featureSpecRelationship = new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public FeatureSpecification id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Identifier of the feature specification. Must be locally unique within the
-	 * containing resource specification, thus allowing direct access to the feature
-	 * spec.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of the feature specification. Must be locally unique within the containing resource specification, thus allowing direct access to the feature spec.")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public FeatureSpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * A flag indicating if this is a feature group (true) or not (false)
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "A flag indicating if this is a feature group (true) or not (false)")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public FeatureSpecification isEnabled(Boolean isEnabled) {
-		this.isEnabled = isEnabled;
-		return this;
-	}
-
-	/**
-	 * A flag indicating if the feature is enabled (true) or not (false)
-	 * 
-	 * @return isEnabled
-	 **/
-	@Schema(description = "A flag indicating if the feature is enabled (true) or not (false)")
-
-	public Boolean isIsEnabled() {
-		return isEnabled;
-	}
-
-	public void setIsEnabled(Boolean isEnabled) {
-		this.isEnabled = isEnabled;
-	}
-
-	public FeatureSpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Unique name given to the feature specification
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Unique name given to the feature specification")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public FeatureSpecification version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Version of the feature specification
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Version of the feature specification")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public FeatureSpecification constraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public FeatureSpecification addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new HashSet<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of feature constraints
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "This is a list of feature constraints")
-	@Valid
-	public Set<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public FeatureSpecification featureSpecCharacteristic(
-			Set<FeatureSpecificationCharacteristic> featureSpecCharacteristic) {
-		this.featureSpecCharacteristic = featureSpecCharacteristic;
-		return this;
-	}
-
-	public FeatureSpecification addFeatureSpecCharacteristicItem(
-			FeatureSpecificationCharacteristic featureSpecCharacteristicItem) {
-		if (this.featureSpecCharacteristic == null) {
-			this.featureSpecCharacteristic = new HashSet<>();
-		}
-		this.featureSpecCharacteristic.add(featureSpecCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of characteristics for a particular feature
-	 * 
-	 * @return featureSpecCharacteristic
-	 **/
-	@Schema(description = "This is a list of characteristics for a particular feature")
-	@Valid
-	public Set<FeatureSpecificationCharacteristic> getFeatureSpecCharacteristic() {
-		return featureSpecCharacteristic;
-	}
-
-	public void setFeatureSpecCharacteristic(Set<FeatureSpecificationCharacteristic> featureSpecCharacteristic) {
-		this.featureSpecCharacteristic = featureSpecCharacteristic;
-	}
-
-	public FeatureSpecification featureSpecRelationship(
-			Set<FeatureSpecificationRelationship> featureSpecRelationship) {
-		this.featureSpecRelationship = featureSpecRelationship;
-		return this;
-	}
-
-	public FeatureSpecification addFeatureSpecRelationshipItem(
-			FeatureSpecificationRelationship featureSpecRelationshipItem) {
-		if (this.featureSpecRelationship == null) {
-			this.featureSpecRelationship = new HashSet<>();
-		}
-		this.featureSpecRelationship.add(featureSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A dependency, exclusivity or aggratation relationship between/among feature
-	 * specifications.
-	 * 
-	 * @return featureSpecRelationship
-	 **/
-	@Schema(description = "A dependency, exclusivity or aggratation relationship between/among feature specifications.")
-	@Valid
-	public Set<FeatureSpecificationRelationship> getFeatureSpecRelationship() {
-		return featureSpecRelationship;
-	}
-
-	public void setFeatureSpecRelationship(Set<FeatureSpecificationRelationship> featureSpecRelationship) {
-		this.featureSpecRelationship = featureSpecRelationship;
-	}
-
-	public FeatureSpecification validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public FeatureSpecification baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public FeatureSpecification schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public FeatureSpecification type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		FeatureSpecification featureSpecification = (FeatureSpecification) o;
-		return Objects.equals(this.id, featureSpecification.id)
-				&& Objects.equals(this.isBundle, featureSpecification.isBundle)
-				&& Objects.equals(this.isEnabled, featureSpecification.isEnabled)
-				&& Objects.equals(this.name, featureSpecification.name)
-				&& Objects.equals(this.version, featureSpecification.version)
-				&& Objects.equals(this.constraint, featureSpecification.constraint)
-				&& Objects.equals(this.featureSpecCharacteristic, featureSpecification.featureSpecCharacteristic)
-				&& Objects.equals(this.featureSpecRelationship, featureSpecification.featureSpecRelationship)
-				&& Objects.equals(this.validFor, featureSpecification.validFor)
-				&& Objects.equals(this.baseType, featureSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, featureSpecification.schemaLocation)
-				&& Objects.equals(this.type, featureSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, isBundle, isEnabled, name, version, constraint, featureSpecCharacteristic,
-				featureSpecRelationship, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class FeatureSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    featureSpecCharacteristic: ").append(toIndentedString(featureSpecCharacteristic)).append("\n");
-		sb.append("    featureSpecRelationship: ").append(toIndentedString(featureSpecRelationship)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristic.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristic.java
deleted file mode 100644
index 286e347faa618ed4986981d850dd047d9f08bf30..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristic.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Configuration feature characteristic specification.
- */
-@Schema(description = "Configuration feature characteristic specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMFeatureSpecChar")
-public class FeatureSpecificationCharacteristic  extends BaseEntity {
-	@JsonProperty("configurable")
-	private Boolean configurable = null;
-
-	@JsonProperty("extensible")
-	private Boolean extensible = null;
-
-	@JsonProperty("isUnique")
-	private Boolean isUnique = null;
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("featureSpecCharRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<FeatureSpecificationCharacteristicRelationship> featureSpecCharRelationship =new HashSet<>();
-
-	@JsonProperty("featureSpecCharacteristicValue")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<FeatureSpecificationCharacteristicValue> featureSpecCharacteristicValue =new HashSet<>();
-
-
-	public FeatureSpecificationCharacteristic configurable(Boolean configurable) {
-		this.configurable = configurable;
-		return this;
-	}
-
-	/**
-	 * True is the feature is configurable.
-	 * 
-	 * @return configurable
-	 **/
-	@Schema(description = "True is the feature is configurable.")
-
-	public Boolean isConfigurable() {
-		return configurable;
-	}
-
-	public void setConfigurable(Boolean configurable) {
-		this.configurable = configurable;
-	}
-
-	public FeatureSpecificationCharacteristic extensible(Boolean extensible) {
-		this.extensible = extensible;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies that the values for the characteristic can be
-	 * extended by adding new values when instantiating a characteristic for a
-	 * feature.
-	 * 
-	 * @return extensible
-	 **/
-	@Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a feature.")
-
-	public Boolean isExtensible() {
-		return extensible;
-	}
-
-	public void setExtensible(Boolean extensible) {
-		this.extensible = extensible;
-	}
-
-	public FeatureSpecificationCharacteristic isUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies if a value is unique for the specification.
-	 * 
-	 * @return isUnique
-	 **/
-	@Schema(description = "An indicator that specifies if a value is unique for the specification.")
-
-	public Boolean isIsUnique() {
-		return isUnique;
-	}
-
-	public void setIsUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-	}
-
-	public FeatureSpecificationCharacteristic maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on.
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on.")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public FeatureSpecificationCharacteristic minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on.
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on.")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-	public FeatureSpecificationCharacteristic name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * This is the name for the feature charateristic.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "This is the name for the feature charateristic.")
-	@NotNull
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public FeatureSpecificationCharacteristic regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A rule or principle represented in regular expression used to derive the
-	 * value of a characteristic value.
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value.")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public FeatureSpecificationCharacteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on.
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on.")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public FeatureSpecificationCharacteristic featureSpecCharRelationship(
-			Set<FeatureSpecificationCharacteristicRelationship> featureSpecCharRelationship) {
-		this.featureSpecCharRelationship = featureSpecCharRelationship;
-		return this;
-	}
-
-	public FeatureSpecificationCharacteristic addFeatureSpecCharRelationshipItem(
-			FeatureSpecificationCharacteristicRelationship featureSpecCharRelationshipItem) {
-		if (this.featureSpecCharRelationship == null) {
-			this.featureSpecCharRelationship = new HashSet<>();
-		}
-		this.featureSpecCharRelationship.add(featureSpecCharRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * An aggregation, migration, substitution, dependency or exclusivity
-	 * relationship between/among feature characteristics.
-	 * 
-	 * @return featureSpecCharRelationship
-	 **/
-	@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among feature characteristics.")
-	@Valid
-	public Set<FeatureSpecificationCharacteristicRelationship> getFeatureSpecCharRelationship() {
-		return featureSpecCharRelationship;
-	}
-
-	public void setFeatureSpecCharRelationship(
-			Set<FeatureSpecificationCharacteristicRelationship> featureSpecCharRelationship) {
-		this.featureSpecCharRelationship = featureSpecCharRelationship;
-	}
-
-	public FeatureSpecificationCharacteristic featureSpecCharacteristicValue(
-			Set<FeatureSpecificationCharacteristicValue> featureSpecCharacteristicValue) {
-		this.featureSpecCharacteristicValue = featureSpecCharacteristicValue;
-		return this;
-	}
-
-	public FeatureSpecificationCharacteristic addFeatureSpecCharacteristicValueItem(
-			FeatureSpecificationCharacteristicValue featureSpecCharacteristicValueItem) {
-		if (this.featureSpecCharacteristicValue == null) {
-			this.featureSpecCharacteristicValue = new HashSet<>();
-		}
-		this.featureSpecCharacteristicValue.add(featureSpecCharacteristicValueItem);
-		return this;
-	}
-
-	/**
-	 * Used to define a set of attributes, each of which can be assigned to a
-	 * corresponding set of attributes in a FeatureCharacteristic object.
-	 * 
-	 * @return featureSpecCharacteristicValue
-	 **/
-	@Schema(description = "Used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a FeatureCharacteristic object.")
-	@Valid
-	public Set<FeatureSpecificationCharacteristicValue> getFeatureSpecCharacteristicValue() {
-		return featureSpecCharacteristicValue;
-	}
-
-	public void setFeatureSpecCharacteristicValue(
-			Set<FeatureSpecificationCharacteristicValue> featureSpecCharacteristicValue) {
-		this.featureSpecCharacteristicValue = featureSpecCharacteristicValue;
-	}
-
-	public FeatureSpecificationCharacteristic validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	
-
-	public FeatureSpecificationCharacteristic _atValueSchemaLocation(String _atValueSchemaLocation) {
-		this.schemaLocation = _atValueSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * This (optional) field provides a link to the schema describing the value
-	 * type.
-	 * 
-	 * @return _atValueSchemaLocation
-	 **/
-	@Schema(description = "This (optional) field provides a link to the schema describing the value type.")
-
-	public String getAtValueSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtValueSchemaLocation(String _atValueSchemaLocation) {
-		this.schemaLocation = _atValueSchemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		FeatureSpecificationCharacteristic featureSpecificationCharacteristic = (FeatureSpecificationCharacteristic) o;
-		return Objects.equals(this.configurable, featureSpecificationCharacteristic.configurable)
-				&& Objects.equals(this.extensible, featureSpecificationCharacteristic.extensible)
-				&& Objects.equals(this.isUnique, featureSpecificationCharacteristic.isUnique)
-				&& Objects.equals(this.maxCardinality, featureSpecificationCharacteristic.maxCardinality)
-				&& Objects.equals(this.minCardinality, featureSpecificationCharacteristic.minCardinality)
-				&& Objects.equals(this.name, featureSpecificationCharacteristic.name)
-				&& Objects.equals(this.regex, featureSpecificationCharacteristic.regex)
-				&& Objects.equals(this.valueType, featureSpecificationCharacteristic.valueType)
-				&& Objects.equals(this.featureSpecCharRelationship,
-						featureSpecificationCharacteristic.featureSpecCharRelationship)
-				&& Objects.equals(this.featureSpecCharacteristicValue,
-						featureSpecificationCharacteristic.featureSpecCharacteristicValue)
-				&& Objects.equals(this.validFor, featureSpecificationCharacteristic.validFor)
-				&& Objects.equals(this.baseType, featureSpecificationCharacteristic.baseType)
-				&& Objects.equals(this.schemaLocation, featureSpecificationCharacteristic.schemaLocation)
-				&& Objects.equals(this.type, featureSpecificationCharacteristic.type) && Objects
-						.equals(this.schemaLocation, featureSpecificationCharacteristic.schemaLocation);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(configurable, extensible, isUnique, maxCardinality, minCardinality, name, regex, valueType,
-				featureSpecCharRelationship, featureSpecCharacteristicValue, validFor, baseType, schemaLocation,
-				type, schemaLocation);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class FeatureSpecificationCharacteristic {\n");
-
-		sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-		sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-		sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    featureSpecCharRelationship: ").append(toIndentedString(featureSpecCharRelationship))
-				.append("\n");
-		sb.append("    featureSpecCharacteristicValue: ").append(toIndentedString(featureSpecCharacteristicValue))
-				.append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atValueSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicRelationship.java
deleted file mode 100644
index 6512e6d4ab3ccd0a7f722c10114ec9d5c753a3d4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicRelationship.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity relationship between/among FeatureSpecificationCharacteristics.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among FeatureSpecificationCharacteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMFeatureSpecCharRel")
-public class FeatureSpecificationCharacteristicRelationship   extends BaseRootNamedEntity {
-  @JsonProperty("characteristicId")
-  private String characteristicId = null;
-
-  @JsonProperty("featureId")
-  private String featureId = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("resourceSpecificationHref")
-  private String resourceSpecificationHref = null;
-
-  @JsonProperty("resourceSpecificationId")
-  private String resourceSpecificationId = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  public FeatureSpecificationCharacteristicRelationship characteristicId(String characteristicId) {
-    this.characteristicId = characteristicId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the characteristic within the the target feature specification
-   * @return characteristicId
-  **/
-  @Schema(description = "Unique identifier of the characteristic within the the target feature specification")
-  
-    public String getCharacteristicId() {
-    return characteristicId;
-  }
-
-  public void setCharacteristicId(String characteristicId) {
-    this.characteristicId = characteristicId;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship featureId(String featureId) {
-    this.featureId = featureId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the target feature specification within the resource specification.
-   * @return featureId
-  **/
-  @Schema(description = "Unique identifier of the target feature specification within the resource specification.")
-  
-    public String getFeatureId() {
-    return featureId;
-  }
-
-  public void setFeatureId(String featureId) {
-    this.featureId = featureId;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the target characteristic
-   * @return name
-  **/
-  @Schema(description = "Name of the target characteristic")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as aggregation, migration, substitution, dependency, exclusivity
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship such as aggregation, migration, substitution, dependency, exclusivity")
-  
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship resourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference to the resource specification containing the target feature and feature characteristic
-   * @return resourceSpecificationHref
-  **/
-  @Schema(description = "Hyperlink reference to the resource specification containing the target feature and feature characteristic")
-  
-    public String getResourceSpecificationHref() {
-    return resourceSpecificationHref;
-  }
-
-  public void setResourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship resourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the resource specification containing the target feature and feature characteristic
-   * @return resourceSpecificationId
-  **/
-  @Schema(description = "Unique identifier of the resource specification containing the target feature and feature characteristic")
-  
-    public String getResourceSpecificationId() {
-    return resourceSpecificationId;
-  }
-
-  public void setResourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-  }
-
-  public FeatureSpecificationCharacteristicRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FeatureSpecificationCharacteristicRelationship featureSpecificationCharacteristicRelationship = (FeatureSpecificationCharacteristicRelationship) o;
-    return Objects.equals(this.characteristicId, featureSpecificationCharacteristicRelationship.characteristicId) &&
-        Objects.equals(this.featureId, featureSpecificationCharacteristicRelationship.featureId) &&
-        Objects.equals(this.name, featureSpecificationCharacteristicRelationship.name) &&
-        Objects.equals(this.relationshipType, featureSpecificationCharacteristicRelationship.relationshipType) &&
-        Objects.equals(this.resourceSpecificationHref, featureSpecificationCharacteristicRelationship.resourceSpecificationHref) &&
-        Objects.equals(this.resourceSpecificationId, featureSpecificationCharacteristicRelationship.resourceSpecificationId) &&
-        Objects.equals(this.validFor, featureSpecificationCharacteristicRelationship.validFor) &&
-        Objects.equals(this.baseType, featureSpecificationCharacteristicRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, featureSpecificationCharacteristicRelationship.schemaLocation) &&
-        Objects.equals(this.type, featureSpecificationCharacteristicRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(characteristicId, featureId, name, relationshipType, resourceSpecificationHref, resourceSpecificationId, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FeatureSpecificationCharacteristicRelationship {\n");
-    
-    sb.append("    characteristicId: ").append(toIndentedString(characteristicId)).append("\n");
-    sb.append("    featureId: ").append(toIndentedString(featureId)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    resourceSpecificationHref: ").append(toIndentedString(resourceSpecificationHref)).append("\n");
-    sb.append("    resourceSpecificationId: ").append(toIndentedString(resourceSpecificationId)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicValue.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicValue.java
deleted file mode 100644
index d189bdabf8ed0f0f35328f2832f543e462f96963..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationCharacteristicValue.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A number or text that can be assigned to a FeatureSpecificationCharacteristic.
- */
-@Schema(description = "A number or text that can be assigned to a FeatureSpecificationCharacteristic.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMFeatureSpecCharVal")
-public class FeatureSpecificationCharacteristicValue  extends BaseRootEntity {
-	
-  @JsonProperty("isDefault")
-  private Boolean isDefault = null;
-
-  @JsonProperty("rangeInterval")
-  private String rangeInterval = null;
-
-  @JsonProperty("regex")
-  private String regex = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("valueFrom")
-  private Integer valueFrom = null;
-
-  @JsonProperty("valueTo")
-  private Integer valueTo = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("value")
-  private Any value = null;
-
-
-  public FeatureSpecificationCharacteristicValue isDefault(Boolean isDefault) {
-    this.isDefault = isDefault;
-    return this;
-  }
-
-  /**
-   * True if the value is the default value for a characteristic.
-   * @return isDefault
-  **/
-  @Schema(description = "True if the value is the default value for a characteristic.")
-  
-    public Boolean isIsDefault() {
-    return isDefault;
-  }
-
-  public void setIsDefault(Boolean isDefault) {
-    this.isDefault = isDefault;
-  }
-
-  public FeatureSpecificationCharacteristicValue rangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-    return this;
-  }
-
-  /**
-   * Specifies the inclusion or exclusion of the valueFrom and valueTo attributes.
-   * @return rangeInterval
-  **/
-  @Schema(description = "Specifies the inclusion or exclusion of the valueFrom and valueTo attributes.")
-  
-    public String getRangeInterval() {
-    return rangeInterval;
-  }
-
-  public void setRangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-  }
-
-  public FeatureSpecificationCharacteristicValue regex(String regex) {
-    this.regex = regex;
-    return this;
-  }
-
-  /**
-   * A regular expression constraint for given value.
-   * @return regex
-  **/
-  @Schema(description = "A regular expression constraint for given value.")
-  
-    public String getRegex() {
-    return regex;
-  }
-
-  public void setRegex(String regex) {
-    this.regex = regex;
-  }
-
-  public FeatureSpecificationCharacteristicValue unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * A determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values.
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "A determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values.")
-  
-    public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public FeatureSpecificationCharacteristicValue valueFrom(Integer valueFrom) {
-    this.valueFrom = valueFrom;
-    return this;
-  }
-
-  /**
-   * The low range value that a characteristic can take on.
-   * @return valueFrom
-  **/
-  @Schema(description = "The low range value that a characteristic can take on.")
-  
-    public Integer getValueFrom() {
-    return valueFrom;
-  }
-
-  public void setValueFrom(Integer valueFrom) {
-    this.valueFrom = valueFrom;
-  }
-
-  public FeatureSpecificationCharacteristicValue valueTo(Integer valueTo) {
-    this.valueTo = valueTo;
-    return this;
-  }
-
-  /**
-   * The upper range value that a characteristic can take on.
-   * @return valueTo
-  **/
-  @Schema(description = "The upper range value that a characteristic can take on.")
-  
-    public Integer getValueTo() {
-    return valueTo;
-  }
-
-  public void setValueTo(Integer valueTo) {
-    this.valueTo = valueTo;
-  }
-
-  public FeatureSpecificationCharacteristicValue valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * A kind of value that the characteristic value can take on.
-   * @return valueType
-  **/
-  @Schema(description = "A kind of value that the characteristic value can take on.")
-      @NotNull
-
-    public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public FeatureSpecificationCharacteristicValue validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public FeatureSpecificationCharacteristicValue value(Any value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * Get value
-   * @return value
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Any getValue() {
-    return value;
-  }
-
-  public void setValue(Any value) {
-    this.value = value;
-  }
-
-  public FeatureSpecificationCharacteristicValue _atBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-  }
-
-  public FeatureSpecificationCharacteristicValue _atSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-  }
-
-  public FeatureSpecificationCharacteristicValue _atType(String _atType) {
-    this.type = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String _atType) {
-    this.type = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FeatureSpecificationCharacteristicValue featureSpecificationCharacteristicValue = (FeatureSpecificationCharacteristicValue) o;
-    return Objects.equals(this.isDefault, featureSpecificationCharacteristicValue.isDefault) &&
-        Objects.equals(this.rangeInterval, featureSpecificationCharacteristicValue.rangeInterval) &&
-        Objects.equals(this.regex, featureSpecificationCharacteristicValue.regex) &&
-        Objects.equals(this.unitOfMeasure, featureSpecificationCharacteristicValue.unitOfMeasure) &&
-        Objects.equals(this.valueFrom, featureSpecificationCharacteristicValue.valueFrom) &&
-        Objects.equals(this.valueTo, featureSpecificationCharacteristicValue.valueTo) &&
-        Objects.equals(this.valueType, featureSpecificationCharacteristicValue.valueType) &&
-        Objects.equals(this.validFor, featureSpecificationCharacteristicValue.validFor) &&
-        Objects.equals(this.value, featureSpecificationCharacteristicValue.value) &&
-        Objects.equals(this.baseType, featureSpecificationCharacteristicValue.baseType) &&
-        Objects.equals(this.schemaLocation, featureSpecificationCharacteristicValue.schemaLocation) &&
-        Objects.equals(this.type, featureSpecificationCharacteristicValue.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(isDefault, rangeInterval, regex, unitOfMeasure, valueFrom, valueTo, valueType, validFor, value, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FeatureSpecificationCharacteristicValue {\n");
-    
-    sb.append("    isDefault: ").append(toIndentedString(isDefault)).append("\n");
-    sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-    sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-    sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationRelationship.java
deleted file mode 100644
index 0cbc70a1979a599a03397f9a00e73d5b8bcb6109..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/FeatureSpecificationRelationship.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Configuration feature
- */
-@Schema(description = "Configuration feature")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "RCMFeatureSpecRel")
-public class FeatureSpecificationRelationship  extends BaseEntity {
-  @JsonProperty("featureId")
-  private String featureId = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("resourceSpecificationHref")
-  private String resourceSpecificationHref = null;
-
-  @JsonProperty("resourceSpecificationId")
-  private String resourceSpecificationId = null;
-
-
-  public FeatureSpecificationRelationship featureId(String featureId) {
-    this.featureId = featureId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the target feature specification.
-   * @return featureId
-  **/
-  @Schema(description = "Unique identifier of the target feature specification.")
-  
-    public String getFeatureId() {
-    return featureId;
-  }
-
-  public void setFeatureId(String featureId) {
-    this.featureId = featureId;
-  }
-
-  public FeatureSpecificationRelationship name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * This is the name of the target feature specification.
-   * @return name
-  **/
-  @Schema(description = "This is the name of the target feature specification.")
-      @NotNull
-
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public FeatureSpecificationRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * This is the type of the feature specification relationship.
-   * @return relationshipType
-  **/
-  @Schema(description = "This is the type of the feature specification relationship.")
-      @NotNull
-
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public FeatureSpecificationRelationship resourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference to the resource specification containing the target feature
-   * @return resourceSpecificationHref
-  **/
-  @Schema(description = "Hyperlink reference to the resource specification containing the target feature")
-  
-    public String getResourceSpecificationHref() {
-    return resourceSpecificationHref;
-  }
-
-  public void setResourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-  }
-
-  public FeatureSpecificationRelationship resourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the resource specification containing the target feature
-   * @return resourceSpecificationId
-  **/
-  @Schema(description = "Unique identifier of the resource specification containing the target feature")
-  
-    public String getResourceSpecificationId() {
-    return resourceSpecificationId;
-  }
-
-  public void setResourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-  }
-
-  public FeatureSpecificationRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public FeatureSpecificationRelationship _atBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-  }
-
-  public FeatureSpecificationRelationship _atSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-  }
-
-  public FeatureSpecificationRelationship _atType(String _atType) {
-    this.type = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String _atType) {
-    this.type = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FeatureSpecificationRelationship featureSpecificationRelationship = (FeatureSpecificationRelationship) o;
-    return Objects.equals(this.featureId, featureSpecificationRelationship.featureId) &&
-        Objects.equals(this.name, featureSpecificationRelationship.name) &&
-        Objects.equals(this.relationshipType, featureSpecificationRelationship.relationshipType) &&
-        Objects.equals(this.resourceSpecificationHref, featureSpecificationRelationship.resourceSpecificationHref) &&
-        Objects.equals(this.resourceSpecificationId, featureSpecificationRelationship.resourceSpecificationId) &&
-        Objects.equals(this.validFor, featureSpecificationRelationship.validFor) &&
-        Objects.equals(this.baseType, featureSpecificationRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, featureSpecificationRelationship.schemaLocation) &&
-        Objects.equals(this.type, featureSpecificationRelationship.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(featureId, name, relationshipType, resourceSpecificationHref, resourceSpecificationId, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FeatureSpecificationRelationship {\n");
-    
-    sb.append("    featureId: ").append(toIndentedString(featureId)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    resourceSpecificationHref: ").append(toIndentedString(resourceSpecificationHref)).append("\n");
-    sb.append("    resourceSpecificationId: ").append(toIndentedString(resourceSpecificationId)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJob.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJob.java
deleted file mode 100644
index 63c00175ef37e2425d1a1ae9a883af8187f2813e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJob.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to import resources from a file
- */
-@Schema(description = "Represents a task used to import resources from a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ImportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the import job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the import job")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ImportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the import job
-   * @return href
-  **/
-  @Schema(description = "Reference of the import job")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ImportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-  
-    public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-  
-    @Valid
-    public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-  
-    public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-  
-    public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-  
-    public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJob status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ImportJob _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ImportJob _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ImportJob _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJob importJob = (ImportJob) o;
-    return Objects.equals(this.id, importJob.id) &&
-        Objects.equals(this.href, importJob.href) &&
-        Objects.equals(this.completionDate, importJob.completionDate) &&
-        Objects.equals(this.contentType, importJob.contentType) &&
-        Objects.equals(this.creationDate, importJob.creationDate) &&
-        Objects.equals(this.errorLog, importJob.errorLog) &&
-        Objects.equals(this.path, importJob.path) &&
-        Objects.equals(this.url, importJob.url) &&
-        Objects.equals(this.status, importJob.status) &&
-        Objects.equals(this._atBaseType, importJob._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, importJob._atSchemaLocation) &&
-        Objects.equals(this._atType, importJob._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, url, status, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreate.java
deleted file mode 100644
index 2834a71ddab771da0632e65d36a372056c3ceeb1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreate.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to import resources from a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to import resources from a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("status")
-  private JobStateType status = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ImportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-  
-    @Valid
-    public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-  
-    public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-  
-    @Valid
-    public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-  
-    public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-  
-    public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-      @NotNull
-
-    public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJobCreate status(JobStateType status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Get status
-   * @return status
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public JobStateType getStatus() {
-    return status;
-  }
-
-  public void setStatus(JobStateType status) {
-    this.status = status;
-  }
-
-  public ImportJobCreate _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ImportJobCreate _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ImportJobCreate _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobCreate importJobCreate = (ImportJobCreate) o;
-    return Objects.equals(this.completionDate, importJobCreate.completionDate) &&
-        Objects.equals(this.contentType, importJobCreate.contentType) &&
-        Objects.equals(this.creationDate, importJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, importJobCreate.errorLog) &&
-        Objects.equals(this.path, importJobCreate.path) &&
-        Objects.equals(this.url, importJobCreate.url) &&
-        Objects.equals(this.status, importJobCreate.status) &&
-        Objects.equals(this._atBaseType, importJobCreate._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, importJobCreate._atSchemaLocation) &&
-        Objects.equals(this._atType, importJobCreate._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, url, status, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEvent.java
deleted file mode 100644
index 3285e6a250955d2b5d2077231136f0a61c951407..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJobCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ImportJobCreateEventPayload event = null;
-
-  public ImportJobCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ImportJobCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ImportJobCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ImportJobCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ImportJobCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ImportJobCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ImportJobCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ImportJobCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ImportJobCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ImportJobCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ImportJobCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ImportJobCreateEvent event(ImportJobCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ImportJobCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ImportJobCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobCreateEvent importJobCreateEvent = (ImportJobCreateEvent) o;
-    return Objects.equals(this.id, importJobCreateEvent.id) &&
-        Objects.equals(this.href, importJobCreateEvent.href) &&
-        Objects.equals(this.eventId, importJobCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, importJobCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, importJobCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, importJobCreateEvent.correlationId) &&
-        Objects.equals(this.domain, importJobCreateEvent.domain) &&
-        Objects.equals(this.title, importJobCreateEvent.title) &&
-        Objects.equals(this.description, importJobCreateEvent.description) &&
-        Objects.equals(this.priority, importJobCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, importJobCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, importJobCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEventPayload.java
deleted file mode 100644
index e99a2f120db08f8b4f21f9455d4ab301deee6b9e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJobCreateEventPayload   {
-  @JsonProperty("importJob")
-  private ImportJob importJob = null;
-
-  public ImportJobCreateEventPayload importJob(ImportJob importJob) {
-    this.importJob = importJob;
-    return this;
-  }
-
-  /**
-   * Get importJob
-   * @return importJob
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ImportJob getImportJob() {
-    return importJob;
-  }
-
-  public void setImportJob(ImportJob importJob) {
-    this.importJob = importJob;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobCreateEventPayload importJobCreateEventPayload = (ImportJobCreateEventPayload) o;
-    return Objects.equals(this.importJob, importJobCreateEventPayload.importJob);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(importJob);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobCreateEventPayload {\n");
-    
-    sb.append("    importJob: ").append(toIndentedString(importJob)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEvent.java
deleted file mode 100644
index f1ac99aecaf9d1ecd34e32167273ec46917eb688..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJobStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ImportJobStateChangeEventPayload event = null;
-
-  public ImportJobStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ImportJobStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ImportJobStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ImportJobStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ImportJobStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ImportJobStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ImportJobStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ImportJobStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ImportJobStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ImportJobStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ImportJobStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ImportJobStateChangeEvent event(ImportJobStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ImportJobStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ImportJobStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobStateChangeEvent importJobStateChangeEvent = (ImportJobStateChangeEvent) o;
-    return Objects.equals(this.id, importJobStateChangeEvent.id) &&
-        Objects.equals(this.href, importJobStateChangeEvent.href) &&
-        Objects.equals(this.eventId, importJobStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, importJobStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, importJobStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, importJobStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, importJobStateChangeEvent.domain) &&
-        Objects.equals(this.title, importJobStateChangeEvent.title) &&
-        Objects.equals(this.description, importJobStateChangeEvent.description) &&
-        Objects.equals(this.priority, importJobStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, importJobStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, importJobStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEventPayload.java
deleted file mode 100644
index aaf3399083f2b20da4991ff4f6c872a5e467cd73..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ImportJobStateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ImportJobStateChangeEventPayload   {
-  @JsonProperty("importJob")
-  private ImportJob importJob = null;
-
-  public ImportJobStateChangeEventPayload importJob(ImportJob importJob) {
-    this.importJob = importJob;
-    return this;
-  }
-
-  /**
-   * Get importJob
-   * @return importJob
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ImportJob getImportJob() {
-    return importJob;
-  }
-
-  public void setImportJob(ImportJob importJob) {
-    this.importJob = importJob;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobStateChangeEventPayload importJobStateChangeEventPayload = (ImportJobStateChangeEventPayload) o;
-    return Objects.equals(this.importJob, importJobStateChangeEventPayload.importJob);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(importJob);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobStateChangeEventPayload {\n");
-    
-    sb.append("    importJob: ").append(toIndentedString(importJob)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/JobStateType.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/JobStateType.java
deleted file mode 100644
index a68c71b6d094642602b87acd236f2d87119e2124..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/JobStateType.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Valid values for the state of a batch job (e.g. catalog import)
- */
-public enum JobStateType {
-  NOT_STARTED("Not Started"),
-    RUNNING("Running"),
-    SUCCEEDED("Succeeded"),
-    FAILED("Failed");
-
-  private String value;
-
-  JobStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static JobStateType fromValue(String text) {
-    for (JobStateType b : JobStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecification.java
deleted file mode 100644
index cf8d0dd0fb4be2099879cc71df6481a55044b88a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecification.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * This is a base class that is used to define the invariant characteristics and
- * behavior (attributes, methods, constraints, and relationships) of a
- * LogicalResource.
- */
-@Schema(description = "This is a base class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a LogicalResource.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-@Entity(name = "LogicalRspec")
-public class LogicalResourceSpecification extends ResourceSpecification {
-
-	public LogicalResourceSpecification() {
-		super();
-		this.baseType = "ResourceSpecification";
-		this.type = "LogicalResourceSpecification";
-
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationCreate.java
deleted file mode 100644
index d3468e2c89c74e04e90a913e0a53c0c5a4fb1fdd..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationCreate.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class LogicalResourceSpecificationCreate extends LogicalResourceSpecificationUpdate {
-
-	@JsonProperty("@type")
-	private String type = null;
-
-
-	public LogicalResourceSpecificationCreate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		LogicalResourceSpecificationCreate logicalResourceSpecCreate = (LogicalResourceSpecificationCreate) o;
-		return Objects.equals(this.name, logicalResourceSpecCreate.name)
-				&& Objects.equals(this.description, logicalResourceSpecCreate.description)
-				&& Objects.equals(this.type, logicalResourceSpecCreate.type)
-				&& Objects.equals(this.schemaLocation, logicalResourceSpecCreate.schemaLocation)
-				&& Objects.equals(this.baseType, logicalResourceSpecCreate.baseType)
-				&& Objects.equals(this.version, logicalResourceSpecCreate.version)
-				&& Objects.equals(this.validFor, logicalResourceSpecCreate.validFor)
-				&& Objects.equals(this.lifecycleStatus, logicalResourceSpecCreate.lifecycleStatus)
-				&& Objects.equals(this.isBundle, logicalResourceSpecCreate.isBundle)
-				&& Objects.equals(this.category, logicalResourceSpecCreate.category)
-				&& Objects.equals(this.targetResourceSchema, logicalResourceSpecCreate.targetResourceSchema)
-				&& Objects.equals(this.featureSpecification, logicalResourceSpecCreate.featureSpecification)
-				&& Objects.equals(this.attachment, logicalResourceSpecCreate.attachment)
-				&& Objects.equals(this.relatedParty, logicalResourceSpecCreate.relatedParty)
-				&& Objects.equals(this.resourceSpecificationCharacteristic, logicalResourceSpecCreate.resourceSpecificationCharacteristic)
-				&& Objects.equals(this.resourceSpecificationRelationship, logicalResourceSpecCreate.resourceSpecificationRelationship);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor, lastUpdate,
-//				lifecycleStatus, isBundle, category, targetResourceSchema, feature, attachment, relatedParty,
-//				resourceSpecCharacteristic, resourceSpecRelationship);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class LogicalResourceSpecCreate {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecificationCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationUpdate.java
deleted file mode 100644
index 4d2e6699d2c3e931075fe8508e426d8c1b9ed48e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/LogicalResourceSpecificationUpdate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-public class LogicalResourceSpecificationUpdate extends ResourceSpecificationUpdate {
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecification.java
deleted file mode 100644
index 3d7dcf15ce7b9e82b300e7b66f9bc65303eb7255..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecification.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * This is a concrete class that is used to define the invariant characteristics
- * and behavior (attributes, methods, constraints, and relationships) of a
- * PhysicalResource.
- */
-@Schema(description = "This is a concrete class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a PhysicalResource.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-@Entity(name = "PhysicalRspec")
-public class PhysicalResourceSpecification extends ResourceSpecification {
-
-	public PhysicalResourceSpecification() {
-		super();
-		this.baseType = "ResourceSpecification";
-		this.type = "PhysicalResourceSpecification";
-
-	}
-
-	@JsonProperty("model")
-	private String model = null;
-
-
-	@JsonProperty("part")
-	private String part = null;
-
-	@JsonProperty("sku")
-	private String sku = null;
-
-	@JsonProperty("vendor")
-	private String vendor = null;
-
-
-	public PhysicalResourceSpecification model(String model) {
-		this.model = model;
-		return this;
-	}
-
-	/**
-	 * This is a string that represents a manufacturer-allocated number used to
-	 * identify the general type and/or category of the hardware item. This, in
-	 * combination with the Part and the Vendor, identify different types of
-	 * hardware items. The SerialNumber can then be used to differentiate between
-	 * different instances of the same type of hardware item. This is an optional
-	 * attribute.
-	 * 
-	 * @return model
-	 **/
-	@Schema(description = "This is a string that represents a manufacturer-allocated number used to identify the general type and/or category of the hardware item. This, in combination with the Part and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is an optional attribute.")
-
-	public String getModel() {
-		return model;
-	}
-
-	public void setModel(String model) {
-		this.model = model;
-	}
-
-
-	public PhysicalResourceSpecification part(String part) {
-		this.part = part;
-		return this;
-	}
-
-	/**
-	 * This is a string that defines a manufacturer-allocated part number assigned
-	 * by the organization that manufactures the hardware item. This, in combination
-	 * with the Model and the Vendor, identify different types of hardware items.
-	 * The SerialNumber can then be used to differentiate between different
-	 * instances of the same type of hardware item. This is a REQUIRED attribute.
-	 * 
-	 * @return part
-	 **/
-	@Schema(description = "This is a string that defines a manufacturer-allocated part number assigned by the organization that manufactures the hardware item. This, in combination with the Model and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute.")
-
-	public String getPart() {
-		return part;
-	}
-
-	public void setPart(String part) {
-		this.part = part;
-	}
-
-	public PhysicalResourceSpecification sku(String sku) {
-		this.sku = sku;
-		return this;
-	}
-
-	/**
-	 * This is a string that defines the manufacturer-allocated Stock Keeping Unit
-	 * (SKU) number of the hardware item. This is an optional attribute.
-	 * 
-	 * @return sku
-	 **/
-	@Schema(description = "This is a string that defines the manufacturer-allocated Stock Keeping Unit (SKU) number of the hardware item. This is an optional attribute.")
-
-	public String getSku() {
-		return sku;
-	}
-
-	public void setSku(String sku) {
-		this.sku = sku;
-	}
-
-	public PhysicalResourceSpecification vendor(String vendor) {
-		this.vendor = vendor;
-		return this;
-	}
-
-	/**
-	 * This is a string that defines the name of the manufacturer. This, in
-	 * combination with the Model and the Part, identify different types of hardware
-	 * items. The SerialNumber can then be used to differentiate between different
-	 * instances of the same type of hardware item. This is a REQUIRED attribute for
-	 * a physical resource.
-	 * 
-	 * @return vendor
-	 **/
-	@Schema(description = "This is a string that defines the name of the manufacturer. This, in combination with the Model and the Part, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute for a physical resource.")
-
-	public String getVendor() {
-		return vendor;
-	}
-
-	public void setVendor(String vendor) {
-		this.vendor = vendor;
-	}
-
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		PhysicalResourceSpecification physicalResourceSpecification = (PhysicalResourceSpecification) o;
-		return Objects.equals(this.uuid, physicalResourceSpecification.uuid)
-				&& Objects.equals(this.href, physicalResourceSpecification.href)
-				&& Objects.equals(this.category, physicalResourceSpecification.category)
-				&& Objects.equals(this.description, physicalResourceSpecification.description)
-				&& Objects.equals(this.isBundle, physicalResourceSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, physicalResourceSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, physicalResourceSpecification.lifecycleStatus)
-				&& Objects.equals(this.model, physicalResourceSpecification.model)
-				&& Objects.equals(this.name, physicalResourceSpecification.name)
-				&& Objects.equals(this.part, physicalResourceSpecification.part)
-				&& Objects.equals(this.sku, physicalResourceSpecification.sku)
-				&& Objects.equals(this.vendor, physicalResourceSpecification.vendor)
-				&& Objects.equals(this.version, physicalResourceSpecification.version)
-				&& Objects.equals(this.attachment, physicalResourceSpecification.attachment)
-				&& Objects.equals(this.featureSpecification, physicalResourceSpecification.featureSpecification)
-				&& Objects.equals(this.relatedParty, physicalResourceSpecification.relatedParty)
-				&& Objects.equals(this.resourceSpecCharacteristic,
-						physicalResourceSpecification.resourceSpecCharacteristic)
-				&& Objects.equals(this.resourceSpecRelationship, physicalResourceSpecification.resourceSpecRelationship)
-				&& Objects.equals(this.targetResourceSchema, physicalResourceSpecification.targetResourceSchema)
-				&& Objects.equals(this.validFor, physicalResourceSpecification.validFor)
-				&& Objects.equals(this.baseType, physicalResourceSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, physicalResourceSpecification.schemaLocation)
-				&& Objects.equals(this.type, physicalResourceSpecification.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, category, description, isBundle, lastUpdate, lifecycleStatus, model, name, part,
-//				sku, vendor, version, attachment, featureSpecification, relatedParty, resourceSpecCharacteristic,
-//				resourceSpecRelationship, targetResourceSchema, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class PhysicalResourceSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    model: ").append(toIndentedString(model)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    part: ").append(toIndentedString(part)).append("\n");
-		sb.append("    sku: ").append(toIndentedString(sku)).append("\n");
-		sb.append("    vendor: ").append(toIndentedString(vendor)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecCharacteristic: ").append(toIndentedString(resourceSpecCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecRelationship)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationCreate.java
deleted file mode 100644
index 1dfee36b5004e9cac4232502eda2ad8e1577267a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationCreate.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * This is a concrete class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a PhysicalResource. Skipped properties: id,href
- */
-@Schema(description = "This is a concrete class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a PhysicalResource. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-public class PhysicalResourceSpecificationCreate  extends PhysicalResourceSpecificationUpdate {
- 
-  @JsonProperty("@type")
-  private String type = "PhysicalResourceSpecification";
-
-  public PhysicalResourceSpecificationCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PhysicalResourceSpecificationCreate physicalResourceSpecCreate = (PhysicalResourceSpecificationCreate) o;
-    return Objects.equals(this.name, physicalResourceSpecCreate.name) &&
-        Objects.equals(this.description, physicalResourceSpecCreate.description) &&
-        Objects.equals(this.type, physicalResourceSpecCreate.type) &&
-        Objects.equals(this.schemaLocation, physicalResourceSpecCreate.schemaLocation) &&
-        Objects.equals(this.baseType, physicalResourceSpecCreate.baseType) &&
-        Objects.equals(this.version, physicalResourceSpecCreate.version) &&
-        Objects.equals(this.validFor, physicalResourceSpecCreate.validFor) &&
-        Objects.equals(this.lifecycleStatus, physicalResourceSpecCreate.lifecycleStatus) &&
-        Objects.equals(this.isBundle, physicalResourceSpecCreate.isBundle) &&
-        Objects.equals(this.category, physicalResourceSpecCreate.category) &&
-        Objects.equals(this.model, physicalResourceSpecCreate.model) &&
-        Objects.equals(this.part, physicalResourceSpecCreate.part) &&
-        Objects.equals(this.sku, physicalResourceSpecCreate.sku) &&
-        Objects.equals(this.vendor, physicalResourceSpecCreate.vendor) &&
-        Objects.equals(this.targetResourceSchema, physicalResourceSpecCreate.targetResourceSchema) &&
-        Objects.equals(this.featureSpecification, physicalResourceSpecCreate.featureSpecification) &&
-        Objects.equals(this.attachment, physicalResourceSpecCreate.attachment) &&
-        Objects.equals(this.relatedParty, physicalResourceSpecCreate.relatedParty) &&
-        Objects.equals(this.resourceSpecificationCharacteristic, physicalResourceSpecCreate.resourceSpecificationCharacteristic) &&
-        Objects.equals(this.resourceSpecificationRelationship, physicalResourceSpecCreate.resourceSpecificationRelationship);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(name, description, type, _atSchemaLocation, _atBaseType, version, validFor, lastUpdate, lifecycleStatus, isBundle, category, model, part, sku, vendor, place, targetResourceSchema, feature, attachment, relatedParty, resourceSpecCharacteristic, resourceSpecRelationship);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PhysicalResourceSpecCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    model: ").append(toIndentedString(model)).append("\n");
-    sb.append("    part: ").append(toIndentedString(part)).append("\n");
-    sb.append("    sku: ").append(toIndentedString(sku)).append("\n");
-    sb.append("    vendor: ").append(toIndentedString(vendor)).append("\n");
-    sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-    sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    resourceSpecificationCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-    sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationUpdate.java
deleted file mode 100644
index cb3cab8cdbd88959550b62227f89e3d57264dcbe..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/PhysicalResourceSpecificationUpdate.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * This is a concrete class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a PhysicalResource. Skipped properties: id,href,id,href,lastUpdate,@type
- */
-@Schema(description = "This is a concrete class that is used to define the invariant characteristics and behavior (attributes, methods, constraints, and relationships) of a PhysicalResource. Skipped properties: id,href,id,href,lastUpdate,@type")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-public class PhysicalResourceSpecificationUpdate extends ResourceSpecificationUpdate  {
- 
-
-  @JsonProperty("model")
-  protected String model = null;
-
-  @JsonProperty("part")
-  protected String part = null;
-
-  @JsonProperty("sku")
-  protected String sku = null;
-
-  @JsonProperty("vendor")
-  protected String vendor = null;
-
-
-
-  /**
-   * This is a string that represents a manufacturer-allocated number used to identify the general type and/or category of the hardware item. This, in combination with the Part and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is an optional attribute.
-   * @return model
-  **/
-  @Schema(description = "This is a string that represents a manufacturer-allocated number used to identify the general type and/or category of the hardware item. This, in combination with the Part and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is an optional attribute.")
-
-
-  public String getModel() {
-    return model;
-  }
-
-  public void setModel(String model) {
-    this.model = model;
-  }
-
-  public PhysicalResourceSpecificationUpdate part(String part) {
-    this.part = part;
-    return this;
-  }
-
-  /**
-   * This is a string that defines a manufacturer-allocated part number assigned by the organization that manufactures the hardware item. This, in combination with the Model and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute.
-   * @return part
-  **/
-  @Schema(description = "This is a string that defines a manufacturer-allocated part number assigned by the organization that manufactures the hardware item. This, in combination with the Model and the Vendor, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute.")
-
-
-  public String getPart() {
-    return part;
-  }
-
-  public void setPart(String part) {
-    this.part = part;
-  }
-
-  public PhysicalResourceSpecificationUpdate sku(String sku) {
-    this.sku = sku;
-    return this;
-  }
-
-  /**
-   * This is a string that defines the manufacturer-allocated Stock Keeping Unit (SKU) number of the hardware item. This is an optional attribute.
-   * @return sku
-  **/
-  @Schema(description = "This is a string that defines the manufacturer-allocated Stock Keeping Unit (SKU) number of the hardware item. This is an optional attribute.")
-
-
-  public String getSku() {
-    return sku;
-  }
-
-  public void setSku(String sku) {
-    this.sku = sku;
-  }
-
-  public PhysicalResourceSpecificationUpdate vendor(String vendor) {
-    this.vendor = vendor;
-    return this;
-  }
-
-  /**
-   * This is a string that defines the name of the manufacturer. This, in combination with the Model and the Part, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute for a physical resource.
-   * @return vendor
-  **/
-  @Schema(description = "This is a string that defines the name of the manufacturer. This, in combination with the Model and the Part, identify different types of hardware items. The SerialNumber can then be used to differentiate between different instances of the same type of hardware item. This is a REQUIRED attribute for a physical resource.")
-
-
-  public String getVendor() {
-    return vendor;
-  }
-
-  public void setVendor(String vendor) {
-    this.vendor = vendor;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    PhysicalResourceSpecificationUpdate physicalResourceSpecUpdate = (PhysicalResourceSpecificationUpdate) o;
-    return Objects.equals(this.name, physicalResourceSpecUpdate.name) &&
-        Objects.equals(this.description, physicalResourceSpecUpdate.description) &&
-        Objects.equals(this.schemaLocation, physicalResourceSpecUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, physicalResourceSpecUpdate.baseType) &&
-        Objects.equals(this.version, physicalResourceSpecUpdate.version) &&
-        Objects.equals(this.validFor, physicalResourceSpecUpdate.validFor) &&
-        Objects.equals(this.lifecycleStatus, physicalResourceSpecUpdate.lifecycleStatus) &&
-        Objects.equals(this.isBundle, physicalResourceSpecUpdate.isBundle) &&
-        Objects.equals(this.category, physicalResourceSpecUpdate.category) &&
-        Objects.equals(this.model, physicalResourceSpecUpdate.model) &&
-        Objects.equals(this.part, physicalResourceSpecUpdate.part) &&
-        Objects.equals(this.sku, physicalResourceSpecUpdate.sku) &&
-        Objects.equals(this.vendor, physicalResourceSpecUpdate.vendor) &&
-        Objects.equals(this.targetResourceSchema, physicalResourceSpecUpdate.targetResourceSchema) &&
-        Objects.equals(this.featureSpecification, physicalResourceSpecUpdate.featureSpecification) &&
-        Objects.equals(this.attachment, physicalResourceSpecUpdate.attachment) &&
-        Objects.equals(this.relatedParty, physicalResourceSpecUpdate.relatedParty) &&
-        Objects.equals(this.resourceSpecificationCharacteristic, physicalResourceSpecUpdate.resourceSpecificationCharacteristic) &&
-        Objects.equals(this.resourceSpecificationRelationship, physicalResourceSpecUpdate.resourceSpecificationRelationship);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(name, description, _atSchemaLocation, _atBaseType, version, validFor, lifecycleStatus, isBundle, category, model, part, sku, vendor, place, targetResourceSchema, feature, attachment, relatedParty, resourceSpecCharacteristic, resourceSpecRelationship);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class PhysicalResourceSpecUpdate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    model: ").append(toIndentedString(model)).append("\n");
-    sb.append("    part: ").append(toIndentedString(part)).append("\n");
-    sb.append("    sku: ").append(toIndentedString(sku)).append("\n");
-    sb.append("    vendor: ").append(toIndentedString(vendor)).append("\n");
-    sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-    sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    resourceSpecificationCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-    sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
- 
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidate.java
deleted file mode 100644
index 39d1add24a818ffaf081a4c0bd235b49c6bdea36..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidate.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * ResourceCandidate is an entity that makes a resource specification available
- * to a catalog. A ResourceCandidate and its associated resource specification
- * may be published - made visible - in any number of resource catalogs, or in
- * none.
- */
-@Schema(description = "ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-@Entity(name = "ResourceCandidate")
-public class ResourceCandidate extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@ManyToMany(mappedBy = "resourceCandidateObj", cascade = {CascadeType.MERGE,  CascadeType.DETACH} )
-	@JsonIgnore
-	private Set<ResourceCategory> categoryObj = new HashSet<>();
-
-	@OneToOne(cascade = {CascadeType.MERGE, CascadeType.DETACH})
-	@JoinColumn(name = "resource_specid", referencedColumnName = "uuid")
-	@JsonIgnore
-	private ResourceSpecification resourceSpecificationObj = null;
-
-	public ResourceCandidate() {
-		super();
-		this.type = "ResourceCandidate";
-		this.baseType = "BaseEntity";
-	}
-	
-
-	
-	/**
-	 * The resource specification implied by this candidate
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "The resource specification implied by this candidate")
-
-	@Transient
-	@JsonProperty("resourceSpecification")
-	@Valid
-	public ResourceSpecificationRef getResourceSpecificationRef() {
-		if ( this.resourceSpecificationObj != null )
-		{
-			ResourceSpecificationRef sref = new ResourceSpecificationRef();
-			
-			sref.setId(  this.resourceSpecificationObj.getUuid());
-			sref.setName(  this.resourceSpecificationObj.getName() );
-			sref.setVersion( this.resourceSpecificationObj.getVersion());
-			sref.setBaseType(ResourceSpecificationRef.class.getName());
-			return sref;			
-		}
-		
-		return null;
-	}
-
-	
-	/**
-	 * @return the resourceSpecificationObj
-	 */
-	public ResourceSpecification getResourceSpecificationObj() {
-		return resourceSpecificationObj;
-	}
-
-
-
-
-	/**
-	 * @param resourceSpecificationObj the resourceSpecificationObj to set
-	 */
-	public void setResourceSpecificationObj(ResourceSpecification resourceSpecificationObj) {
-		this.resourceSpecificationObj = resourceSpecificationObj;
-	}
-
-
-
-
-	/**
-	 * The resource specification implied by this candidate
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "The category specification implied by this candidate")
-
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ResourceCategoryRef> getCategory() {
-
-		List<ResourceCategoryRef> category = new ArrayList<>();
-
-		for (ResourceCategory resourceCategory : categoryObj) {
-			ResourceCategoryRef scr = new ResourceCategoryRef();
-			scr.setId(resourceCategory.getId());
-			scr.setName(resourceCategory.getName());
-			scr.setBaseType(ResourceCategoryRef.class.getName());
-			category.add(scr);
-		}
-
-		return category;
-	}
-
-
-	/**
-	 * Unique identifier of this REST resource
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of this REST resource")
-
-	public String getId() {
-		return uuid;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCandidate resourceCandidate = (ResourceCandidate) o;
-		return Objects.equals(this.id, resourceCandidate.id) && Objects.equals(this.href, resourceCandidate.href)
-				&& Objects.equals(this.name, resourceCandidate.name)
-				&& Objects.equals(this.description, resourceCandidate.description)
-				&& Objects.equals(this.type, resourceCandidate.type)
-				&& Objects.equals(this.schemaLocation, resourceCandidate.schemaLocation)
-				&& Objects.equals(this.baseType, resourceCandidate.baseType)
-				&& Objects.equals(this.version, resourceCandidate.version)
-				&& Objects.equals(this.validFor, resourceCandidate.validFor)
-				&& Objects.equals(this.lastUpdate, resourceCandidate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, resourceCandidate.lifecycleStatus)
-				&& Objects.equals(this.getCategory(), resourceCandidate.getCategory())
-				&& Objects.equals(this.getResourceSpecificationRef(), resourceCandidate.getResourceSpecificationRef());
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, id, href, name, description, type, schemaLocation, baseType, version, validFor, lastUpdate,
-//				lifecycleStatus, getCategory(), getResourceSpecificationRef());
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCandidate {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    category: ").append(toIndentedString(getCategory())).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(getResourceSpecificationRef())).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ResourceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ResourceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEvent.java
deleted file mode 100644
index 0dee7d8b556bd1727d47bf159937d94c0215f45b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCandidateChangeEventPayload event = null;
-
-  public ResourceCandidateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCandidateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCandidateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCandidateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCandidateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCandidateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCandidateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCandidateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCandidateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCandidateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCandidateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCandidateChangeEvent event(ResourceCandidateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCandidateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateChangeEvent resourceCandidateChangeEvent = (ResourceCandidateChangeEvent) o;
-    return Objects.equals(this.id, resourceCandidateChangeEvent.id) &&
-        Objects.equals(this.href, resourceCandidateChangeEvent.href) &&
-        Objects.equals(this.eventId, resourceCandidateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCandidateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCandidateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCandidateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCandidateChangeEvent.domain) &&
-        Objects.equals(this.title, resourceCandidateChangeEvent.title) &&
-        Objects.equals(this.description, resourceCandidateChangeEvent.description) &&
-        Objects.equals(this.priority, resourceCandidateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCandidateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCandidateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEventPayload.java
deleted file mode 100644
index a8e73501e21528b21a5a2b530c2c3cc6a2010f64..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateChangeEventPayload   {
-  @JsonProperty("resourceCandidate")
-  private ResourceCandidate resourceCandidate = null;
-
-  public ResourceCandidateChangeEventPayload resourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-    return this;
-  }
-
-  /**
-   * Get resourceCandidate
-   * @return resourceCandidate
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidate getResourceCandidate() {
-    return resourceCandidate;
-  }
-
-  public void setResourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateChangeEventPayload resourceCandidateChangeEventPayload = (ResourceCandidateChangeEventPayload) o;
-    return Objects.equals(this.resourceCandidate, resourceCandidateChangeEventPayload.resourceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateChangeEventPayload {\n");
-    
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreate.java
deleted file mode 100644
index 3be8807e1b7e0c5872bd9f2849c464508f56dba6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreate.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none. Skipped properties: id,href
- */
-@Schema(description = "ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-public class ResourceCandidateCreate extends ResourceCandidateUpdate   {
-  
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-  
-
-  public ResourceCandidateCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
- 
-
-  public ResourceCandidateCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update of this REST resource
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update of this REST resource")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateCreate resourceCandidateCreate = (ResourceCandidateCreate) o;
-    return Objects.equals(this.name, resourceCandidateCreate.name) &&
-        Objects.equals(this.description, resourceCandidateCreate.description) &&
-        Objects.equals(this.type, resourceCandidateCreate.type) &&
-        Objects.equals(this.schemaLocation, resourceCandidateCreate.schemaLocation) &&
-        Objects.equals(this.baseType, resourceCandidateCreate.baseType) &&
-        Objects.equals(this.version, resourceCandidateCreate.version) &&
-        Objects.equals(this.validFor, resourceCandidateCreate.validFor) &&
-        Objects.equals(this.lastUpdate, resourceCandidateCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, resourceCandidateCreate.lifecycleStatus) &&
-        Objects.equals(this.category, resourceCandidateCreate.category) &&
-        Objects.equals(this.resourceSpecification, resourceCandidateCreate.resourceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor, lastUpdate, lifecycleStatus, category, resourceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEvent.java
deleted file mode 100644
index 77927c046c3bdf65c210b1bdca1b31b2cfaa4ced..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCandidateCreateEventPayload event = null;
-
-  public ResourceCandidateCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCandidateCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCandidateCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCandidateCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCandidateCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCandidateCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCandidateCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCandidateCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCandidateCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCandidateCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCandidateCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCandidateCreateEvent event(ResourceCandidateCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidateCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCandidateCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateCreateEvent resourceCandidateCreateEvent = (ResourceCandidateCreateEvent) o;
-    return Objects.equals(this.id, resourceCandidateCreateEvent.id) &&
-        Objects.equals(this.href, resourceCandidateCreateEvent.href) &&
-        Objects.equals(this.eventId, resourceCandidateCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCandidateCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCandidateCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCandidateCreateEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCandidateCreateEvent.domain) &&
-        Objects.equals(this.title, resourceCandidateCreateEvent.title) &&
-        Objects.equals(this.description, resourceCandidateCreateEvent.description) &&
-        Objects.equals(this.priority, resourceCandidateCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCandidateCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCandidateCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEventPayload.java
deleted file mode 100644
index a2bc11ce37210016edc683c1fc747de0515988eb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateCreateEventPayload   {
-  @JsonProperty("resourceCandidate")
-  private ResourceCandidate resourceCandidate = null;
-
-  public ResourceCandidateCreateEventPayload resourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-    return this;
-  }
-
-  /**
-   * Get resourceCandidate
-   * @return resourceCandidate
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidate getResourceCandidate() {
-    return resourceCandidate;
-  }
-
-  public void setResourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateCreateEventPayload resourceCandidateCreateEventPayload = (ResourceCandidateCreateEventPayload) o;
-    return Objects.equals(this.resourceCandidate, resourceCandidateCreateEventPayload.resourceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateCreateEventPayload {\n");
-    
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEvent.java
deleted file mode 100644
index a14437d0df0cea4f02a876e4f70a93c443af43c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCandidateDeleteEventPayload event = null;
-
-  public ResourceCandidateDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCandidateDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCandidateDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCandidateDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCandidateDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCandidateDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCandidateDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCandidateDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCandidateDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCandidateDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCandidateDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCandidateDeleteEvent event(ResourceCandidateDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidateDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCandidateDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateDeleteEvent resourceCandidateDeleteEvent = (ResourceCandidateDeleteEvent) o;
-    return Objects.equals(this.id, resourceCandidateDeleteEvent.id) &&
-        Objects.equals(this.href, resourceCandidateDeleteEvent.href) &&
-        Objects.equals(this.eventId, resourceCandidateDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCandidateDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCandidateDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCandidateDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCandidateDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceCandidateDeleteEvent.title) &&
-        Objects.equals(this.description, resourceCandidateDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceCandidateDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCandidateDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCandidateDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEventPayload.java
deleted file mode 100644
index 260556800abc81ff3aadb4f661874ab900fbb027..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCandidateDeleteEventPayload   {
-  @JsonProperty("resourceCandidate")
-  private ResourceCandidate resourceCandidate = null;
-
-  public ResourceCandidateDeleteEventPayload resourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-    return this;
-  }
-
-  /**
-   * Get resourceCandidate
-   * @return resourceCandidate
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCandidate getResourceCandidate() {
-    return resourceCandidate;
-  }
-
-  public void setResourceCandidate(ResourceCandidate resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCandidateDeleteEventPayload resourceCandidateDeleteEventPayload = (ResourceCandidateDeleteEventPayload) o;
-    return Objects.equals(this.resourceCandidate, resourceCandidateDeleteEventPayload.resourceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCandidateDeleteEventPayload {\n");
-    
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateRef.java
deleted file mode 100644
index 1d0294942ff802d71204fdeded5af57f611a878e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateRef.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none.
- */
-@Schema(description = "ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-public class ResourceCandidateRef  extends BaseRootNamedEntity {
-	  @JsonProperty("id")
-	  private String id = null;
-
-	  @JsonProperty("href")
-	  private String href = null;
-
-	  @JsonProperty("version")
-	  private String version = null;
-
-
-	  public ResourceCandidateRef id(String id) {
-	    this.id = id;
-	    return this;
-	  }
-
-	  /**
-	   * Unique identifier of the resource candidate
-	   * @return id
-	  **/
-	  @Schema(description = "Unique identifier of the resource candidate")
-
-
-	  public String getId() {
-	    return id;
-	  }
-
-	  public void setId(String id) {
-	    this.id = id;
-	  }
-
-	  public ResourceCandidateRef href(String href) {
-	    this.href = href;
-	    return this;
-	  }
-
-	  /**
-	   * Reference of the resource candidate
-	   * @return href
-	  **/
-	  @Schema(description = "Reference of the resource candidate")
-
-
-	  public String getHref() {
-	    return href;
-	  }
-
-	  public void setHref(String href) {
-	    this.href = href;
-	  }
-
-	  public ResourceCandidateRef version(String version) {
-	    this.version = version;
-	    return this;
-	  }
-
-	  /**
-	   * Version of the resource candidate
-	   * @return version
-	  **/
-	  @Schema(description = "Version of the resource candidate")
-
-
-	  public String getVersion() {
-	    return version;
-	  }
-
-	  public void setVersion(String version) {
-	    this.version = version;
-	  }
-
-
-	  @Override
-	  public boolean equals(java.lang.Object o) {
-	    if (this == o) {
-	      return true;
-	    }
-	    if (o == null || getClass() != o.getClass()) {
-	      return false;
-	    }
-	    ResourceCandidateRef resourceCandidateRef = (ResourceCandidateRef) o;
-	    return Objects.equals(this.id, resourceCandidateRef.id) &&
-	        Objects.equals(this.href, resourceCandidateRef.href) &&
-	        Objects.equals(this.version, resourceCandidateRef.version) &&
-	        Objects.equals(this.name, resourceCandidateRef.name);
-	  }
-	//
-	//  @Override
-	//  public int hashCode() {
-//	    return Objects.hash(uuid, id, href, version, name);
-	//  }
-
-	  @Override
-	  public String toString() {
-	    StringBuilder sb = new StringBuilder();
-	    sb.append("class ResourceCandidateRef {\n");
-	    
-	    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-	    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-	    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-	    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-	    sb.append("}");
-	    return sb.toString();
-	  }
-
-	  /**
-	   * Convert the given object to string with each line indented by 4 spaces
-	   * (except the first line).
-	   */
-	  private String toIndentedString(java.lang.Object o) {
-	    if (o == null) {
-	      return "null";
-	    }
-	    return o.toString().replace("\n", "\n    ");
-	  }
-	}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateUpdate.java
deleted file mode 100644
index af7785ff5f9ff2c3b065025187fc30b7be6f9aca..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCandidateUpdate.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-
-/**
- * ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none. Skipped properties: id,href
- */
-@Schema(description = "ResourceCandidate is an entity that makes a resource specification available to a catalog. A ResourceCandidate and its associated resource specification may be published - made visible - in any number of resource catalogs, or in none. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-public class ResourceCandidateUpdate {
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("lastUpdate")
-	protected OffsetDateTime lastUpdate = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("category")
-	@Valid
-	protected List<ResourceCategoryRef> category = null;
-
-	@JsonProperty("resourceSpecification")
-	protected ResourceSpecificationRef resourceSpecification = null;
-
-	public ResourceCandidateUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceCandidateUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this REST resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this REST resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceCandidateUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * Class type of this REST resource
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "Class type of this REST resource")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public ResourceCandidateUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * This field provides a link to the schema describing this REST resource
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "This field provides a link to the schema describing this REST resource")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ResourceCandidateUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * The (immediate) base class type of this REST resource
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "The (immediate) base class type of this REST resource")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ResourceCandidateUpdate version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * the version of resource candidate
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "the version of resource candidate")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ResourceCandidateUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which this REST resource is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which this REST resource is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ResourceCandidateUpdate lastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-		return this;
-	}
-
-	/**
-	 * Date and time of the last update of this REST resource
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update of this REST resource")
-
-	@Valid
-
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public ResourceCandidateUpdate lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of the resource candidate.
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of the resource candidate.")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ResourceCandidateUpdate category(List<ResourceCategoryRef> category) {
-		this.category = category;
-		return this;
-	}
-
-	public ResourceCandidateUpdate addCategoryItem(ResourceCategoryRef categoryItem) {
-		if (this.category == null) {
-			this.category = new ArrayList<ResourceCategoryRef>();
-		}
-		this.category.add(categoryItem);
-		return this;
-	}
-
-	/**
-	 * Get category
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<ResourceCategoryRef> getCategory() {
-		return category;
-	}
-
-	public void setCategory(List<ResourceCategoryRef> category) {
-		this.category = category;
-	}
-
-	public ResourceCandidateUpdate resourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	/**
-	 * Get resourceSpecification
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public ResourceSpecificationRef getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCandidateUpdate resourceCandidateUpdate = (ResourceCandidateUpdate) o;
-		return Objects.equals(this.name, resourceCandidateUpdate.name)
-				&& Objects.equals(this.description, resourceCandidateUpdate.description)
-				&& Objects.equals(this.type, resourceCandidateUpdate.type)
-				&& Objects.equals(this.schemaLocation, resourceCandidateUpdate.schemaLocation)
-				&& Objects.equals(this.baseType, resourceCandidateUpdate.baseType)
-				&& Objects.equals(this.version, resourceCandidateUpdate.version)
-				&& Objects.equals(this.validFor, resourceCandidateUpdate.validFor)
-				&& Objects.equals(this.lastUpdate, resourceCandidateUpdate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, resourceCandidateUpdate.lifecycleStatus)
-				&& Objects.equals(this.category, resourceCandidateUpdate.category)
-				&& Objects.equals(this.resourceSpecification, resourceCandidateUpdate.resourceSpecification);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor, lastUpdate,
-				lifecycleStatus, category, resourceSpecification);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCandidateUpdate {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalog.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalog.java
deleted file mode 100644
index b3c2a163741d23307450f7dedd2e0a258d003cae..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalog.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).
- */
-@Schema(description = "The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "ResourceCatalog")
-public class ResourceCatalog extends BaseEntity {
-
-	@JsonProperty("id")
-	protected String id = null;
-
-
-	@Transient
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-	@ManyToMany(cascade = { CascadeType.DETACH })
-	@JoinTable()
-	@JsonIgnore
-	private Set<ResourceCategory> categoryObj = new HashSet<>();
-
-	public ResourceCatalog id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the Catalog
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the Catalog")
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return uuid;
-	}
-
-	public ResourceCatalog relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ResourceCatalog addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-	
-	
-	/**
-	 * List of service categories associated with this catalog
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of service categories associated with this catalog")
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ResourceCategoryRef> getCategoryRefs() {
-
-		List<ResourceCategoryRef> category = new ArrayList<>();
-		
-		for (ResourceCategory serviceCategory : categoryObj) {
-			ResourceCategoryRef scr = new ResourceCategoryRef();
-			scr.setId( serviceCategory.getId());
-			scr.setName( serviceCategory.getName());
-			scr.setBaseType( ResourceCategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	/**
-	 * @param crefs
-	 */
-	public void  setCategoryRefs( List<ResourceCategoryRef> crefs){
-		for (ResourceCategoryRef serviceCategoryRef : crefs) {
-			ResourceCategory e = new ResourceCategory();
-			e.setUuid( serviceCategoryRef.getId() );
-			e.setName(serviceCategoryRef.getName());
-			categoryObj.add(e );
-		}
-	}
-	
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ResourceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ResourceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCatalog resourceCatalog = (ResourceCatalog) o;
-		return Objects.equals(this.id, resourceCatalog.id) && Objects.equals(this.href, resourceCatalog.href)
-				&& Objects.equals(this.name, resourceCatalog.name)
-				&& Objects.equals(this.description, resourceCatalog.description)
-				&& Objects.equals(this.type, resourceCatalog.type)
-				&& Objects.equals(this.schemaLocation, resourceCatalog.schemaLocation)
-				&& Objects.equals(this.baseType, resourceCatalog.baseType)
-				&& Objects.equals(this.version, resourceCatalog.version)
-				&& Objects.equals(this.validFor, resourceCatalog.validFor)
-				&& Objects.equals(this.lastUpdate, resourceCatalog.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, resourceCatalog.lifecycleStatus)
-				&& Objects.equals(this.relatedParty, resourceCatalog.relatedParty)
-				&& Objects.equals(this.getCategoryRefs(), resourceCatalog.getCategoryRefs());
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, id, href, name, description, type, schemaLocation, baseType, version, validFor,
-//				lastUpdate, lifecycleStatus, relatedParty, getCategoryRefs());
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCatalog {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    category: ").append(toIndentedString( getCategoryRefs() )).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void addCategory(ResourceCategory cat) {
-		if (!categoryObj.contains(cat) ) {
-			categoryObj.add(cat);
-		}
-		
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEvent.java
deleted file mode 100644
index 78cdb7d15b6aa240e3e3a30e02ab7c81c1c321d2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCatalogChangeEventPayload event = null;
-
-  public ResourceCatalogChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCatalogChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCatalogChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCatalogChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCatalogChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCatalogChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCatalogChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCatalogChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCatalogChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCatalogChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCatalogChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCatalogChangeEvent event(ResourceCatalogChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalogChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCatalogChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogChangeEvent resourceCatalogChangeEvent = (ResourceCatalogChangeEvent) o;
-    return Objects.equals(this.id, resourceCatalogChangeEvent.id) &&
-        Objects.equals(this.href, resourceCatalogChangeEvent.href) &&
-        Objects.equals(this.eventId, resourceCatalogChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCatalogChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCatalogChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCatalogChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCatalogChangeEvent.domain) &&
-        Objects.equals(this.title, resourceCatalogChangeEvent.title) &&
-        Objects.equals(this.description, resourceCatalogChangeEvent.description) &&
-        Objects.equals(this.priority, resourceCatalogChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCatalogChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCatalogChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEventPayload.java
deleted file mode 100644
index 613e1801870fa1ab4f4f8e3eb66183897244a11c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogChangeEventPayload   {
-  @JsonProperty("resourceCatalog")
-  private ResourceCatalog resourceCatalog = null;
-
-  public ResourceCatalogChangeEventPayload resourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-    return this;
-  }
-
-  /**
-   * Get resourceCatalog
-   * @return resourceCatalog
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalog getResourceCatalog() {
-    return resourceCatalog;
-  }
-
-  public void setResourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogChangeEventPayload resourceCatalogChangeEventPayload = (ResourceCatalogChangeEventPayload) o;
-    return Objects.equals(this.resourceCatalog, resourceCatalogChangeEventPayload.resourceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogChangeEventPayload {\n");
-    
-    sb.append("    resourceCatalog: ").append(toIndentedString(resourceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreate.java
deleted file mode 100644
index 36e9686e7c262598db77a992a53547c7db294c68..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreate.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers). Skipped properties: id,href
- */
-@Schema(description = "The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers). Skipped properties: id,href")
-@Validated
-
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-public class ResourceCatalogCreate extends ResourceCatalogUpdate   {
-  
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-
-  public ResourceCatalogCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogCreate resourceCatalogCreate = (ResourceCatalogCreate) o;
-    return Objects.equals(this.name, resourceCatalogCreate.name) &&
-        Objects.equals(this.description, resourceCatalogCreate.description) &&
-        Objects.equals(this.type, resourceCatalogCreate.type) &&
-        Objects.equals(this.schemaLocation, resourceCatalogCreate.schemaLocation) &&
-        Objects.equals(this.baseType, resourceCatalogCreate.baseType) &&
-        Objects.equals(this.version, resourceCatalogCreate.version) &&
-        Objects.equals(this.validFor, resourceCatalogCreate.validFor) &&
-        Objects.equals(this.lastUpdate, resourceCatalogCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, resourceCatalogCreate.lifecycleStatus) &&
-        Objects.equals(this.relatedParty, resourceCatalogCreate.relatedParty) &&
-        Objects.equals(this.category, resourceCatalogCreate.category);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor, lastUpdate, lifecycleStatus, relatedParty, category);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEvent.java
deleted file mode 100644
index 8654568be9eac84fefb78cda59c673badb78132a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCatalogCreateEventPayload event = null;
-
-  public ResourceCatalogCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCatalogCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCatalogCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCatalogCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCatalogCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCatalogCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCatalogCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCatalogCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCatalogCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCatalogCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCatalogCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCatalogCreateEvent event(ResourceCatalogCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalogCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCatalogCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogCreateEvent resourceCatalogCreateEvent = (ResourceCatalogCreateEvent) o;
-    return Objects.equals(this.id, resourceCatalogCreateEvent.id) &&
-        Objects.equals(this.href, resourceCatalogCreateEvent.href) &&
-        Objects.equals(this.eventId, resourceCatalogCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCatalogCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCatalogCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCatalogCreateEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCatalogCreateEvent.domain) &&
-        Objects.equals(this.title, resourceCatalogCreateEvent.title) &&
-        Objects.equals(this.description, resourceCatalogCreateEvent.description) &&
-        Objects.equals(this.priority, resourceCatalogCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCatalogCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCatalogCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEventPayload.java
deleted file mode 100644
index 49297dbaef16e7213108f00b9e2c505db37a8e08..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogCreateEventPayload   {
-  @JsonProperty("resourceCatalog")
-  private ResourceCatalog resourceCatalog = null;
-
-  public ResourceCatalogCreateEventPayload resourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-    return this;
-  }
-
-  /**
-   * Get resourceCatalog
-   * @return resourceCatalog
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalog getResourceCatalog() {
-    return resourceCatalog;
-  }
-
-  public void setResourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogCreateEventPayload resourceCatalogCreateEventPayload = (ResourceCatalogCreateEventPayload) o;
-    return Objects.equals(this.resourceCatalog, resourceCatalogCreateEventPayload.resourceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogCreateEventPayload {\n");
-    
-    sb.append("    resourceCatalog: ").append(toIndentedString(resourceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEvent.java
deleted file mode 100644
index e9f66071a1bacb1597a01fe1eac19fed3bf609f0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCatalogDeleteEventPayload event = null;
-
-  public ResourceCatalogDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCatalogDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCatalogDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCatalogDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCatalogDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCatalogDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCatalogDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCatalogDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCatalogDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCatalogDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCatalogDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCatalogDeleteEvent event(ResourceCatalogDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalogDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCatalogDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogDeleteEvent resourceCatalogDeleteEvent = (ResourceCatalogDeleteEvent) o;
-    return Objects.equals(this.id, resourceCatalogDeleteEvent.id) &&
-        Objects.equals(this.href, resourceCatalogDeleteEvent.href) &&
-        Objects.equals(this.eventId, resourceCatalogDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCatalogDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCatalogDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCatalogDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCatalogDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceCatalogDeleteEvent.title) &&
-        Objects.equals(this.description, resourceCatalogDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceCatalogDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCatalogDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCatalogDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEventPayload.java
deleted file mode 100644
index 6be22f33513b69a34594e9ce1e0520f6b6820db5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCatalogDeleteEventPayload   {
-  @JsonProperty("resourceCatalog")
-  private ResourceCatalog resourceCatalog = null;
-
-  public ResourceCatalogDeleteEventPayload resourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-    return this;
-  }
-
-  /**
-   * Get resourceCatalog
-   * @return resourceCatalog
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCatalog getResourceCatalog() {
-    return resourceCatalog;
-  }
-
-  public void setResourceCatalog(ResourceCatalog resourceCatalog) {
-    this.resourceCatalog = resourceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogDeleteEventPayload resourceCatalogDeleteEventPayload = (ResourceCatalogDeleteEventPayload) o;
-    return Objects.equals(this.resourceCatalog, resourceCatalogDeleteEventPayload.resourceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogDeleteEventPayload {\n");
-    
-    sb.append("    resourceCatalog: ").append(toIndentedString(resourceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogUpdate.java
deleted file mode 100644
index c96cd95677bbb9d889f741d2f9a35c34e5507659..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCatalogUpdate.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers). Skipped properties: id,href
- */
-@Schema(description = "The root entity for resource catalog management. A resource catalog is a group of resource specifications made available through resource candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers). Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-
-public class ResourceCatalogUpdate   {
-  @JsonProperty("name")
-protected String name = null;
-
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<ResourceCategoryRef> category = null;
-
-  public ResourceCatalogUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the catalog
-   * @return name
-  **/
-  @Schema(description = "Name of the catalog")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ResourceCatalogUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of this catalog
-   * @return description
-  **/
-  @Schema(description = "Description of this catalog")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCatalogUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Indicates the (class) type of catalog. For resource catalogs, this will be 'ResourceCatalog'.
-   * @return type
-  **/
-  @Schema(description = "Indicates the (class) type of catalog. For resource catalogs, this will be 'ResourceCatalog'.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ResourceCatalogUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing this REST resource
-   * @return schemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing this REST resource")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ResourceCatalogUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * Indicates<b> </b>the base (class) type of this REST resource
-   * @return baseType
-  **/
-  @Schema(description = "Indicates<b> </b>the base (class) type of this REST resource")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ResourceCatalogUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Catalog version
-   * @return version
-  **/
-  @Schema(description = "Catalog version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ResourceCatalogUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the catalog is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the catalog is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ResourceCatalogUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ResourceCatalogUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ResourceCatalogUpdate category(List<ResourceCategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public ResourceCatalogUpdate addCategoryItem(ResourceCategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * Get category
-   * @return category
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ResourceCategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<ResourceCategoryRef> category) {
-    this.category = category;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCatalogUpdate resourceCatalogUpdate = (ResourceCatalogUpdate) o;
-    return Objects.equals(this.name, resourceCatalogUpdate.name) &&
-        Objects.equals(this.description, resourceCatalogUpdate.description) &&
-        Objects.equals(this.type, resourceCatalogUpdate.type) &&
-        Objects.equals(this.schemaLocation, resourceCatalogUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, resourceCatalogUpdate.baseType) &&
-        Objects.equals(this.version, resourceCatalogUpdate.version) &&
-        Objects.equals(this.validFor, resourceCatalogUpdate.validFor) &&
-        Objects.equals(this.lifecycleStatus, resourceCatalogUpdate.lifecycleStatus) &&
-        Objects.equals(this.relatedParty, resourceCatalogUpdate.relatedParty) &&
-        Objects.equals(this.category, resourceCatalogUpdate.category);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor,  lifecycleStatus, relatedParty, category);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCatalogUpdate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategory.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategory.java
deleted file mode 100644
index 1e345b46bb503d7540c0fd3c3a58cb5adf08d3b4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategory.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-
-/**
- * The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories.
- */
-@Schema(description = "The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "ResourceCategory")
-public class ResourceCategory extends BaseEntity {
-
-	@JsonProperty("id")
-	protected String id = null;
-
-
-	@JsonProperty("parentId")
-	private String parentId = null;
-
-	@JsonProperty("isRoot")
-	private Boolean isRoot = null;
-
-	@OneToMany( cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ResourceCategory> categoryObj = new HashSet<>();
-	
-	
-
-	@ManyToMany( cascade = {  CascadeType.MERGE, CascadeType.REMOVE } )
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ResourceCandidate> resourceCandidateObj = new HashSet<>();
-
-	/**
-	 * Unique identifier of the category
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the category")
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	
-
-
-	public ResourceCategory parentId(String parentId) {
-		this.parentId = parentId;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the parent category
-	 * 
-	 * @return parentId
-	 **/
-	@Schema(description = "Unique identifier of the parent category")
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-	public ResourceCategory isRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-		return this;
-	}
-
-	/**
-	 * If true, this Boolean indicates that the category is a root of categories
-	 * 
-	 * @return isRoot
-	 **/
-	@Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-	public Boolean isIsRoot() {
-		return isRoot;
-	}
-
-	public void setIsRoot(Boolean isRoot) {
-		this.isRoot = isRoot;
-	}
-
-
-	
-
-	/**
-	 * List of child categories in the tree for in this category
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of child categories in the tree for in this category")
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ResourceCategoryRef> getCategoryRefs() {
-
-		List<ResourceCategoryRef> category = new ArrayList<>();
-		
-		for (ResourceCategory resourceCategory : categoryObj) {
-			ResourceCategoryRef scr = new ResourceCategoryRef();
-			scr.setId( resourceCategory.getId());
-			scr.setName( resourceCategory.getName());
-			scr.setBaseType( ResourceCategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	@JsonProperty("category")
-	public void setCategoryObj(List<ResourceCategoryRef> alist) {
-		this.categoryObj.clear();
-		for (ResourceCategoryRef resCategoryRef : alist) {
-			ResourceCategory sc = new ResourceCategory();
-			sc.setUuid( resCategoryRef.getId());
-			sc.setName(resCategoryRef.getName());
-			sc.setBaseType(resCategoryRef.getBaseType());
-			this.categoryObj.add(sc);
-		}
-	}
-	
-
-
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ResourceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ResourceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-
-	
-
-	/**
-	 * List of resource candidates associated with this category
-	 * 
-	 * @return resourceCandidate
-	 **/
-	@Schema(description = "List of resource candidates associated with this category")
-
-	@Valid
-	@JsonProperty("resourceCandidate")
-	public List<ResourceCandidateRef> getResourceCandidateRefs() {
-		
-		List<ResourceCandidateRef> scref = new ArrayList<>();
-		
-		for (ResourceCandidate sc : resourceCandidateObj) {
-			ResourceCandidateRef scr = new ResourceCandidateRef();
-			scr.setId( sc.getId());
-			scr.setName( sc.getName());
-			scr.setVersion( sc.getVersion());
-			scr.setBaseType( ResourceCategoryRef.class.getName() );
-			scref.add(scr);
-		}
-		
-		return scref;
-	}
-
-	
-
-	/**
-	 * @return the resourceCandidateObj
-	 */
-	public Set<ResourceCandidate> getResourceCandidateObj() {
-		return resourceCandidateObj;
-	}
-
-
-
-
-	/**
-	 * @param resourceCandidateObj the resourceCandidateObj to set
-	 */
-	public void setResourceCandidateObj(Set<ResourceCandidate> resourceCandidateObj) {
-		this.resourceCandidateObj = resourceCandidateObj;
-	}
-
-	
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCategory resourceCategory = (ResourceCategory) o;
-		return Objects.equals(this.id, resourceCategory.id) && Objects.equals(this.href, resourceCategory.href)
-				&& Objects.equals(this.name, resourceCategory.name)
-				&& Objects.equals(this.description, resourceCategory.description)
-				&& Objects.equals(this.type, resourceCategory.type)
-				&& Objects.equals(this.baseType, resourceCategory.baseType)
-				&& Objects.equals(this.version, resourceCategory.version)
-				&& Objects.equals(this.validFor, resourceCategory.validFor)
-				&& Objects.equals(this.lifecycleStatus, resourceCategory.lifecycleStatus)
-				&& Objects.equals(this.lastUpdate, resourceCategory.lastUpdate)
-				&& Objects.equals(this.parentId, resourceCategory.parentId)
-				&& Objects.equals(this.isRoot, resourceCategory.isRoot)
-				&& Objects.equals(this.getCategoryRefs(), resourceCategory.getCategoryRefs())
-				&& Objects.equals(this.getResourceCandidateRefs(), resourceCategory.getResourceCandidateRefs());
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, id, href, name, description, type,  baseType, version, validFor,
-//				lifecycleStatus, lastUpdate, parentId, isRoot, getCategoryRefs(), getResourceCandidateRefs());
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCategory {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-		sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-		sb.append("    category: ").append(toIndentedString(getCategoryRefs())).append("\n");
-		sb.append("    resourceCandidate: ").append(toIndentedString(getResourceCandidateRefs())).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEvent.java
deleted file mode 100644
index 7624f67dfb6ae7418f6fe9760f2864a92db8ad45..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCategoryChangeEventPayload event = null;
-
-  public ResourceCategoryChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCategoryChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCategoryChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCategoryChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCategoryChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCategoryChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCategoryChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCategoryChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCategoryChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCategoryChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCategoryChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCategoryChangeEvent event(ResourceCategoryChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategoryChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCategoryChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryChangeEvent resourceCategoryChangeEvent = (ResourceCategoryChangeEvent) o;
-    return Objects.equals(this.id, resourceCategoryChangeEvent.id) &&
-        Objects.equals(this.href, resourceCategoryChangeEvent.href) &&
-        Objects.equals(this.eventId, resourceCategoryChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCategoryChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCategoryChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCategoryChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCategoryChangeEvent.domain) &&
-        Objects.equals(this.title, resourceCategoryChangeEvent.title) &&
-        Objects.equals(this.description, resourceCategoryChangeEvent.description) &&
-        Objects.equals(this.priority, resourceCategoryChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCategoryChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCategoryChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEventPayload.java
deleted file mode 100644
index 7c70b5ab370469789f4fb07cc28d78c0ff29d733..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryChangeEventPayload   {
-  @JsonProperty("resourceCategory")
-  private ResourceCategory resourceCategory = null;
-
-  public ResourceCategoryChangeEventPayload resourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-    return this;
-  }
-
-  /**
-   * Get resourceCategory
-   * @return resourceCategory
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategory getResourceCategory() {
-    return resourceCategory;
-  }
-
-  public void setResourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryChangeEventPayload resourceCategoryChangeEventPayload = (ResourceCategoryChangeEventPayload) o;
-    return Objects.equals(this.resourceCategory, resourceCategoryChangeEventPayload.resourceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryChangeEventPayload {\n");
-    
-    sb.append("    resourceCategory: ").append(toIndentedString(resourceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreate.java
deleted file mode 100644
index 1c778121ba9fc23a18b4f9e6474b939392228be3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreate.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories. Skipped properties: id,href
- */
-@Schema(description = "The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-public class ResourceCategoryCreate  extends ResourceCategoryUpdate {
-  
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-  public ResourceCategoryCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-
-  public ResourceCategoryCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryCreate resourceCategoryCreate = (ResourceCategoryCreate) o;
-    return Objects.equals(this.name, resourceCategoryCreate.name) &&
-        Objects.equals(this.description, resourceCategoryCreate.description) &&
-        Objects.equals(this.type, resourceCategoryCreate.type) &&
-        Objects.equals(this.schemalLocation, resourceCategoryCreate.schemalLocation) &&
-        Objects.equals(this.baseType, resourceCategoryCreate.baseType) &&
-        Objects.equals(this.version, resourceCategoryCreate.version) &&
-        Objects.equals(this.validFor, resourceCategoryCreate.validFor) &&
-        Objects.equals(this.lifecycleStatus, resourceCategoryCreate.lifecycleStatus) &&
-        Objects.equals(this.lastUpdate, resourceCategoryCreate.lastUpdate) &&
-        Objects.equals(this.parentId, resourceCategoryCreate.parentId) &&
-        Objects.equals(this.isRoot, resourceCategoryCreate.isRoot) &&
-        Objects.equals(this.category, resourceCategoryCreate.category) &&
-        Objects.equals(this.resourceCandidate, resourceCategoryCreate.resourceCandidate) &&
-        Objects.equals(this.relatedParty, resourceCategoryCreate.relatedParty);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, description, type, schemalLocation, baseType, version, validFor, lifecycleStatus, lastUpdate, parentId, isRoot, category, resourceCandidate, relatedParty);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryCreate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemalLocation: ").append(toIndentedString(schemalLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-    sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEvent.java
deleted file mode 100644
index 3bafd0e82b228f8846efe165e9dc20e7ba936cc5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCategoryCreateEventPayload event = null;
-
-  public ResourceCategoryCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCategoryCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCategoryCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCategoryCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCategoryCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCategoryCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCategoryCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCategoryCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCategoryCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCategoryCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCategoryCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCategoryCreateEvent event(ResourceCategoryCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategoryCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCategoryCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryCreateEvent resourceCategoryCreateEvent = (ResourceCategoryCreateEvent) o;
-    return Objects.equals(this.id, resourceCategoryCreateEvent.id) &&
-        Objects.equals(this.href, resourceCategoryCreateEvent.href) &&
-        Objects.equals(this.eventId, resourceCategoryCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCategoryCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCategoryCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCategoryCreateEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCategoryCreateEvent.domain) &&
-        Objects.equals(this.title, resourceCategoryCreateEvent.title) &&
-        Objects.equals(this.description, resourceCategoryCreateEvent.description) &&
-        Objects.equals(this.priority, resourceCategoryCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCategoryCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCategoryCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEventPayload.java
deleted file mode 100644
index 69826836534a9e60814bbe0bbe7da69d6f92a4ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryCreateEventPayload   {
-  @JsonProperty("resourceCategory")
-  private ResourceCategory resourceCategory = null;
-
-  public ResourceCategoryCreateEventPayload resourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-    return this;
-  }
-
-  /**
-   * Get resourceCategory
-   * @return resourceCategory
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategory getResourceCategory() {
-    return resourceCategory;
-  }
-
-  public void setResourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryCreateEventPayload resourceCategoryCreateEventPayload = (ResourceCategoryCreateEventPayload) o;
-    return Objects.equals(this.resourceCategory, resourceCategoryCreateEventPayload.resourceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryCreateEventPayload {\n");
-    
-    sb.append("    resourceCategory: ").append(toIndentedString(resourceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEvent.java
deleted file mode 100644
index 2720c9006487a9344b647c394d937c840fc1e282..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceCategoryDeleteEventPayload event = null;
-
-  public ResourceCategoryDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceCategoryDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceCategoryDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceCategoryDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceCategoryDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceCategoryDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceCategoryDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceCategoryDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceCategoryDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCategoryDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceCategoryDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceCategoryDeleteEvent event(ResourceCategoryDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategoryDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCategoryDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryDeleteEvent resourceCategoryDeleteEvent = (ResourceCategoryDeleteEvent) o;
-    return Objects.equals(this.id, resourceCategoryDeleteEvent.id) &&
-        Objects.equals(this.href, resourceCategoryDeleteEvent.href) &&
-        Objects.equals(this.eventId, resourceCategoryDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceCategoryDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceCategoryDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceCategoryDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceCategoryDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceCategoryDeleteEvent.title) &&
-        Objects.equals(this.description, resourceCategoryDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceCategoryDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceCategoryDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceCategoryDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEventPayload.java
deleted file mode 100644
index 8aeb041ef06766bec6e1b422402940e2789bf23f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceCategoryDeleteEventPayload   {
-  @JsonProperty("resourceCategory")
-  private ResourceCategory resourceCategory = null;
-
-  public ResourceCategoryDeleteEventPayload resourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-    return this;
-  }
-
-  /**
-   * Get resourceCategory
-   * @return resourceCategory
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceCategory getResourceCategory() {
-    return resourceCategory;
-  }
-
-  public void setResourceCategory(ResourceCategory resourceCategory) {
-    this.resourceCategory = resourceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryDeleteEventPayload resourceCategoryDeleteEventPayload = (ResourceCategoryDeleteEventPayload) o;
-    return Objects.equals(this.resourceCategory, resourceCategoryDeleteEventPayload.resourceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryDeleteEventPayload {\n");
-    
-    sb.append("    resourceCategory: ").append(toIndentedString(resourceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryRef.java
deleted file mode 100644
index bc04a6b3cd7b7d54848cca4e1814071b8565eb4d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryRef.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Category reference. The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.
- */
-@Schema(description = "Category reference. The category resource is used to group product offerings, service and resource candidates in logical containers. Categories can contain other categories and/or product offerings, resource or service candidates.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-public class ResourceCategoryRef   extends BaseRootNamedEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("version")
-  private String version = null;
-
-  public ResourceCategoryRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique reference of the category
-   * @return id
-  **/
-  @Schema(description = "Unique reference of the category")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
- 
-
-  public ResourceCategoryRef version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Category version
-   * @return version
-  **/
-  @Schema(description = "Category version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryRef categoryRef = (ResourceCategoryRef) o;
-    return Objects.equals(this.id, categoryRef.id) &&
-        Objects.equals(this.href, categoryRef.href) &&
-        Objects.equals(this.version, categoryRef.version) &&
-        Objects.equals(this.name, categoryRef.name);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(uuid, id, href, version, name);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CategoryRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryUpdate.java
deleted file mode 100644
index 9d9afd5f04f31d0f4dd95f113b17a54fd05feba4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceCategoryUpdate.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories. Skipped properties: id,href,id,href
- */
-@Schema(description = "The (resource) category resource is used to group resource candidates in logical containers. Categories can contain other categories. Skipped properties: id,href,id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-public class ResourceCategoryUpdate   {
-  @JsonProperty("name")
-protected String name = null;
-
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  @JsonProperty("@schemalLocation")
-  protected String schemalLocation = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-
-  @JsonProperty("parentId")
-  protected String parentId = null;
-
-  @JsonProperty("isRoot")
-  protected Boolean isRoot = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<ResourceCategoryRef> category = null;
-
-  @JsonProperty("resourceCandidate")
-  @Valid
-  protected List<ResourceCandidateRef> resourceCandidate = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  public ResourceCategoryUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the category
-   * @return name
-  **/
-  @Schema(description = "Name of the category")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ResourceCategoryUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the category
-   * @return description
-  **/
-  @Schema(description = "Description of the category")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceCategoryUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The (class) type of this category
-   * @return type
-  **/
-  @Schema(description = "The (class) type of this category")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ResourceCategoryUpdate schemalLocation(String schemalLocation) {
-    this.schemalLocation = schemalLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing this REST resource
-   * @return schemalLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing this REST resource")
-
-
-  public String getSchemalLocation() {
-    return schemalLocation;
-  }
-
-  public void setSchemalLocation(String schemalLocation) {
-    this.schemalLocation = schemalLocation;
-  }
-
-  public ResourceCategoryUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * Immediate base class type of this category
-   * @return baseType
-  **/
-  @Schema(description = "Immediate base class type of this category")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ResourceCategoryUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * Category version
-   * @return version
-  **/
-  @Schema(description = "Category version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ResourceCategoryUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the category is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the category is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ResourceCategoryUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-
-  public ResourceCategoryUpdate parentId(String parentId) {
-    this.parentId = parentId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the parent category
-   * @return parentId
-  **/
-  @Schema(description = "Unique identifier of the parent category")
-
-
-  public String getParentId() {
-    return parentId;
-  }
-
-  public void setParentId(String parentId) {
-    this.parentId = parentId;
-  }
-
-  public ResourceCategoryUpdate isRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-    return this;
-  }
-
-  /**
-   * If true, this Boolean indicates that the category is a root of categories
-   * @return isRoot
-  **/
-  @Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-
-  public Boolean isIsRoot() {
-    return isRoot;
-  }
-
-  public void setIsRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-  }
-
-  public ResourceCategoryUpdate category(List<ResourceCategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public ResourceCategoryUpdate addCategoryItem(ResourceCategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * Get category
-   * @return category
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ResourceCategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<ResourceCategoryRef> category) {
-    this.category = category;
-  }
-
-  public ResourceCategoryUpdate resourceCandidate(List<ResourceCandidateRef> resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-    return this;
-  }
-
-  public ResourceCategoryUpdate addResourceCandidateItem(ResourceCandidateRef resourceCandidateItem) {
-    if (this.resourceCandidate == null) {
-      this.resourceCandidate = new ArrayList<>();
-    }
-    this.resourceCandidate.add(resourceCandidateItem);
-    return this;
-  }
-
-  /**
-   * Get resourceCandidate
-   * @return resourceCandidate
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ResourceCandidateRef> getResourceCandidate() {
-    return resourceCandidate;
-  }
-
-  public void setResourceCandidate(List<ResourceCandidateRef> resourceCandidate) {
-    this.resourceCandidate = resourceCandidate;
-  }
-
-  public ResourceCategoryUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ResourceCategoryUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCategoryUpdate resourceCategoryUpdate = (ResourceCategoryUpdate) o;
-    return Objects.equals(this.name, resourceCategoryUpdate.name) &&
-        Objects.equals(this.description, resourceCategoryUpdate.description) &&
-        Objects.equals(this.type, resourceCategoryUpdate.type) &&
-        Objects.equals(this.schemalLocation, resourceCategoryUpdate.schemalLocation) &&
-        Objects.equals(this.baseType, resourceCategoryUpdate.baseType) &&
-        Objects.equals(this.version, resourceCategoryUpdate.version) &&
-        Objects.equals(this.validFor, resourceCategoryUpdate.validFor) &&
-        Objects.equals(this.lifecycleStatus, resourceCategoryUpdate.lifecycleStatus) &&
-        Objects.equals(this.parentId, resourceCategoryUpdate.parentId) &&
-        Objects.equals(this.isRoot, resourceCategoryUpdate.isRoot) &&
-        Objects.equals(this.category, resourceCategoryUpdate.category) &&
-        Objects.equals(this.resourceCandidate, resourceCategoryUpdate.resourceCandidate) &&
-        Objects.equals(this.relatedParty, resourceCategoryUpdate.relatedParty);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(name, description, type, schemalLocation, baseType, version, validFor, lifecycleStatus, lastUpdate, parentId, isRoot, category, resourceCandidate, relatedParty);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCategoryUpdate {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemalLocation: ").append(toIndentedString(schemalLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-    sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    resourceCandidate: ").append(toIndentedString(resourceCandidate)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecification.java
deleted file mode 100644
index 8a62332025e893bd0eecaa759833e9fabfc75a3c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecification.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * Specifies a function as a behavior to transform inputs of any nature into
- * outputs of any nature independently from the way it is provided, for example
- * a Medium to Large Enterprise Firewall.
- */
-@Schema(description = "Specifies a function as a behavior to transform inputs of any nature into outputs of any nature independently from the way it is provided, for example a Medium to Large Enterprise Firewall.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "Resfuncspec")
-public class ResourceFunctionSpecification extends LogicalResourceSpecification {
-
-	@JsonProperty("connectionPointSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConnectionPointSpecificationRef> connectionPointSpecification =  new HashSet<>();
-
-	@JsonProperty("connectivitySpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceGraphSpecification> connectivitySpecification =  new HashSet<>();
-
-	public ResourceFunctionSpecification() {
-		super();
-		this.baseType = "LogicalResourceSpecification";
-		this.type = "ResourceFunctionSpecification";
-
-	}
-
-	public ResourceFunctionSpecification connectionPointSpecification(
-			Set<ConnectionPointSpecificationRef> connectionPointSpecification) {
-		this.connectionPointSpecification = connectionPointSpecification;
-		return this;
-	}
-
-	public ResourceFunctionSpecification addConnectionPointSpecificationItem(
-			ConnectionPointSpecificationRef connectionPointSpecificationItem) {
-		if (this.connectionPointSpecification == null) {
-			this.connectionPointSpecification = new HashSet<>();
-		}
-		this.connectionPointSpecification.add(connectionPointSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * External connection point specifications. These are the service access points
-	 * (SAP) where inputs and outputs of the function are available.
-	 * 
-	 * @return connectionPointSpecification
-	 **/
-	@Schema(description = "External connection point specifications. These are the service access points (SAP) where inputs and outputs of the function are available.")
-	@Valid
-	public Set<ConnectionPointSpecificationRef> getConnectionPointSpecification() {
-		return connectionPointSpecification;
-	}
-
-	public void setConnectionPointSpecification( Set<ConnectionPointSpecificationRef> connectionPointSpecification) {
-		this.connectionPointSpecification = connectionPointSpecification;
-	}
-
-	public ResourceFunctionSpecification connectivitySpecification(
-			Set<ResourceGraphSpecification> connectivitySpecification) {
-		this.connectivitySpecification = connectivitySpecification;
-		return this;
-	}
-
-	public ResourceFunctionSpecification addConnectivitySpecificationItem(
-			ResourceGraphSpecification connectivitySpecificationItem) {
-		if (this.connectivitySpecification == null) {
-			this.connectivitySpecification = new HashSet<>();
-		}
-		this.connectivitySpecification.add(connectivitySpecificationItem);
-		return this;
-	}
-
-	/**
-	 * Internal connectivity potential specifications.
-	 * 
-	 * @return connectivitySpecification
-	 **/
-	@Schema(description = "Internal connectivity potential specifications.")
-	@Valid
-	public Set<ResourceGraphSpecification> getConnectivitySpecification() {
-		return connectivitySpecification;
-	}
-
-	public void setConnectivitySpecification(Set<ResourceGraphSpecification> connectivitySpecification) {
-		this.connectivitySpecification = connectivitySpecification;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceFunctionSpecification resourceFunctionSpecification = (ResourceFunctionSpecification) o;
-		return Objects.equals(this.uuid, resourceFunctionSpecification.uuid)
-				&& Objects.equals(this.href, resourceFunctionSpecification.href)
-				&& Objects.equals(this.category, resourceFunctionSpecification.category)
-				&& Objects.equals(this.description, resourceFunctionSpecification.description)
-				&& Objects.equals(this.isBundle, resourceFunctionSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, resourceFunctionSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, resourceFunctionSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, resourceFunctionSpecification.name)
-				&& Objects.equals(this.version, resourceFunctionSpecification.version)
-				&& Objects.equals(this.attachment, resourceFunctionSpecification.attachment)
-				&& Objects.equals(this.connectionPointSpecification,
-						resourceFunctionSpecification.connectionPointSpecification)
-				&& Objects.equals(this.connectivitySpecification,
-						resourceFunctionSpecification.connectivitySpecification)
-				&& Objects.equals(this.featureSpecification, resourceFunctionSpecification.featureSpecification)
-				&& Objects.equals(this.relatedParty, resourceFunctionSpecification.relatedParty)
-				&& Objects.equals(this.resourceSpecCharacteristic,
-						resourceFunctionSpecification.resourceSpecCharacteristic)
-				&& Objects.equals(this.resourceSpecRelationship, resourceFunctionSpecification.resourceSpecRelationship)
-				&& Objects.equals(this.targetResourceSchema, resourceFunctionSpecification.targetResourceSchema)
-				&& Objects.equals(this.validFor, resourceFunctionSpecification.validFor)
-				&& Objects.equals(this.baseType, resourceFunctionSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, resourceFunctionSpecification.schemaLocation)
-				&& Objects.equals(this.type, resourceFunctionSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(uuid, href, category, description, isBundle, lastUpdate, lifecycleStatus, name, version,
-				attachment, connectionPointSpecification, connectivitySpecification, featureSpecification, relatedParty,
-				resourceSpecCharacteristic, resourceSpecRelationship, targetResourceSchema, validFor, baseType,
-				schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceFunctionSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    connectionPointSpecification: ").append(toIndentedString(connectionPointSpecification))
-				.append("\n");
-		sb.append("    connectivitySpecification: ").append(toIndentedString(connectivitySpecification)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecCharacteristic: ").append(toIndentedString(resourceSpecCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecRelationship)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationCreate.java
deleted file mode 100644
index 5364e2fce2cbbd823e6f0fdb365a95f5730ce1c9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationCreate.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ResourceFunctionSpecificationCreate extends ResourceFunctionSpecificationUpdate {
-
-	@JsonProperty("@type")
-	private String type = null;
-
-
-	public ResourceFunctionSpecificationCreate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceFunctionSpecificationCreate logicalResourceSpecCreate = (ResourceFunctionSpecificationCreate) o;
-		return Objects.equals(this.name, logicalResourceSpecCreate.name)
-				&& Objects.equals(this.description, logicalResourceSpecCreate.description)
-				&& Objects.equals(this.type, logicalResourceSpecCreate.type)
-				&& Objects.equals(this.schemaLocation, logicalResourceSpecCreate.schemaLocation)
-				&& Objects.equals(this.baseType, logicalResourceSpecCreate.baseType)
-				&& Objects.equals(this.version, logicalResourceSpecCreate.version)
-				&& Objects.equals(this.validFor, logicalResourceSpecCreate.validFor)
-				&& Objects.equals(this.lifecycleStatus, logicalResourceSpecCreate.lifecycleStatus)
-				&& Objects.equals(this.isBundle, logicalResourceSpecCreate.isBundle)
-				&& Objects.equals(this.category, logicalResourceSpecCreate.category)
-				&& Objects.equals(this.targetResourceSchema, logicalResourceSpecCreate.targetResourceSchema)
-				&& Objects.equals(this.featureSpecification, logicalResourceSpecCreate.featureSpecification)
-				&& Objects.equals(this.attachment, logicalResourceSpecCreate.attachment)
-				&& Objects.equals(this.relatedParty, logicalResourceSpecCreate.relatedParty)
-				&& Objects.equals(this.resourceSpecificationCharacteristic, logicalResourceSpecCreate.resourceSpecificationCharacteristic)
-				&& Objects.equals(this.resourceSpecificationRelationship, logicalResourceSpecCreate.resourceSpecificationRelationship);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(name, description, type, schemaLocation, baseType, version, validFor, lastUpdate,
-//				lifecycleStatus, isBundle, category, targetResourceSchema, feature, attachment, relatedParty,
-//				resourceSpecCharacteristic, resourceSpecRelationship);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class LogicalResourceSpecCreate {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecificationCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationUpdate.java
deleted file mode 100644
index 7a33b1bf7ddb0a4f270d707d7b24ff4b91d5ce78..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceFunctionSpecificationUpdate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-public class ResourceFunctionSpecificationUpdate extends ResourceSpecificationUpdate {
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecification.java
deleted file mode 100644
index 24e2117f11423de05a7f630921d99f3a350b8518..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecification.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Resource graph specification.
- */
-@Schema(description = "Resource graph specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "ResourceGraphSpec")
-public class ResourceGraphSpecification extends BaseRootNamedEntity {
-
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("connectionSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConnectionSpecification> connectionSpecification =  new HashSet<>();
-
-	@JsonProperty("graphSpecificationRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceGraphSpecificationRelationship> graphSpecificationRelationship =  new HashSet<>();
-
-	
-
-	public ResourceGraphSpecification description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-	/**
-	 * Description of the resource graph specification.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of the resource graph specification.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-
-
-	public ResourceGraphSpecification connectionSpecification(Set<ConnectionSpecification> connectionSpecification) {
-		this.connectionSpecification = connectionSpecification;
-		return this;
-	}
-
-	public ResourceGraphSpecification addConnectionSpecificationItem(
-			ConnectionSpecification connectionSpecificationItem) {
-		this.connectionSpecification.add(connectionSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * Resource graph edge specifications.
-	 * 
-	 * @return connectionSpecification
-	 **/
-	@Schema(description = "Resource graph edge specifications.")
-	@NotNull
-	@Valid
-	@Size(min = 1)
-	public Set<ConnectionSpecification> getConnectionSpecification() {
-		return connectionSpecification;
-	}
-
-	public void setConnectionSpecification(Set<ConnectionSpecification> connectionSpecification) {
-		this.connectionSpecification = connectionSpecification;
-	}
-
-	public ResourceGraphSpecification graphSpecificationRelationship(
-			Set<ResourceGraphSpecificationRelationship> graphSpecificationRelationship) {
-		this.graphSpecificationRelationship = graphSpecificationRelationship;
-		return this;
-	}
-
-	public ResourceGraphSpecification addGraphSpecificationRelationshipItem(
-			ResourceGraphSpecificationRelationship graphSpecificationRelationshipItem) {
-		if (this.graphSpecificationRelationship == null) {
-			this.graphSpecificationRelationship = new HashSet<>();
-		}
-		this.graphSpecificationRelationship.add(graphSpecificationRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Relationships to other resource graph specifications.
-	 * 
-	 * @return graphSpecificationRelationship
-	 **/
-	@Schema(description = "Relationships to other resource graph specifications.")
-	@Valid
-	public Set<ResourceGraphSpecificationRelationship> getGraphSpecificationRelationship() {
-		return graphSpecificationRelationship;
-	}
-
-	public void setGraphSpecificationRelationship(
-			Set<ResourceGraphSpecificationRelationship> graphSpecificationRelationship) {
-		this.graphSpecificationRelationship = graphSpecificationRelationship;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceGraphSpecification resourceGraphSpecification = (ResourceGraphSpecification) o;
-		return Objects.equals(this.uuid, resourceGraphSpecification.uuid)
-				&& Objects.equals(this.href, resourceGraphSpecification.href)
-				&& Objects.equals(this.description, resourceGraphSpecification.description)
-				&& Objects.equals(this.name, resourceGraphSpecification.name)
-				&& Objects.equals(this.connectionSpecification, resourceGraphSpecification.connectionSpecification)
-				&& Objects.equals(this.graphSpecificationRelationship,
-						resourceGraphSpecification.graphSpecificationRelationship)
-				&& Objects.equals(this.baseType, resourceGraphSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, resourceGraphSpecification.schemaLocation)
-				&& Objects.equals(this.type, resourceGraphSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(uuid, href, description, name, connectionSpecification, graphSpecificationRelationship,
-				baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceGraphSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    connectionSpecification: ").append(toIndentedString(connectionSpecification)).append("\n");
-		sb.append("    graphSpecificationRelationship: ").append(toIndentedString(graphSpecificationRelationship))
-				.append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRef.java
deleted file mode 100644
index 3f69bdcd2227b205b10a72ff237c574a85e412a9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRef.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Resource graph specification reference.
- */
-@Schema(description = "Resource graph specification reference.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "ResourceGraphSpecRef")
-public class ResourceGraphSpecificationRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public ResourceGraphSpecificationRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	@NotNull
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public ResourceGraphSpecificationRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceGraphSpecificationRef name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the related entity.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the related entity.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceGraphSpecificationRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceGraphSpecificationRef resourceGraphSpecificationRef = (ResourceGraphSpecificationRef) o;
-		return Objects.equals(this.id, resourceGraphSpecificationRef.id)
-				&& Objects.equals(this.href, resourceGraphSpecificationRef.href)
-				&& Objects.equals(this.name, resourceGraphSpecificationRef.name)
-				&& Objects.equals(this.baseType, resourceGraphSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, resourceGraphSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, resourceGraphSpecificationRef.type)
-				&& Objects.equals(this._atReferredType, resourceGraphSpecificationRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceGraphSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRelationship.java
deleted file mode 100644
index 98554e6b18b7c720879b9f427160e4ead15213e5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceGraphSpecificationRelationship.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Describes link between resource graph specifications.
- */
-@Schema(description = "Describes link between resource graph specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-07T15:15:49.915156900+03:00[Europe/Athens]")
-@Entity(name = "ResourceGraphSpecRel")
-public class ResourceGraphSpecificationRelationship extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("resourceGraph")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private ResourceGraphSpecificationRef resourceGraph = null;
-
-	public ResourceGraphSpecificationRelationship id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-
-	public ResourceGraphSpecificationRelationship href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceGraphSpecificationRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Semantic of the relationship.
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Semantic of the relationship.")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ResourceGraphSpecificationRelationship resourceGraph(ResourceGraphSpecificationRef resourceGraph) {
-		this.resourceGraph = resourceGraph;
-		return this;
-	}
-
-	/**
-	 * Get resourceGraph
-	 * 
-	 * @return resourceGraph
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceGraphSpecificationRef getResourceGraph() {
-		return resourceGraph;
-	}
-
-	public void setResourceGraph(ResourceGraphSpecificationRef resourceGraph) {
-		this.resourceGraph = resourceGraph;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceGraphSpecificationRelationship resourceGraphSpecificationRelationship = (ResourceGraphSpecificationRelationship) o;
-		return Objects.equals(this.id, resourceGraphSpecificationRelationship.id)
-				&& Objects.equals(this.href, resourceGraphSpecificationRelationship.href)
-				&& Objects.equals(this.relationshipType, resourceGraphSpecificationRelationship.relationshipType)
-				&& Objects.equals(this.resourceGraph, resourceGraphSpecificationRelationship.resourceGraph)
-				&& Objects.equals(this.baseType, resourceGraphSpecificationRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, resourceGraphSpecificationRelationship.schemaLocation)
-				&& Objects.equals(this.type, resourceGraphSpecificationRelationship.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, relationshipType, resourceGraph, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceGraphSpecificationRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    resourceGraph: ").append(toIndentedString(resourceGraph)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecCharRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecCharRelationship.java
deleted file mode 100644
index 0793ae5ff67a12ab459904a2703c4fc5e8fc4d92..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecCharRelationship.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.validation.Valid;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity
- * relationship between/among Specification Characteristics.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among Specification Characteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-@Entity(name = "ResourceSpecCharRelationship")
-public class ResourceSpecCharRelationship {
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-	
-	
-	@JsonProperty("relationshipType")
-	private String reltype = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("@type")
-	private String type = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public ResourceSpecCharRelationship() {
-	}
-	
-	
-	public ResourceSpecCharRelationship(ResourceSpecCharRelationship src) {
-		name = src.name;
-		reltype = src.reltype;
-		//role = src.role;
-		validFor = new TimePeriod( src.validFor );
-		id = src.id;
-	}
-
-	/**
-	 * @return the reltype
-	 */
-	public String getReltype() {
-		return reltype;
-	}
-
-	/**
-	 * @param reltype the reltype to set
-	 */
-	public void setReltype(String reltype) {
-		this.reltype = reltype;
-	}
-
-	public ResourceSpecCharRelationship name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the target characteristic
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the target characteristic")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-
-	/**
-	 * Unique identifier of the target specification
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the target specification")
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-	public ResourceSpecCharRelationship href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference to the target specification
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference to the target specification")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceSpecCharRelationship type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * class type of target specification
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "class type of target specification")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public ResourceSpecCharRelationship validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the object is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the object is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecCharRelationship resourceSpecCharRelationship = (ResourceSpecCharRelationship) o;
-		return Objects.equals(this.type, resourceSpecCharRelationship.type)
-				&& Objects.equals(this.name, resourceSpecCharRelationship.name)
-				&& Objects.equals(this.id, resourceSpecCharRelationship.id)
-				&& Objects.equals(this.href, resourceSpecCharRelationship.href)
-				&& Objects.equals(this.type, resourceSpecCharRelationship.type)
-				&& Objects.equals(this.validFor, resourceSpecCharRelationship.validFor);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(type, name, id, href, type, validFor);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecCharRelationship {\n");
-
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecification.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecification.java
deleted file mode 100644
index b3620fa4a8d9e72f3f738f267baf174eca2da8f9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecification.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * Resources are physical or non-physical components (or some combination of
- * these) within an enterprise&#x27;s infrastructure or inventory. They are
- * typically consumed or used by services (for example a physical port assigned
- * to a service) or contribute to the realization of a Product (for example, a
- * SIM card). They can be drawn from the Application, Computing and Network
- * domains, and include, for example, Network Elements, software, IT systems,
- * content and information, and technology components. A ResourceSpecification
- * is an abstract base class for representing a generic means for implementing a
- * particular type of Resource. In essence, a ResourceSpecification defines the
- * common attributes and relationships of a set of related Resources, while
- * Resource defines a specific instance that is based on a particular
- * ResourceSpecification.
- */
-@Schema(description = "Resources are physical or non-physical components (or some combination of these) within an enterprise's infrastructure or inventory. They are typically consumed or used by services (for example a physical port assigned to a service) or contribute to the realization of a Product (for example, a SIM card). They can be drawn from the Application, Computing and Network domains, and include, for example, Network Elements, software, IT systems, content and information, and technology components. A ResourceSpecification is an abstract base class for representing a generic means for implementing a particular type of Resource. In essence, a ResourceSpecification defines the common attributes and relationships of a set of related Resources, while Resource defines a specific instance that is based on a particular ResourceSpecification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-@Entity(name = "ResSpec")
-public abstract class ResourceSpecification extends BaseEntity {
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("isBundle")
-	protected Boolean isBundle = null;
-
-	@JsonProperty("category")
-	protected String category = null;
-
-	@JsonProperty("targetResourceSchema")
-	protected TargetResourceSchema targetResourceSchema = null;
-
-	
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<AttachmentRefOrValue> attachment = new HashSet<>();
-
-	@JsonProperty("featureSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<FeatureSpecification> featureSpecification = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("resourceSpecCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<ResourceSpecificationCharacteristic> resourceSpecCharacteristic =  new HashSet<>();
-
-	@JsonProperty("resourceSpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<ResourceSpecificationRelationship> resourceSpecRelationship =  new HashSet<>();
-
-
-	@JsonIgnore
-	@Column( name = "candidate_specid" )
-	private String resourceCandidateObjId;
-
-
-	
-
-
-	/**
-	 * Unique identifier of this REST resource
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of this REST resource")
-
-	public String getId() {
-		if ( uuid != null ) {
-			id = uuid;			
-		}
-		return uuid;
-	}
-
-
-	public ResourceSpecification href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference to this REST resource
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference to this REST resource")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceSpecification category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Category of the target resource like NetworkConnectivity, PhysicalLinks,
-	 * Generic, L2Network and so on.
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Category of the target resource like NetworkConnectivity, PhysicalLinks, Generic, L2Network and so on.")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ResourceSpecification description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this REST resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this REST resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceSpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * A flag indicates that if this resource specification is a bundled
-	 * specification (true) or single (false).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "A flag indicates that if this resource specification is a bundled specification (true) or single (false).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	
-
-	public ResourceSpecification lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of the resource specification
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of the resource specification")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ResourceSpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceSpecification version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Resource Specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Resource Specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ResourceSpecification attachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ResourceSpecification addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Complements the description of an element (for instance a resource) through
-	 * video, pictures ...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Complements the description of an element (for instance a resource) through video, pictures ...")
-	@Valid
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ResourceSpecification featureSpecification(Set<FeatureSpecification> featureSpecification) {
-		this.featureSpecification = featureSpecification;
-		return this;
-	}
-
-	public ResourceSpecification addFeatureSpecificationItem(FeatureSpecification featureSpecificationItem) {
-		if (this.featureSpecification == null) {
-			this.featureSpecification = new HashSet<>();
-		}
-		this.featureSpecification.add(featureSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of Features for this specification.
-	 * 
-	 * @return featureSpecification
-	 **/
-	@Schema(description = "A list of Features for this specification.")
-	@Valid
-	public Set<FeatureSpecification> getFeatureSpecification() {
-		return featureSpecification;
-	}
-
-	public void setFeatureSpecification(Set<FeatureSpecification> featureSpecification) {
-		this.featureSpecification = featureSpecification;
-	}
-
-
-	public ResourceSpecification resourceSpecCharacteristic(
-			Set<ResourceSpecificationCharacteristic> resourceSpecCharacteristic) {
-		this.resourceSpecCharacteristic = resourceSpecCharacteristic;
-		return this;
-	}
-
-	public ResourceSpecification addResourceSpecCharacteristicItem(
-			ResourceSpecificationCharacteristic resourceSpecCharacteristicItem) {
-		if (this.resourceSpecCharacteristic == null) {
-			this.resourceSpecCharacteristic = new HashSet<>();
-		}
-		this.resourceSpecCharacteristic.add(resourceSpecCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A characteristic quality or distinctive feature of a ResourceSpecification.
-	 * The characteristic can be take on a discrete value, such as color, can take
-	 * on a range of values, (for example, sensitivity of 100-240 mV), or can be
-	 * derived from a formula (for example, usage time (hrs) = 30 - talk time *3).
-	 * Certain characteristics, such as color, may be configured during the ordering
-	 * or some other process.
-	 * 
-	 * @return resourceSpecCharacteristic
-	 **/
-
-	@Schema(description = "A characteristic quality or distinctive feature of a ResourceSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.")
-	@Valid
-	public Set<ResourceSpecificationCharacteristic> getResourceSpecCharacteristic() {
-		return resourceSpecCharacteristic;
-	}
-
-	public void setResourceSpecCharacteristic(Set<ResourceSpecificationCharacteristic> resourceSpecCharacteristic) {
-		this.resourceSpecCharacteristic = resourceSpecCharacteristic;
-	}
-
-	public ResourceSpecification resourceSpecRelationship(
-			Set<ResourceSpecificationRelationship> resourceSpecRelationship) {
-		this.resourceSpecRelationship = resourceSpecRelationship;
-		return this;
-	}
-
-	public ResourceSpecification addResourceSpecRelationshipItem(
-			ResourceSpecificationRelationship resourceSpecRelationshipItem) {
-		if (this.resourceSpecRelationship == null) {
-			this.resourceSpecRelationship = new HashSet<>();
-		}
-		this.resourceSpecRelationship.add(resourceSpecRelationshipItem);
-		return this;
-	}
-	
-	
-
-	/**
-	 * @return the resourceCandidateObjId
-	 */
-	public String getResourceCandidateObjId() {
-		return resourceCandidateObjId;
-	}
-
-
-	/**
-	 * @param resourceCandidateObjId the resourceCandidateObjId to set
-	 */
-	public void setResourceCandidateObjId(String resourceCandidateObjId) {
-		this.resourceCandidateObjId = resourceCandidateObjId;
-	}
-	
-	
-
-	/**
-	 * A migration, substitution, dependency or exclusivity relationship
-	 * between/among resource specifications.
-	 * 
-	 * @return resourceSpecRelationship
-	 **/
-	@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among resource specifications.")
-	@Valid
-	public Set<ResourceSpecificationRelationship> getResourceSpecRelationship() {
-		return resourceSpecRelationship;
-	}
-
-	public void setResourceSpecRelationship(Set<ResourceSpecificationRelationship> resourceSpecRelationship) {
-		this.resourceSpecRelationship = resourceSpecRelationship;
-	}
-
-	public ResourceSpecification targetResourceSchema(TargetResourceSchema targetResourceSchema) {
-		this.targetResourceSchema = targetResourceSchema;
-		return this;
-	}
-
-	/**
-	 * Get targetResourceSchema
-	 * 
-	 * @return targetResourceSchema
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TargetResourceSchema getTargetResourceSchema() {
-		return targetResourceSchema;
-	}
-
-	public void setTargetResourceSchema(TargetResourceSchema targetResourceSchema) {
-		this.targetResourceSchema = targetResourceSchema;
-	}
-
-
-	public ResourceSpecification baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ResourceSpecification schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ResourceSpecification type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecification resourceSpecification = (ResourceSpecification) o;
-		return Objects.equals(this.id, resourceSpecification.id)
-				&& Objects.equals(this.href, resourceSpecification.href)
-				&& Objects.equals(this.category, resourceSpecification.category)
-				&& Objects.equals(this.description, resourceSpecification.description)
-				&& Objects.equals(this.isBundle, resourceSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, resourceSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, resourceSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, resourceSpecification.name)
-				&& Objects.equals(this.version, resourceSpecification.version)
-				&& Objects.equals(this.attachment, resourceSpecification.attachment)
-				&& Objects.equals(this.featureSpecification, resourceSpecification.featureSpecification)
-				&& Objects.equals(this.relatedParty, resourceSpecification.relatedParty)
-				&& Objects.equals(this.resourceSpecCharacteristic, resourceSpecification.resourceSpecCharacteristic)
-				&& Objects.equals(this.resourceSpecRelationship, resourceSpecification.resourceSpecRelationship)
-				&& Objects.equals(this.targetResourceSchema, resourceSpecification.targetResourceSchema)
-				&& Objects.equals(this.validFor, resourceSpecification.validFor)
-				&& Objects.equals(this.baseType, resourceSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, resourceSpecification.schemaLocation)
-				&& Objects.equals(this.type, resourceSpecification.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, category, description, isBundle, lastUpdate, lifecycleStatus, name, version,
-				attachment, featureSpecification, relatedParty, resourceSpecCharacteristic, resourceSpecRelationship,
-				targetResourceSchema, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecCharacteristic: ").append(toIndentedString(resourceSpecCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecRelationship)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-	
-
-
-	public void fixResourceCharRelationhsipIDs() {
-		for (ResourceSpecificationCharacteristic schar : resourceSpecCharacteristic) {
-			for (ResourceSpecCharRelationship charRel : schar.getResourceSpecCharRelationship()) {
-				if (charRel.getId() == null) {
-					// search other specCharacteristics inside the resourceSpec to get the id (if
-					// they have same name). Then ID will be the same as the id of the
-					// resourceSpecCharacteristic
-					for (ResourceSpecificationCharacteristic searchChar : resourceSpecCharacteristic) {
-						if (searchChar.getName().equals(charRel.getName())) {
-							charRel.setId(searchChar.getUuid());
-							break;
-						}
-					}
-
-				}
-				// if still is null se this id:
-				if (charRel.getId() == null) {
-					charRel.setId(this.getName() + "-" + charRel.getName());
-				}
-			}
-
-		}
-
-	}
-
-	/**
-	 * @return the relatedParty
-	 */
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	/**
-	 * @param relatedParty the relatedParty to set
-	 */
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ResourceSpecificationCharacteristic findSpecCharacteristicByName(String a) {
-		for (ResourceSpecificationCharacteristic ssci : this.getResourceSpecCharacteristic()) {
-			if (ssci.getName().equals(a)) {
-				return ssci;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEvent.java
deleted file mode 100644
index fbe0bf4d912c343b6351ff31f4e55d85fdb99db4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceSpecificationChangeEventPayload event = null;
-
-  public ResourceSpecificationChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceSpecificationChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceSpecificationChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceSpecificationChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceSpecificationChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceSpecificationChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceSpecificationChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceSpecificationChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceSpecificationChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceSpecificationChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceSpecificationChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceSpecificationChangeEvent event(ResourceSpecificationChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecificationChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceSpecificationChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationChangeEvent resourceSpecificationChangeEvent = (ResourceSpecificationChangeEvent) o;
-    return Objects.equals(this.id, resourceSpecificationChangeEvent.id) &&
-        Objects.equals(this.href, resourceSpecificationChangeEvent.href) &&
-        Objects.equals(this.eventId, resourceSpecificationChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceSpecificationChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceSpecificationChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceSpecificationChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceSpecificationChangeEvent.domain) &&
-        Objects.equals(this.title, resourceSpecificationChangeEvent.title) &&
-        Objects.equals(this.description, resourceSpecificationChangeEvent.description) &&
-        Objects.equals(this.priority, resourceSpecificationChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceSpecificationChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceSpecificationChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEventPayload.java
deleted file mode 100644
index 20d679a9f653b51d19d15b231724f45848a2c122..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationChangeEventPayload   {
-  @JsonProperty("resourceSpecification")
-  private ResourceSpecification resourceSpecification = null;
-
-  public ResourceSpecificationChangeEventPayload resourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-    return this;
-  }
-
-  /**
-   * Get resourceSpecification
-   * @return resourceSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecification getResourceSpecification() {
-    return resourceSpecification;
-  }
-
-  public void setResourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationChangeEventPayload resourceSpecificationChangeEventPayload = (ResourceSpecificationChangeEventPayload) o;
-    return Objects.equals(this.resourceSpecification, resourceSpecificationChangeEventPayload.resourceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationChangeEventPayload {\n");
-    
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristic.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristic.java
deleted file mode 100644
index 8f3e824ec1c375faea49fb77106770c328692a68..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristic.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * This class defines the characteristic features of a resource specification.
- * Every ResourceSpecification has a variety of important attributes, methods,
- * constraints, and relationships, which distinguish a resource specification
- * from other resource specifications.
- */
-@Schema(description = "This class defines the characteristic features of a resource specification. Every ResourceSpecification has a variety of important attributes, methods, constraints, and relationships, which distinguish a resource specification from other resource specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "ResourceSpecCharacteristic")
-public class ResourceSpecificationCharacteristic  extends BaseRootNamedEntity {
-
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("configurable")
-	private Boolean configurable = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	@JsonProperty("@valueSchemaLocation")
-	private String valueSchemaLocation = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("isUnique")
-	private Boolean isUnique = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("extensible")
-	private Boolean extensible = null;
-
-	@JsonProperty("resourceSpecCharRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceSpecCharRelationship> resourceSpecCharRelationship = new HashSet<>();;
-
-	@JsonProperty("resourceSpecCharacteristicValue")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceSpecificationCharacteristicValue> resourceSpecCharacteristicValue = new HashSet<>();;
-
-	public ResourceSpecificationCharacteristic() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ResourceSpecificationCharacteristic(ResourceSpecificationCharacteristic src) {
-		this();
-		configurable = src.configurable;
-		description = src.description;
-		extensible = src.extensible;
-		isUnique = src.isUnique;
-		maxCardinality = src.maxCardinality;
-		minCardinality = src.minCardinality;
-		name = src.name;
-		regex = src.regex;
-		valueType = src.valueType;
-		validFor = new TimePeriod( src.validFor ) ;
-		
-		if ( src.resourceSpecCharRelationship!=null )
-			for (ResourceSpecCharRelationship r : src.resourceSpecCharRelationship) {
-				this.addResourceSpecCharRelationshipItem( new ResourceSpecCharRelationship( r ));
-			}
-		if ( src.resourceSpecCharacteristicValue!=null )
-			for (ResourceSpecificationCharacteristicValue r : src.resourceSpecCharacteristicValue) {
-				this.addResourceSpecCharacteristicValueItem( new ResourceSpecificationCharacteristicValue(r) );
-			}
-
-	}
-
-	public ResourceSpecificationCharacteristic name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A word, term, or phrase by which this characteristic specification is known
-	 * and distinguished from other characteristic specifications.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A word, term, or phrase by which this characteristic specification is known and distinguished from other characteristic specifications.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceSpecificationCharacteristic description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative that explains the CharacteristicSpecification.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative that explains the CharacteristicSpecification.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceSpecificationCharacteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ResourceSpecificationCharacteristic configurable(Boolean configurable) {
-		this.configurable = configurable;
-		return this;
-	}
-
-	/**
-	 * If true, the Boolean indicates that the ResourceSpecificationCharacteristic is
-	 * configurable
-	 * 
-	 * @return configurable
-	 **/
-	@Schema(description = "If true, the Boolean indicates that the ResourceSpecificationCharacteristic is configurable")
-
-	public Boolean isConfigurable() {
-		return configurable;
-	}
-
-	public void setConfigurable(Boolean configurable) {
-		this.configurable = configurable;
-	}
-
-	public ResourceSpecificationCharacteristic validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period of time for which a characteristic is applicable.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period of time for which a characteristic is applicable.")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ResourceSpecificationCharacteristic type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * (Class) type of the ResourceSpecificationCharacteristic
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "(Class) type of the ResourceSpecificationCharacteristic")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public ResourceSpecificationCharacteristic schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing this characteristic specification
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing this characteristic specification")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ResourceSpecificationCharacteristic valueSchemaLocation(String valueSchemaLocation) {
-		this.valueSchemaLocation = valueSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * This (optional) field provides a link to the schema describing the value type
-	 * 
-	 * @return valueSchemaLocation
-	 **/
-	@Schema(description = "This (optional) field provides a link to the schema describing the value type")
-
-	public String getValueSchemaLocation() {
-		return valueSchemaLocation;
-	}
-
-	public void setValueSchemaLocation(String valueSchemaLocation) {
-		this.valueSchemaLocation = valueSchemaLocation;
-	}
-
-	public ResourceSpecificationCharacteristic minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where zero is
-	 * the value for the minCardinality.
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-	public ResourceSpecificationCharacteristic maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where five is
-	 * the value for the maxCardinality.
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public ResourceSpecificationCharacteristic isUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies if a value is unique for the specification.
-	 * Possible values are; \"unique while value is in effect\" and \"unique whether
-	 * value is in effect or not\"
-	 * 
-	 * @return isUnique
-	 **/
-	@Schema(description = "An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"")
-
-	public Boolean isIsUnique() {
-		return isUnique;
-	}
-
-	public void setIsUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-	}
-
-	public ResourceSpecificationCharacteristic regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A rule or principle represented in regular expression used to derive the
-	 * value of a characteristic value.
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value.")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ResourceSpecificationCharacteristic extensible(Boolean extensible) {
-		this.extensible = extensible;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies that the values for the characteristic can be
-	 * extended by adding new values when instantiating a characteristic for a
-	 * resource.
-	 * 
-	 * @return extensible
-	 **/
-	@Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a resource.")
-
-	public Boolean isExtensible() {
-		return extensible;
-	}
-
-	public void setExtensible(Boolean extensible) {
-		this.extensible = extensible;
-	}
-
-	public ResourceSpecificationCharacteristic resourceSpecCharRelationship(
-			Set<ResourceSpecCharRelationship> resourceSpecCharRelationship) {
-		this.resourceSpecCharRelationship = resourceSpecCharRelationship;
-		return this;
-	}
-
-	public ResourceSpecificationCharacteristic addResourceSpecCharRelationshipItem(
-			ResourceSpecCharRelationship resourceSpecCharRelationshipItem) {
-		if (this.resourceSpecCharRelationship == null) {
-			this.resourceSpecCharRelationship = new HashSet<>();
-		}
-		this.resourceSpecCharRelationship.add(resourceSpecCharRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get resourceSpecCharRelationship
-	 * 
-	 * @return resourceSpecCharRelationship
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ResourceSpecCharRelationship> getResourceSpecCharRelationship() {
-		return resourceSpecCharRelationship;
-	}
-
-	public void setResourceSpecCharRelationship(Set<ResourceSpecCharRelationship> resourceSpecCharRelationship) {
-		this.resourceSpecCharRelationship = resourceSpecCharRelationship;
-	}
-
-	public ResourceSpecificationCharacteristic ResourceSpecCharacteristicValue(
-			Set<ResourceSpecificationCharacteristicValue> ResourceSpecificationCharacteristicValue) {
-		this.resourceSpecCharacteristicValue = ResourceSpecificationCharacteristicValue;
-		return this;
-	}
-
-	public ResourceSpecificationCharacteristic addResourceSpecCharacteristicValueItem(
-			ResourceSpecificationCharacteristicValue ResourceSpecificationCharacteristicValueItem) {
-		if (this.resourceSpecCharacteristicValue == null) {
-			this.resourceSpecCharacteristicValue = new HashSet<>();
-		}
-		this.resourceSpecCharacteristicValue.add(ResourceSpecificationCharacteristicValueItem);
-		return this;
-	}
-
-	/**
-	 * Get ResourceSpecificationCharacteristicValue
-	 * 
-	 * @return ResourceSpecificationCharacteristicValue
-	 **/
-	@Schema(description = "")
-
-	@Valid
-
-	public Set<ResourceSpecificationCharacteristicValue> getResourceSpecCharacteristicValue() {
-		return resourceSpecCharacteristicValue;
-	}
-
-	public void setResourceSpecificationCharacteristicValue(
-			Set<ResourceSpecificationCharacteristicValue> ResourceSpecificationCharacteristicValue) {
-		this.resourceSpecCharacteristicValue = ResourceSpecificationCharacteristicValue;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationCharacteristic ResourceSpecificationCharacteristic = (ResourceSpecificationCharacteristic) o;
-		return Objects.equals(this.name, ResourceSpecificationCharacteristic.name)
-				&& Objects.equals(this.description, ResourceSpecificationCharacteristic.description)
-				&& Objects.equals(this.valueType, ResourceSpecificationCharacteristic.valueType)
-				&& Objects.equals(this.configurable, ResourceSpecificationCharacteristic.configurable)
-				&& Objects.equals(this.validFor, ResourceSpecificationCharacteristic.validFor)
-				&& Objects.equals(this.type, ResourceSpecificationCharacteristic.type)
-				&& Objects.equals(this.schemaLocation, ResourceSpecificationCharacteristic.schemaLocation)
-				&& Objects.equals(this.valueSchemaLocation, ResourceSpecificationCharacteristic.valueSchemaLocation)
-				&& Objects.equals(this.minCardinality, ResourceSpecificationCharacteristic.minCardinality)
-				&& Objects.equals(this.maxCardinality, ResourceSpecificationCharacteristic.maxCardinality)
-				&& Objects.equals(this.isUnique, ResourceSpecificationCharacteristic.isUnique)
-				&& Objects.equals(this.regex, ResourceSpecificationCharacteristic.regex)
-				&& Objects.equals(this.extensible, ResourceSpecificationCharacteristic.extensible)
-				&& Objects.equals(this.resourceSpecCharRelationship,
-						ResourceSpecificationCharacteristic.resourceSpecCharRelationship)
-				&& Objects.equals(this.resourceSpecCharacteristicValue,
-						ResourceSpecificationCharacteristic.resourceSpecCharacteristicValue);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, name, description, valueType, configurable, validFor, type, schemaLocation,
-//				valueSchemaLocation, minCardinality, maxCardinality, isUnique, regex, extensible,
-//				resourceSpecCharRelationship, ResourceSpecificationCharacteristicValue);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecificationCharacteristic {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    valueSchemaLocation: ").append(toIndentedString(valueSchemaLocation)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-		sb.append("    resourceSpecCharRelationship: ").append(toIndentedString(resourceSpecCharRelationship))
-				.append("\n");
-		sb.append("    ResourceSpecificationCharacteristicValue: ").append(toIndentedString(resourceSpecCharacteristicValue))
-				.append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(ResourceSpecificationCharacteristic src) {
-		this.name = src.getName();
-		this.description = src.getDescription();
-		this.maxCardinality = src.getMaxCardinality();
-		this.minCardinality = src.getMinCardinality();
-		this.regex = src.getRegex();
-		this.isUnique = src.isUnique;
-		this.configurable = src.isConfigurable();
-		this.extensible = src.isExtensible();
-
-		this.updateResourceSpecificationCharacteristicValues(src.getResourceSpecCharacteristicValue());
-		this.updateResourceSpecCharRelationships(src.getResourceSpecCharRelationship());
-
-	}
-
-	private void updateResourceSpecificationCharacteristicValues(@Valid Set<ResourceSpecificationCharacteristicValue> srcSet) {
-
-		Map<Integer, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (ResourceSpecificationCharacteristicValue r : srcSet) {
-
-			boolean valueExists = false;
-			for (ResourceSpecificationCharacteristicValue thisCharVal : this.resourceSpecCharacteristicValue) {
-				if (thisCharVal.hashCode() == r.hashCode()) {
-					valueExists = true;
-					idAddedUpdated.put(thisCharVal.hashCode(), true);
-					break;
-				}
-			}
-
-			if (!valueExists) {
-				ResourceSpecificationCharacteristicValue nr = new ResourceSpecificationCharacteristicValue(r);
-				this.addResourceSpecCharacteristicValueItem(nr);
-				idAddedUpdated.put(nr.hashCode(), true);
-			}
-
-		}
-
-		/**
-		 * remove those that don't exist anymore
-		 */
-
-		List<ResourceSpecificationCharacteristicValue> toRemove = new ArrayList<>();
-		for (ResourceSpecificationCharacteristicValue ss : this.resourceSpecCharacteristicValue) {
-			if (idAddedUpdated.get(ss.hashCode()) == null) {
-				toRemove.add(ss);
-			}
-		}
-
-		for (ResourceSpecificationCharacteristicValue r : toRemove) {
-			this.resourceSpecCharacteristicValue.remove(r);
-		}
-
-	}
-
-	private void updateResourceSpecCharRelationships(@Valid Set<ResourceSpecCharRelationship> srcSet) {
-
-		Map<String, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (ResourceSpecCharRelationship r : srcSet) {
-
-			boolean valueExists = false;
-			for (ResourceSpecCharRelationship thisCharVal : this.resourceSpecCharRelationship) {
-				if ((thisCharVal.getId() != null) && (thisCharVal.getId().equals(r.getId()))) {
-					valueExists = true;
-					idAddedUpdated.put(thisCharVal.getId(), true);
-					break;
-				}
-			}
-
-			if (!valueExists) {
-				this.resourceSpecCharRelationship.add(new ResourceSpecCharRelationship(r));
-				idAddedUpdated.put(r.getId(), true);
-			}
-
-		}
-
-		/**
-		 * remove those that don't exist anymore
-		 */
-
-		List<ResourceSpecCharRelationship> toRemove = new ArrayList<>();
-		for (ResourceSpecCharRelationship ss : this.resourceSpecCharRelationship) {
-			if (idAddedUpdated.get(ss.getId()) == null) {
-				toRemove.add(ss);
-			}
-		}
-
-		for (ResourceSpecCharRelationship r : toRemove) {
-			this.resourceSpecCharRelationship.remove(r);
-		}
-
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicRelationship.java
deleted file mode 100644
index 4cbc6fe6ea5bcd66927914c2dff0c9d43355616f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicRelationship.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity relationship between/among ResourceSpecificationCharacteristics. The specification characteristic is embedded within the specification whose ID and href are in this entity, and identified by its ID.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among ResourceSpecificationCharacteristics. The specification characteristic is embedded within the specification whose ID and href are in this entity, and identified by its ID.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationCharacteristicRelationship   {
-  @JsonProperty("characteristicSpecificationId")
-  private String characteristicSpecificationId = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("resourceSpecificationHref")
-  private String resourceSpecificationHref = null;
-
-  @JsonProperty("resourceSpecificationId")
-  private String resourceSpecificationId = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ResourceSpecificationCharacteristicRelationship characteristicSpecificationId(String characteristicSpecificationId) {
-    this.characteristicSpecificationId = characteristicSpecificationId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the characteristic within the specification
-   * @return characteristicSpecificationId
-  **/
-  @Schema(description = "Unique identifier of the characteristic within the specification")
-  
-    public String getCharacteristicSpecificationId() {
-    return characteristicSpecificationId;
-  }
-
-  public void setCharacteristicSpecificationId(String characteristicSpecificationId) {
-    this.characteristicSpecificationId = characteristicSpecificationId;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the target characteristic within the specification
-   * @return name
-  **/
-  @Schema(description = "Name of the target characteristic within the specification")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as aggregation, migration, substitution, dependency, exclusivity
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship such as aggregation, migration, substitution, dependency, exclusivity")
-  
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship resourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference to the resource specification containing the target characteristic
-   * @return resourceSpecificationHref
-  **/
-  @Schema(description = "Hyperlink reference to the resource specification containing the target characteristic")
-  
-    public String getResourceSpecificationHref() {
-    return resourceSpecificationHref;
-  }
-
-  public void setResourceSpecificationHref(String resourceSpecificationHref) {
-    this.resourceSpecificationHref = resourceSpecificationHref;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship resourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the resource specification containing the target characteristic
-   * @return resourceSpecificationId
-  **/
-  @Schema(description = "Unique identifier of the resource specification containing the target characteristic")
-  
-    public String getResourceSpecificationId() {
-    return resourceSpecificationId;
-  }
-
-  public void setResourceSpecificationId(String resourceSpecificationId) {
-    this.resourceSpecificationId = resourceSpecificationId;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceSpecificationCharacteristicRelationship _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationCharacteristicRelationship resourceSpecificationCharacteristicRelationship = (ResourceSpecificationCharacteristicRelationship) o;
-    return Objects.equals(this.characteristicSpecificationId, resourceSpecificationCharacteristicRelationship.characteristicSpecificationId) &&
-        Objects.equals(this.name, resourceSpecificationCharacteristicRelationship.name) &&
-        Objects.equals(this.relationshipType, resourceSpecificationCharacteristicRelationship.relationshipType) &&
-        Objects.equals(this.resourceSpecificationHref, resourceSpecificationCharacteristicRelationship.resourceSpecificationHref) &&
-        Objects.equals(this.resourceSpecificationId, resourceSpecificationCharacteristicRelationship.resourceSpecificationId) &&
-        Objects.equals(this.validFor, resourceSpecificationCharacteristicRelationship.validFor) &&
-        Objects.equals(this._atBaseType, resourceSpecificationCharacteristicRelationship._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceSpecificationCharacteristicRelationship._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceSpecificationCharacteristicRelationship._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(characteristicSpecificationId, name, relationshipType, resourceSpecificationHref, resourceSpecificationId, validFor, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationCharacteristicRelationship {\n");
-    
-    sb.append("    characteristicSpecificationId: ").append(toIndentedString(characteristicSpecificationId)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    resourceSpecificationHref: ").append(toIndentedString(resourceSpecificationHref)).append("\n");
-    sb.append("    resourceSpecificationId: ").append(toIndentedString(resourceSpecificationId)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicValue.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicValue.java
deleted file mode 100644
index f89a335aeb2b0b24b00eaf7a5ebf4eed6af0e0bc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCharacteristicValue.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A number or text that can be assigned to a ResourceSpecCharacteristic.
- */
-@Schema(description = "A number or text that can be assigned to a ResourceSpecCharacteristic.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-@Entity(name = "ResourceSpecCharacteristicValue")
-public class ResourceSpecificationCharacteristicValue  extends BaseRootEntity {
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("isDefault")
-	private Boolean isDefault = null;
-
-	@JsonProperty("value")
-	private Any value = null;
-
-	@JsonProperty("unitOfMeasure")
-	private String unitOfMeasure = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("valueFrom")
-	private Integer valueFrom = null;
-
-	@JsonProperty("valueTo")
-	private Integer valueTo = null;
-
-	@JsonProperty("rangeInterval")
-	private String rangeInterval = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	public ResourceSpecificationCharacteristicValue() {
-	}
-
-	public ResourceSpecificationCharacteristicValue(ResourceSpecificationCharacteristicValue r) {
-		this();
-		isDefault = r.isDefault;
-		rangeInterval = r.rangeInterval;
-		regex = r.regex;
-		unitOfMeasure = r.unitOfMeasure;
-		valueFrom = r.valueFrom;
-		valueTo = r.valueTo;
-		valueType = r.valueType;
-		validFor = new TimePeriod( r.validFor );
-		if (r.value !=null ) {
-			value = new Any( r.value.getValue(), r.value.getAlias()) ;
-		}
-//		type = r.type;
-		baseType = r.baseType;
-		
-	}
-
-	
-	public ResourceSpecificationCharacteristicValue valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic value can take on, such as numeric,
-	 * text and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic value can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ResourceSpecificationCharacteristicValue isDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-		return this;
-	}
-
-	/**
-	 * If true, the Boolean Indicates if the value is the default value for a
-	 * characteristic
-	 * 
-	 * @return isDefault
-	 **/
-	@Schema(description = "If true, the Boolean Indicates if the value is the default value for a characteristic")
-
-	public Boolean isIsDefault() {
-		return isDefault;
-	}
-
-	public void setIsDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-	}
-
-	public ResourceSpecificationCharacteristicValue value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * The value that the characteristic can take on. If the value is a complex
-	 * type, the definition of the type should be found by the link as defined
-	 * in @schemaLocation
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "The value that the characteristic can take on. If the value is a complex type, the definition of the type should be found by the link as defined in @schemaLocation")
-
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	public ResourceSpecificationCharacteristicValue unitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * A length, surface, volume, dry measure, liquid measure, money, weight, time,
-	 * and the like. In general, a determinate quantity or magnitude of the kind
-	 * designated, taken as a standard of comparison for others of the same kind, in
-	 * assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "A length, surface, volume, dry measure, liquid measure, money, weight, time, and the like. In general, a determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.")
-
-	public String getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	public ResourceSpecificationCharacteristicValue validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period of time for which a value is applicable.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period of time for which a value is applicable.")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ResourceSpecificationCharacteristicValue valueFrom(Integer valueFrom) {
-		this.valueFrom = valueFrom;
-		return this;
-	}
-
-	/**
-	 * The low range value that a characteristic can take on
-	 * 
-	 * @return valueFrom
-	 **/
-	@Schema(description = "The low range value that a characteristic can take on")
-
-	public Integer getValueFrom() {
-		return valueFrom;
-	}
-
-	public void setValueFrom(Integer valueFrom) {
-		this.valueFrom = valueFrom;
-	}
-
-	public ResourceSpecificationCharacteristicValue valueTo(Integer valueTo) {
-		this.valueTo = valueTo;
-		return this;
-	}
-
-	/**
-	 * The upper range value that a characteristic can take on
-	 * 
-	 * @return valueTo
-	 **/
-	@Schema(description = "The upper range value that a characteristic can take on")
-
-	public Integer getValueTo() {
-		return valueTo;
-	}
-
-	public void setValueTo(Integer valueTo) {
-		this.valueTo = valueTo;
-	}
-
-	public ResourceSpecificationCharacteristicValue rangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies the inclusion or exclusion of the valueFrom and
-	 * valueTo attributes. If applicable, possible values are \"open\", \"closed\",
-	 * \"closedBottom\" and \"closedTop\".
-	 * 
-	 * @return rangeInterval
-	 **/
-	@Schema(description = "An indicator that specifies the inclusion or exclusion of the valueFrom and valueTo attributes. If applicable, possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-
-	public String getRangeInterval() {
-		return rangeInterval;
-	}
-
-	public void setRangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-	}
-
-	public ResourceSpecificationCharacteristicValue regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A regular expression constraint for given value
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A regular expression constraint for given value")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ResourceSpecificationCharacteristicValue type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * The class type of a complex value type
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "The class type of a complex value type")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public ResourceSpecificationCharacteristicValue schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * This (optional) field provides a link to the schema describing the value type
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "This (optional) field provides a link to the schema describing the value type")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationCharacteristicValue resourceSpecCharacteristicValue = (ResourceSpecificationCharacteristicValue) o;
-		return Objects.equals(this.valueType, resourceSpecCharacteristicValue.valueType)
-				&& Objects.equals(this.isDefault, resourceSpecCharacteristicValue.isDefault)
-				&& Objects.equals(this.value, resourceSpecCharacteristicValue.value)
-				&& Objects.equals(this.unitOfMeasure, resourceSpecCharacteristicValue.unitOfMeasure)
-				&& Objects.equals(this.validFor, resourceSpecCharacteristicValue.validFor)
-				&& Objects.equals(this.valueFrom, resourceSpecCharacteristicValue.valueFrom)
-				&& Objects.equals(this.valueTo, resourceSpecCharacteristicValue.valueTo)
-				&& Objects.equals(this.rangeInterval, resourceSpecCharacteristicValue.rangeInterval)
-				&& Objects.equals(this.regex, resourceSpecCharacteristicValue.regex)
-				&& Objects.equals(this.type, resourceSpecCharacteristicValue.type)
-				&& Objects.equals(this.schemaLocation, resourceSpecCharacteristicValue.schemaLocation);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid,valueType, isDefault, value, unitOfMeasure, validFor, valueFrom, valueTo, rangeInterval,
-//				regex, type, schemaLocation);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecCharacteristicValue {\n");
-
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    isDefault: ").append(toIndentedString(isDefault)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-		sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-		sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreate.java
deleted file mode 100644
index 688947ea0f42e1299a95cb395b7884a891fcaa86..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreate.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Resources are physical or non-physical components (or some combination of
- * these) within an enterprise&#x27;s infrastructure or inventory. They are
- * typically consumed or used by services (for example a physical port assigned
- * to a service) or contribute to the realization of a Product (for example, a
- * SIM card). They can be drawn from the Application, Computing and Network
- * domains, and include, for example, Network Elements, software, IT systems,
- * content and information, and technology components. A ResourceSpecification
- * is an abstract base class for representing a generic means for implementing a
- * particular type of Resource. In essence, a ResourceSpecification defines the
- * common attributes and relationships of a set of related Resources, while
- * Resource defines a specific instance that is based on a particular
- * ResourceSpecification. Skipped properties: id,href
- */
-@Schema(description = "Resources are physical or non-physical components (or some combination of these) within an enterprise's infrastructure or inventory. They are typically consumed or used by services (for example a physical port assigned to a service) or contribute to the realization of a Product (for example, a SIM card). They can be drawn from the Application, Computing and Network domains, and include, for example, Network Elements, software, IT systems, content and information, and technology components. A ResourceSpecification is an abstract base class for representing a generic means for implementing a particular type of Resource. In essence, a ResourceSpecification defines the common attributes and relationships of a set of related Resources, while Resource defines a specific instance that is based on a particular ResourceSpecification. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-public class ResourceSpecificationCreate extends ResourceSpecificationUpdate {
-
-
-	public ResourceSpecificationCreate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationCreate resourceSpecificationCreate = (ResourceSpecificationCreate) o;
-		return Objects.equals(this.name, resourceSpecificationCreate.name)
-				&& Objects.equals(this.description, resourceSpecificationCreate.description)
-				&& Objects.equals(this.type, resourceSpecificationCreate.type)
-				&& Objects.equals(this.schemaLocation, resourceSpecificationCreate.schemaLocation)
-				&& Objects.equals(this.baseType, resourceSpecificationCreate.baseType)
-				&& Objects.equals(this.version, resourceSpecificationCreate.version)
-				&& Objects.equals(this.validFor, resourceSpecificationCreate.validFor)
-				&& Objects.equals(this.lifecycleStatus, resourceSpecificationCreate.lifecycleStatus)
-				&& Objects.equals(this.isBundle, resourceSpecificationCreate.isBundle)
-				&& Objects.equals(this.category, resourceSpecificationCreate.category)
-				&& Objects.equals(this.targetResourceSchema, resourceSpecificationCreate.targetResourceSchema)
-				&& Objects.equals(this.featureSpecification, resourceSpecificationCreate.featureSpecification)
-				&& Objects.equals(this.attachment, resourceSpecificationCreate.attachment)
-				&& Objects.equals(this.relatedParty, resourceSpecificationCreate.relatedParty)
-				&& Objects.equals(this.resourceSpecificationCharacteristic,
-						resourceSpecificationCreate.resourceSpecificationCharacteristic)
-				&& Objects.equals(this.resourceSpecificationRelationship, resourceSpecificationCreate.resourceSpecificationRelationship);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(name, description, type, _atSchemaLocation, _atBaseType, version, validFor, lastUpdate,
-//				lifecycleStatus, isBundle, category, targetResourceSchema, featureSpecification, attachment, relatedParty,
-//				resourceSpecCharacteristic, resourceSpecRelationship);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecificationCreate {\n");
-
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEvent.java
deleted file mode 100644
index 89305b91adbbffe99db023ebfbc54493e9122d58..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceSpecificationCreateEventPayload event = null;
-
-  public ResourceSpecificationCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceSpecificationCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceSpecificationCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceSpecificationCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceSpecificationCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceSpecificationCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceSpecificationCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceSpecificationCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceSpecificationCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceSpecificationCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceSpecificationCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceSpecificationCreateEvent event(ResourceSpecificationCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecificationCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceSpecificationCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationCreateEvent resourceSpecificationCreateEvent = (ResourceSpecificationCreateEvent) o;
-    return Objects.equals(this.id, resourceSpecificationCreateEvent.id) &&
-        Objects.equals(this.href, resourceSpecificationCreateEvent.href) &&
-        Objects.equals(this.eventId, resourceSpecificationCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceSpecificationCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceSpecificationCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceSpecificationCreateEvent.correlationId) &&
-        Objects.equals(this.domain, resourceSpecificationCreateEvent.domain) &&
-        Objects.equals(this.title, resourceSpecificationCreateEvent.title) &&
-        Objects.equals(this.description, resourceSpecificationCreateEvent.description) &&
-        Objects.equals(this.priority, resourceSpecificationCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceSpecificationCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceSpecificationCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEventPayload.java
deleted file mode 100644
index 064fd7757ee12f89ed578cdec92da5ee28e9a007..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationCreateEventPayload   {
-  @JsonProperty("resourceSpecification")
-  private ResourceSpecification resourceSpecification = null;
-
-  public ResourceSpecificationCreateEventPayload resourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-    return this;
-  }
-
-  /**
-   * Get resourceSpecification
-   * @return resourceSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecification getResourceSpecification() {
-    return resourceSpecification;
-  }
-
-  public void setResourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationCreateEventPayload resourceSpecificationCreateEventPayload = (ResourceSpecificationCreateEventPayload) o;
-    return Objects.equals(this.resourceSpecification, resourceSpecificationCreateEventPayload.resourceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationCreateEventPayload {\n");
-    
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEvent.java
deleted file mode 100644
index ef5b09fc0912973e35d0ce002c52924b44fb054c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEvent.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceSpecificationDeleteEventPayload event = null;
-
-  public ResourceSpecificationDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceSpecificationDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceSpecificationDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceSpecificationDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceSpecificationDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceSpecificationDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceSpecificationDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceSpecificationDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceSpecificationDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceSpecificationDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceSpecificationDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceSpecificationDeleteEvent event(ResourceSpecificationDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecificationDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceSpecificationDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationDeleteEvent resourceSpecificationDeleteEvent = (ResourceSpecificationDeleteEvent) o;
-    return Objects.equals(this.id, resourceSpecificationDeleteEvent.id) &&
-        Objects.equals(this.href, resourceSpecificationDeleteEvent.href) &&
-        Objects.equals(this.eventId, resourceSpecificationDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceSpecificationDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceSpecificationDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceSpecificationDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceSpecificationDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceSpecificationDeleteEvent.title) &&
-        Objects.equals(this.description, resourceSpecificationDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceSpecificationDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceSpecificationDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceSpecificationDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEventPayload.java
deleted file mode 100644
index cb0f32cd3e3478febf321846e487d68ae9bb49ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationDeleteEventPayload   {
-  @JsonProperty("resourceSpecification")
-  private ResourceSpecification resourceSpecification = null;
-
-  public ResourceSpecificationDeleteEventPayload resourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-    return this;
-  }
-
-  /**
-   * Get resourceSpecification
-   * @return resourceSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecification getResourceSpecification() {
-    return resourceSpecification;
-  }
-
-  public void setResourceSpecification(ResourceSpecification resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceSpecificationDeleteEventPayload resourceSpecificationDeleteEventPayload = (ResourceSpecificationDeleteEventPayload) o;
-    return Objects.equals(this.resourceSpecification, resourceSpecificationDeleteEventPayload.resourceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceSpecificationDeleteEventPayload {\n");
-    
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRef.java
deleted file mode 100644
index 6bfae12c5f8d015d7f270da51b4f46019471c6ee..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRef.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Resource Specification reference: The ResourceSpecification is required to
- * realize a ProductSpecification.
- */
-@Schema(description = "Resource Specification reference: The ResourceSpecification is required to realize a ProductSpecification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Entity(name = "ResourceSpecificationRef")
-@JsonIgnoreProperties( {"uuid"} )
-public class ResourceSpecificationRef extends BaseRootNamedEntity {
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ResourceSpecificationRef() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ResourceSpecificationRef(ResourceSpecificationRef r) {
-		this();
-		name = r.name;
-		version = r.version;
-		id = r.id;
-		
-	}
-
-	public ResourceSpecificationRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	public ResourceSpecificationRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Resource specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Resource specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public ResourceSpecificationRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationRef resourceSpecificationRef = (ResourceSpecificationRef) o;
-		return Objects.equals(this.id, resourceSpecificationRef.id)
-				&& Objects.equals(this.href, resourceSpecificationRef.href)
-				&& Objects.equals(this.name, resourceSpecificationRef.name)
-				&& Objects.equals(this.version, resourceSpecificationRef.version)
-				&& Objects.equals(this.baseType, resourceSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, resourceSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, resourceSpecificationRef.type)
-				&& Objects.equals(this.referredType, resourceSpecificationRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRelationship.java
deleted file mode 100644
index d7fe8c8e60386e2a72112987577dc6b6386daaf5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationRelationship.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * A migration, substitution, dependency or exclusivity relationship
- * between/among resource specifications.
- */
-@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among resource specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Entity(name = "ResourceSpecRelationship")
-public class ResourceSpecificationRelationship {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("defaultQuantity")
-	private Integer defaultQuantity = null;
-
-	@JsonProperty("maximumQuantity")
-	private Integer maximumQuantity = null;
-
-	@JsonProperty("minimumQuantity")
-	private Integer minimumQuantity = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("role")
-	private String role = null;
-
-
-	@JsonProperty("resourceSpecCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<ResourceSpecificationCharacteristic> characteristic =  new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-	
-	public ResourceSpecificationRelationship id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of target ResourceSpecification
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of target ResourceSpecification")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ResourceSpecificationRelationship href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Reference of the target ResourceSpecification
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Reference of the target ResourceSpecification")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceSpecificationRelationship defaultQuantity(Integer defaultQuantity) {
-		this.defaultQuantity = defaultQuantity;
-		return this;
-	}
-
-	/**
-	 * The default number of the related resource that should be instantiated, for
-	 * example a rack would typically have 4 cards, although it could support more.
-	 * 
-	 * @return defaultQuantity
-	 **/
-	@Schema(description = "The default number of the related resource that should be instantiated, for example a rack would typically have 4 cards, although it could support more.")
-
-	public Integer getDefaultQuantity() {
-		return defaultQuantity;
-	}
-
-	public void setDefaultQuantity(Integer defaultQuantity) {
-		this.defaultQuantity = defaultQuantity;
-	}
-
-	public ResourceSpecificationRelationship maximumQuantity(Integer maximumQuantity) {
-		this.maximumQuantity = maximumQuantity;
-		return this;
-	}
-
-	/**
-	 * The maximum number of the related resource that should be instantiated, for
-	 * example a rack supports a maximum of 16 cards
-	 * 
-	 * @return maximumQuantity
-	 **/
-	@Schema(description = "The maximum number of the related resource that should be instantiated, for example a rack supports a maximum of 16 cards")
-
-	public Integer getMaximumQuantity() {
-		return maximumQuantity;
-	}
-
-	public void setMaximumQuantity(Integer maximumQuantity) {
-		this.maximumQuantity = maximumQuantity;
-	}
-
-	public ResourceSpecificationRelationship minimumQuantity(Integer minimumQuantity) {
-		this.minimumQuantity = minimumQuantity;
-		return this;
-	}
-
-	/**
-	 * The minimum number of the related resource that should be instantiated, for
-	 * example a rack must have at least 1 card
-	 * 
-	 * @return minimumQuantity
-	 **/
-	@Schema(description = "The minimum number of the related resource that should be instantiated, for example a rack must have at least 1 card")
-
-	public Integer getMinimumQuantity() {
-		return minimumQuantity;
-	}
-
-	public void setMinimumQuantity(Integer minimumQuantity) {
-		this.minimumQuantity = minimumQuantity;
-	}
-
-	public ResourceSpecificationRelationship name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * The name given to the target resource specification instance
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "The name given to the target resource specification instance")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceSpecificationRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of relationship such as migration, substitution, dependency, exclusivity
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of relationship such as migration, substitution, dependency, exclusivity")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ResourceSpecificationRelationship role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * The association role for this resource specification
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "The association role for this resource specification")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public ResourceSpecificationRelationship characteristic(Set<ResourceSpecificationCharacteristic> characteristic) {
-		this.characteristic = characteristic;
-		return this;
-	}
-
-	public ResourceSpecificationRelationship addCharacteristicItem(
-			ResourceSpecificationCharacteristic characteristicItem) {
-		if (this.characteristic == null) {
-			this.characteristic = new HashSet<>();
-		}
-		this.characteristic.add(characteristicItem);
-		return this;
-	}
-
-	/**
-	 * A characteristic that refines the relationship. For example, consider the
-	 * relationship between a slot and a card. For a half-height card it is
-	 * important to know the position at which the card is inserted, so a
-	 * characteristic Position might be defined on the relationship to allow
-	 * capturing of this in the inventory
-	 * 
-	 * @return characteristic
-	 **/
-	@Schema(description = "A characteristic that refines the relationship. For example, consider the relationship between a slot and a card. For a half-height card it is important to know the position at which the card is inserted, so a characteristic Position might be defined on the relationship to allow capturing of this in the inventory")
-	@Valid
-	public Set<ResourceSpecificationCharacteristic> getCharacteristic() {
-		return characteristic;
-	}
-
-	public void setCharacteristic(Set<ResourceSpecificationCharacteristic> characteristic) {
-		this.characteristic = characteristic;
-	}
-
-	public ResourceSpecificationRelationship validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ResourceSpecificationRelationship _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ResourceSpecificationRelationship _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ResourceSpecificationRelationship _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationRelationship resourceSpecificationRelationship = (ResourceSpecificationRelationship) o;
-		return Objects.equals(this.id, resourceSpecificationRelationship.id)
-				&& Objects.equals(this.href, resourceSpecificationRelationship.href)
-				&& Objects.equals(this.defaultQuantity, resourceSpecificationRelationship.defaultQuantity)
-				&& Objects.equals(this.maximumQuantity, resourceSpecificationRelationship.maximumQuantity)
-				&& Objects.equals(this.minimumQuantity, resourceSpecificationRelationship.minimumQuantity)
-				&& Objects.equals(this.name, resourceSpecificationRelationship.name)
-				&& Objects.equals(this.relationshipType, resourceSpecificationRelationship.relationshipType)
-				&& Objects.equals(this.role, resourceSpecificationRelationship.role)
-				&& Objects.equals(this.characteristic, resourceSpecificationRelationship.characteristic)
-				&& Objects.equals(this.validFor, resourceSpecificationRelationship.validFor)
-				&& Objects.equals(this._atBaseType, resourceSpecificationRelationship._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, resourceSpecificationRelationship._atSchemaLocation)
-				&& Objects.equals(this._atType, resourceSpecificationRelationship._atType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, defaultQuantity, maximumQuantity, minimumQuantity, name, relationshipType, role,
-				characteristic, validFor, _atBaseType, _atSchemaLocation, _atType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecificationRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    defaultQuantity: ").append(toIndentedString(defaultQuantity)).append("\n");
-		sb.append("    maximumQuantity: ").append(toIndentedString(maximumQuantity)).append("\n");
-		sb.append("    minimumQuantity: ").append(toIndentedString(minimumQuantity)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationUpdate.java
deleted file mode 100644
index e982db265bd1aefed2967d8eeccb1c27f5ee7ee9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/ResourceSpecificationUpdate.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Resources are physical or non-physical components (or some combination of
- * these) within an enterprise&#x27;s infrastructure or inventory. They are
- * typically consumed or used by services (for example a physical port assigned
- * to a service) or contribute to the realization of a Product (for example, a
- * SIM card). They can be drawn from the Application, Computing and Network
- * domains, and include, for example, Network Elements, software, IT systems,
- * content and information, and technology components. A ResourceSpecification
- * is an abstract base class for representing a generic means for implementing a
- * particular type of Resource. In essence, a ResourceSpecification defines the
- * common attributes and relationships of a set of related Resources, while
- * Resource defines a specific instance that is based on a particular
- * ResourceSpecification. Skipped properties: id,href,
- * 
- * add lastUpdate
- */
-@Schema(description = "Resources are physical or non-physical components (or some combination of these) within an enterprise's infrastructure or inventory. They are typically consumed or used by services (for example a physical port assigned to a service) or contribute to the realization of a Product (for example, a SIM card). They can be drawn from the Application, Computing and Network domains, and include, for example, Network Elements, software, IT systems, content and information, and technology components. A ResourceSpecification is an abstract base class for representing a generic means for implementing a particular type of Resource. In essence, a ResourceSpecification defines the common attributes and relationships of a set of related Resources, while Resource defines a specific instance that is based on a particular ResourceSpecification. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-public class ResourceSpecificationUpdate {
-	@JsonProperty("category")
-	protected String category = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("isBundle")
-	protected Boolean isBundle = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	protected List<AttachmentRefOrValue> attachment = null;
-
-	@JsonProperty("featureSpecification")
-	@Valid
-	protected List<FeatureSpecification> featureSpecification = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("resourceSpecCharacteristic")
-	@Valid
-	protected List<ResourceSpecificationCharacteristic> resourceSpecificationCharacteristic = null;
-
-	@JsonProperty("resourceSpecRelationship")
-	@Valid
-	protected List<ResourceSpecificationRelationship> resourceSpecificationRelationship = null;
-
-	@JsonProperty("targetResourceSchema")
-	protected TargetResourceSchema targetResourceSchema = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ResourceSpecificationUpdate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Category of the target resource like NetworkConnectivity, PhysicalLinks,
-	 * Generic, L2Network and so on.
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Category of the target resource like NetworkConnectivity, PhysicalLinks, Generic, L2Network and so on.")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ResourceSpecificationUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this REST resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this REST resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceSpecificationUpdate isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * A flag indicates that if this resource specification is a bundled
-	 * specification (true) or single (false).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "A flag indicates that if this resource specification is a bundled specification (true) or single (false).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	
-	public ResourceSpecificationUpdate lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of the resource specification
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of the resource specification")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ResourceSpecificationUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceSpecificationUpdate version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Resource Specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Resource Specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ResourceSpecificationUpdate attachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ResourceSpecificationUpdate addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new ArrayList<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Complements the description of an element (for instance a resource) through
-	 * video, pictures ...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Complements the description of an element (for instance a resource) through video, pictures ...")
-	@Valid
-	public List<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ResourceSpecificationUpdate featureSpecification(List<FeatureSpecification> featureSpecification) {
-		this.featureSpecification = featureSpecification;
-		return this;
-	}
-
-	public ResourceSpecificationUpdate addFeatureSpecificationItem(FeatureSpecification featureSpecificationItem) {
-		if (this.featureSpecification == null) {
-			this.featureSpecification = new ArrayList<>();
-		}
-		this.featureSpecification.add(featureSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of Features for this specification.
-	 * 
-	 * @return featureSpecification
-	 **/
-	@Schema(description = "A list of Features for this specification.")
-	@Valid
-	public List<FeatureSpecification> getFeatureSpecification() {
-		return featureSpecification;
-	}
-
-	public void setFeatureSpecification(List<FeatureSpecification> featureSpecification) {
-		this.featureSpecification = featureSpecification;
-	}
-
-	public ResourceSpecificationUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ResourceSpecificationUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A related party defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A related party defines party or party role linked to a specific entity.")
-	@Valid
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ResourceSpecificationUpdate ResourceSpecificationCharacteristic(
-			List<ResourceSpecificationCharacteristic> ResourceSpecificationCharacteristic) {
-		this.resourceSpecificationCharacteristic = ResourceSpecificationCharacteristic;
-		return this;
-	}
-
-	public ResourceSpecificationUpdate addResourceSpecificationCharacteristicItem(
-			ResourceSpecificationCharacteristic ResourceSpecificationCharacteristicItem) {
-		if (this.resourceSpecificationCharacteristic == null) {
-			this.resourceSpecificationCharacteristic = new ArrayList<>();
-		}
-		this.resourceSpecificationCharacteristic.add(ResourceSpecificationCharacteristicItem);
-		return this;
-	}
-	
-	
-	/**
-	 * @param name
-	 * @param defaultValue
-	 * @param valueType
-	 * @param description
-	 * @param isConfigurable
-	 * @return
-	 */
-	public ResourceSpecificationUpdate addResourceSpecificationCharacteristicItemShort(
-			String name,
-			String defaultValue,
-			String valueType,
-			String description,
-			Boolean isConfigurable) {
-		
-		
-		ResourceSpecificationCharacteristic ci = new ResourceSpecificationCharacteristic();
-		ci
-		.name( name )
-		.description(description)
-		.valueType(valueType);
-		if (defaultValue!=null) {
-			ResourceSpecificationCharacteristicValue val = new ResourceSpecificationCharacteristicValue();
-			val.setValue( new Any( defaultValue, null) );
-			val.isDefault(true);
-			ci.getResourceSpecCharacteristicValue().add( val );			
-		}	
-		ci.configurable( isConfigurable );
-		return addResourceSpecificationCharacteristicItem(ci);
-	}
-	
-
-	/**
-	 * A characteristic quality or distinctive feature of a ResourceSpecification.
-	 * The characteristic can be take on a discrete value, such as color, can take
-	 * on a range of values, (for example, sensitivity of 100-240 mV), or can be
-	 * derived from a formula (for example, usage time (hrs) = 30 - talk time *3).
-	 * Certain characteristics, such as color, may be configured during the ordering
-	 * or some other process.
-	 * 
-	 * @return ResourceSpecificationCharacteristic
-	 **/
-	@Schema(description = "A characteristic quality or distinctive feature of a ResourceSpecification.  The characteristic can be take on a discrete value, such as color, can take on a range of values, (for example, sensitivity of 100-240 mV), or can be derived from a formula (for example, usage time (hrs) = 30 - talk time *3). Certain characteristics, such as color, may be configured during the ordering or some other process.")
-	@Valid
-	public List<ResourceSpecificationCharacteristic> getResourceSpecificationCharacteristic() {
-		return resourceSpecificationCharacteristic;
-	}
-
-	public void setResourceSpecificationCharacteristic(List<ResourceSpecificationCharacteristic> ResourceSpecificationCharacteristic) {
-		this.resourceSpecificationCharacteristic = ResourceSpecificationCharacteristic;
-	}
-
-	public ResourceSpecificationUpdate resourceSpecificationRelationship(
-			List<ResourceSpecificationRelationship> resourceSpecRelationship) {
-		this.resourceSpecificationRelationship = resourceSpecRelationship;
-		return this;
-	}
-
-	public ResourceSpecificationUpdate addResourceSpecificationRelationshipItem(
-			ResourceSpecificationRelationship resourceSpecRelationshipItem) {
-		if (this.resourceSpecificationRelationship == null) {
-			this.resourceSpecificationRelationship = new ArrayList<>();
-		}
-		this.resourceSpecificationRelationship.add(resourceSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A migration, substitution, dependency or exclusivity relationship
-	 * between/among resource specifications.
-	 * 
-	 * @return resourceSpecRelationship
-	 **/
-	@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among resource specifications.")
-	@Valid
-	public List<ResourceSpecificationRelationship> getResourceSpecificationRelationship() {
-		return resourceSpecificationRelationship;
-	}
-
-	public void setResourceSpecificationRelationship(List<ResourceSpecificationRelationship> resourceSpecRelationship) {
-		this.resourceSpecificationRelationship = resourceSpecRelationship;
-	}
-
-	public ResourceSpecificationUpdate targetResourceSchema(TargetResourceSchema targetResourceSchema) {
-		this.targetResourceSchema = targetResourceSchema;
-		return this;
-	}
-
-	/**
-	 * Get targetResourceSchema
-	 * 
-	 * @return targetResourceSchema
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TargetResourceSchema getTargetResourceSchema() {
-		return targetResourceSchema;
-	}
-
-	public void setTargetResourceSchema(TargetResourceSchema targetResourceSchema) {
-		this.targetResourceSchema = targetResourceSchema;
-	}
-
-	public ResourceSpecificationUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ResourceSpecificationUpdate baseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-	}
-
-	public ResourceSpecificationUpdate schemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-	}
-
-	public ResourceSpecificationUpdate type(String _atType) {
-		this.type = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String _atType) {
-		this.type = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceSpecificationUpdate resourceSpecificationUpdate = (ResourceSpecificationUpdate) o;
-		return Objects.equals(this.category, resourceSpecificationUpdate.category)
-				&& Objects.equals(this.description, resourceSpecificationUpdate.description)
-				&& Objects.equals(this.isBundle, resourceSpecificationUpdate.isBundle)
-				&& Objects.equals(this.lifecycleStatus, resourceSpecificationUpdate.lifecycleStatus)
-				&& Objects.equals(this.name, resourceSpecificationUpdate.name)
-				&& Objects.equals(this.version, resourceSpecificationUpdate.version)
-				&& Objects.equals(this.attachment, resourceSpecificationUpdate.attachment)
-				&& Objects.equals(this.featureSpecification, resourceSpecificationUpdate.featureSpecification)
-				&& Objects.equals(this.relatedParty, resourceSpecificationUpdate.relatedParty)
-				&& Objects.equals(this.resourceSpecificationCharacteristic,
-						resourceSpecificationUpdate.resourceSpecificationCharacteristic)
-				&& Objects.equals(this.resourceSpecificationRelationship, resourceSpecificationUpdate.resourceSpecificationRelationship)
-				&& Objects.equals(this.targetResourceSchema, resourceSpecificationUpdate.targetResourceSchema)
-				&& Objects.equals(this.validFor, resourceSpecificationUpdate.validFor)
-				&& Objects.equals(this.baseType, resourceSpecificationUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, resourceSpecificationUpdate.schemaLocation)
-				&& Objects.equals(this.type, resourceSpecificationUpdate.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(category, description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment,
-//				featureSpecification, relatedParty, resourceSpecificationCharacteristic, resourceSpecificationRelationship,
-//				targetResourceSchema, validFor, _atBaseType, _atSchemaLocation, _atType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceSpecificationUpdate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    featureSpecification: ").append(toIndentedString(featureSpecification)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    ResourceSpecificationCharacteristic: ").append(toIndentedString(resourceSpecificationCharacteristic)).append("\n");
-		sb.append("    resourceSpecRelationship: ").append(toIndentedString(resourceSpecificationRelationship)).append("\n");
-		sb.append("    targetResourceSchema: ").append(toIndentedString(targetResourceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	protected String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-	
-
-	public void addResourceSpecificationRelationshipWith(ResourceSpecification responsesSpec1) {
-
-		ResourceSpecificationRelationship r1 = new ResourceSpecificationRelationship();
-		r1.setId(responsesSpec1.getId());
-		r1.setName(responsesSpec1.getName());
-		r1.setRole("serviceSpecRelationship");
-		r1.setRelationshipType("aggregation");
-		this.addResourceSpecificationRelationshipItem(r1);
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchema.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchema.java
deleted file mode 100644
index 274e83ce4c63ce467381c3d30f349b617d2a9386..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchema.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The reference object to the schema and type of target resource which is described by resource specification
- */
-@Schema(description = "The reference object to the schema and type of target resource which is described by resource specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-05-29T22:34:44.143740800+03:00[Europe/Athens]")
-
-@Embeddable
-public class TargetResourceSchema   {
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public TargetResourceSchema _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public TargetResourceSchema _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing the target resource
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing the target resource")
-      @NotNull
-
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public TargetResourceSchema _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * Class type of the target resource
-   * @return _atType
-  **/
-  @Schema(description = "Class type of the target resource")
-      @NotNull
-
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetResourceSchema targetResourceSchema = (TargetResourceSchema) o;
-    return Objects.equals(this._atBaseType, targetResourceSchema._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, targetResourceSchema._atSchemaLocation) &&
-        Objects.equals(this._atType, targetResourceSchema._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetResourceSchema {\n");
-    
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchemaRef.java b/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchemaRef.java
deleted file mode 100644
index 090f3c29d8099e984c9e4ec5e1904994ed486278..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rcm634/model/TargetResourceSchemaRef.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.rcm634.model;
-
-import java.util.Objects;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-
-/**
- * The reference object to the schema and type of target resource which is described by resource specification
- */
-@Schema(description = "The reference object to the schema and type of target resource which is described by resource specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:06:08.595+03:00")
-
-@Embeddable
-public class TargetResourceSchemaRef   extends BaseRootEntity  {
-
-  public TargetResourceSchemaRef type(String type) {
-    this.type = type;
-    return this;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetResourceSchemaRef targetResourceSchemaRef = (TargetResourceSchemaRef) o;
-    return Objects.equals(this.type, targetResourceSchemaRef.type) &&
-        Objects.equals(this.schemaLocation, targetResourceSchemaRef.schemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(type, schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetResourceSchemaRef {\n");
-    
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Addressable.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Addressable.java
deleted file mode 100644
index 816b2a620568081a9f63e1ce3d4a1e6739d08c3f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Addressable.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Base schema for adressable entities
- */
-@Schema(description = "Base schema for adressable entities")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIAddressable")
-public class Addressable extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	public Addressable id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Addressable addressable = (Addressable) o;
-		return Objects.equals(this.id, addressable.id) && Objects.equals(this.href, addressable.href);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Addressable {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Characteristic.java
deleted file mode 100644
index 9d97db8cfacfa71d9e44f39da0bbe3e5aa9678e8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Characteristic.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value
- * pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RICharacteristic")
-public class Characteristic extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("characteristicRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicRelationship> characteristicRelationship = new HashSet<>();
-
-	@JsonProperty("value")
-	private Any value = null;
-
-
-
-	/**
-	 * Unique identifier of the characteristic
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the characteristic")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-	public Characteristic name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the characteristic
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the characteristic")
-	@NotNull
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Characteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * Data type of the value of the characteristic
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "Data type of the value of the characteristic")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public Characteristic characteristicRelationship( Set<CharacteristicRelationship> characteristicRelationship) {
-		this.characteristicRelationship = characteristicRelationship;
-		return this;
-	}
-
-	public Characteristic addCharacteristicRelationshipItem(CharacteristicRelationship characteristicRelationshipItem) {
-		if (this.characteristicRelationship == null) {
-			this.characteristicRelationship = new HashSet<>();
-		}
-		this.characteristicRelationship.add(characteristicRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get characteristicRelationship
-	 * 
-	 * @return characteristicRelationship
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<CharacteristicRelationship> getCharacteristicRelationship() {
-		return characteristicRelationship;
-	}
-
-	public void setCharacteristicRelationship( Set<CharacteristicRelationship> characteristicRelationship) {
-		this.characteristicRelationship = characteristicRelationship;
-	}
-
-	public Characteristic value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * Get value
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "")
-	@NotNull
-
-	@Valid
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Characteristic characteristic = (Characteristic) o;
-		return Objects.equals(this.id, characteristic.id) && Objects.equals(this.name, characteristic.name)
-				&& Objects.equals(this.valueType, characteristic.valueType)
-				&& Objects.equals(this.characteristicRelationship, characteristic.characteristicRelationship)
-				&& Objects.equals(this.value, characteristic.value)
-				&& Objects.equals(this.baseType, characteristic.baseType)
-				&& Objects.equals(this.schemaLocation, characteristic.schemaLocation)
-				&& Objects.equals(this.type, characteristic.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, name, valueType, characteristicRelationship, value, baseType, schemaLocation,
-				type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Characteristic {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    characteristicRelationship: ").append(toIndentedString(characteristicRelationship)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/CharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/ri639/model/CharacteristicRelationship.java
deleted file mode 100644
index b256324119cb8d8930d07b57a37c3d633379ac43..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/CharacteristicRelationship.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Another Characteristic that is related to the current Characteristic;
- */
-@Schema(description = "Another Characteristic that is related to the current Characteristic;")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RICharacteristicRel")
-public class CharacteristicRelationship extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	public CharacteristicRelationship id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the characteristic
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the characteristic")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	
-	public CharacteristicRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * The type of relationship
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "The type of relationship")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CharacteristicRelationship characteristicRelationship = (CharacteristicRelationship) o;
-		return Objects.equals(this.id, characteristicRelationship.id)
-				&& Objects.equals(this.href, characteristicRelationship.href)
-				&& Objects.equals(this.relationshipType, characteristicRelationship.relationshipType)
-				&& Objects.equals(this.baseType, characteristicRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, characteristicRelationship.schemaLocation)
-				&& Objects.equals(this.type, characteristicRelationship.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, relationshipType, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CharacteristicRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ConstraintRef.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ConstraintRef.java
deleted file mode 100644
index 262201533fb787cd1bcf5270767869e288c6e127..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ConstraintRef.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Constraint reference. The Constraint resource represents a policy/rule
- * applied to an entity or entity spec.
- */
-@Schema(description = "Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIConstraintRef")
-public class ConstraintRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("version")
-	private String version = null;
-
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public ConstraintRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	@NotNull
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ConstraintRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ConstraintRef name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the related entity.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the related entity.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ConstraintRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * constraint version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "constraint version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ConstraintRef _atBaseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this.baseType = _atBaseType;
-	}
-
-	public ConstraintRef _atSchemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this.schemaLocation = _atSchemaLocation;
-	}
-
-	public ConstraintRef _atType(String _atType) {
-		this.type = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class Extensible name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String _atType) {
-		this.type = _atType;
-	}
-
-	public ConstraintRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ConstraintRef constraintRef = (ConstraintRef) o;
-		return Objects.equals(this.id, constraintRef.id) && Objects.equals(this.href, constraintRef.href)
-				&& Objects.equals(this.name, constraintRef.name) && Objects.equals(this.version, constraintRef.version)
-				&& Objects.equals(this.baseType, constraintRef.baseType)
-				&& Objects.equals(this.schemaLocation, constraintRef.schemaLocation)
-				&& Objects.equals(this.type, constraintRef.type)
-				&& Objects.equals(this._atReferredType, constraintRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, version, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ConstraintRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Entity.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Entity.java
deleted file mode 100644
index 8f78c4e62140d5b80ffc01583de38959d8727235..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Entity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-
-/**
- * Base entity schema for use in TMForum Open-APIs
- */
-@Schema(description = "Base entity schema for use in TMForum Open-APIs")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@jakarta.persistence.Entity(name = "RIEntity")
-public class Entity extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	public Entity id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Entity entity = (Entity) o;
-		return Objects.equals(this.id, entity.id) && Objects.equals(this.href, entity.href)
-				&& Objects.equals(this.baseType, entity.baseType)
-				&& Objects.equals(this.schemaLocation, entity.schemaLocation)
-				&& Objects.equals(this.type, entity.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Entity {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/ri639/model/EntityRef.java
deleted file mode 100644
index 045b4bd6b1b6cc5a5356cd284951877025eb4449..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/EntityRef.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIEntityRef")
-public class EntityRef extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	@NotNull
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public EntityRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-
-	public EntityRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EntityRef entityRef = (EntityRef) o;
-		return Objects.equals(this.id, entityRef.id) && Objects.equals(this.href, entityRef.href)
-				&& Objects.equals(this.name, entityRef.name) && Objects.equals(this.baseType, entityRef.baseType)
-				&& Objects.equals(this.schemaLocation, entityRef.schemaLocation)
-				&& Objects.equals(this.type, entityRef.type)
-				&& Objects.equals(this._atReferredType, entityRef._atReferredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class EntityRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Error.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Error.java
deleted file mode 100644
index 1d2114ce31ea49c1ebf851930366684e7c6f2a01..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Error.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public Error _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public Error _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this._atBaseType, error._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, error._atSchemaLocation) &&
-        Objects.equals(this._atType, error._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscription.java
deleted file mode 100644
index b65cd932e34cfbe09601a17435878b8b70d8dae8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscription.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscriptionInput.java
deleted file mode 100644
index 44c566dadfde20f7cc8eb2136abd67ff0920cc49..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Extensible.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Extensible.java
deleted file mode 100644
index 4cbbddc670b0c497569fd2c05adb6f285f346862..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Extensible.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Base Extensible schema for use in TMForum Open-APIs
- */
-@Schema(description = "Base Extensible schema for use in TMForum Open-APIs")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class Extensible   {
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public Extensible _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public Extensible _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public Extensible _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class Extensible name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Extensible extensible = (Extensible) o;
-    return Objects.equals(this._atBaseType, extensible._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, extensible._atSchemaLocation) &&
-        Objects.equals(this._atType, extensible._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Extensible {\n");
-    
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Feature.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Feature.java
deleted file mode 100644
index bf6ecea2fce5357eb6c02facb33417d60efd160e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Feature.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Configuration feature.
- */
-@Schema(description = "Configuration feature.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIFeature")
-public class Feature {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("isEnabled")
-	private Boolean isEnabled = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("constraint")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConstraintRef> constraint = new HashSet<>();
-
-	@JsonProperty("featureCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> featureCharacteristic = new HashSet<>();
-
-	@JsonProperty("featureRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<FeatureRelationship> featureRelationship = new HashSet<>();
-
-
-	/**
-	 * Unique identifier of the feature.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the feature.")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-
-	public Feature isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * True if this is a feature group. Default is false.
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "True if this is a feature group. Default is false.")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public Feature isEnabled(Boolean isEnabled) {
-		this.isEnabled = isEnabled;
-		return this;
-	}
-
-	/**
-	 * True if this feature is enabled. Default is true.
-	 * 
-	 * @return isEnabled
-	 **/
-	@Schema(description = "True if this feature is enabled. Default is true.")
-
-	public Boolean isIsEnabled() {
-		return isEnabled;
-	}
-
-	public void setIsEnabled(Boolean isEnabled) {
-		this.isEnabled = isEnabled;
-	}
-
-	public Feature name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * This is the name for the feature.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "This is the name for the feature.")
-	@NotNull
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Feature constraint( Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public Feature addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new HashSet<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of feature constraints.
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "This is a list of feature constraints.")
-	@Valid
-	public Set<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public Feature featureCharacteristic(Set<Characteristic> featureCharacteristic) {
-		this.featureCharacteristic = featureCharacteristic;
-		return this;
-	}
-
-	public Feature addFeatureCharacteristicItem(Characteristic featureCharacteristicItem) {
-		this.featureCharacteristic.add(featureCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of Characteristics for a particular feature.
-	 * 
-	 * @return featureCharacteristic
-	 **/
-	@Schema(description = "This is a list of Characteristics for a particular feature.")
-	@NotNull
-	@Valid
-	@Size(min = 1)
-	public Set<Characteristic> getFeatureCharacteristic() {
-		return featureCharacteristic;
-	}
-
-	public void setFeatureCharacteristic(Set<Characteristic> featureCharacteristic) {
-		this.featureCharacteristic = featureCharacteristic;
-	}
-
-	public Feature featureRelationship(Set<FeatureRelationship> featureRelationship) {
-		this.featureRelationship = featureRelationship;
-		return this;
-	}
-
-	public Feature addFeatureRelationshipItem(FeatureRelationship featureRelationshipItem) {
-		if (this.featureRelationship == null) {
-			this.featureRelationship = new HashSet<>();
-		}
-		this.featureRelationship.add(featureRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get featureRelationship
-	 * 
-	 * @return featureRelationship
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<FeatureRelationship> getFeatureRelationship() {
-		return featureRelationship;
-	}
-
-	public void setFeatureRelationship(Set<FeatureRelationship> featureRelationship) {
-		this.featureRelationship = featureRelationship;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Feature feature = (Feature) o;
-		return Objects.equals(this.id, feature.id) && Objects.equals(this.isBundle, feature.isBundle)
-				&& Objects.equals(this.isEnabled, feature.isEnabled) && Objects.equals(this.name, feature.name)
-				&& Objects.equals(this.constraint, feature.constraint)
-				&& Objects.equals(this.featureCharacteristic, feature.featureCharacteristic)
-				&& Objects.equals(this.featureRelationship, feature.featureRelationship);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, isBundle, isEnabled, name, constraint, featureCharacteristic, featureRelationship);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Feature {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    featureCharacteristic: ").append(toIndentedString(featureCharacteristic)).append("\n");
-		sb.append("    featureRelationship: ").append(toIndentedString(featureRelationship)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/FeatureRelationship.java b/src/main/java/org/etsi/osl/tmf/ri639/model/FeatureRelationship.java
deleted file mode 100644
index 2c2e73143450f0eb00a2fc4068c0514fd39a6343..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/FeatureRelationship.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Configuration feature
- */
-@Schema(description = "Configuration feature")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIFeatureRel")
-public class FeatureRelationship  extends BaseRootNamedEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  public FeatureRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the target feature.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the target feature.")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  
-
-  public FeatureRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * This is the type of the feature relationship.
-   * @return relationshipType
-  **/
-  @Schema(description = "This is the type of the feature relationship.")
-      @NotNull
-
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public FeatureRelationship validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FeatureRelationship featureRelationship = (FeatureRelationship) o;
-    return Objects.equals(this.id, featureRelationship.id) &&
-        Objects.equals(this.name, featureRelationship.name) &&
-        Objects.equals(this.relationshipType, featureRelationship.relationshipType) &&
-        Objects.equals(this.validFor, featureRelationship.validFor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name, relationshipType, validFor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FeatureRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/LogicalResource.java b/src/main/java/org/etsi/osl/tmf/ri639/model/LogicalResource.java
deleted file mode 100644
index 4c14c7af8deda02bb5f8a1c08435996a61bc99f3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/LogicalResource.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * Logic resource is a type of resource that describes the common set of attributes shared by all concrete logical resources (e.g. TPE, MSISDN, IP Addresses) in the inventory.
- */
-@Schema(description = "Logic resource is a type of resource that describes the common set of attributes shared by all concrete logical resources (e.g. TPE, MSISDN, IP Addresses) in the inventory.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RILogicalRes")
-public class LogicalResource extends Resource  {
- 
-
-  @JsonProperty("value")
-  private String value = null;
-
-
-  public LogicalResource value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * the value of the logical resource. E.g '0746712345' for  MSISDN's
-   * @return value
-  **/
-  @Schema(description = "the value of the logical resource. E.g '0746712345' for  MSISDN's")
-  
-    public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    LogicalResource logicalResource = (LogicalResource) o;
-    return Objects.equals(this.id, logicalResource.id) &&
-        Objects.equals(this.href, logicalResource.href) &&
-        Objects.equals(this.category, logicalResource.category) &&
-        Objects.equals(this.description, logicalResource.description) &&
-        Objects.equals(this.endOperatingDate, logicalResource.endOperatingDate) &&
-        Objects.equals(this.name, logicalResource.name) &&
-        Objects.equals(this.resourceVersion, logicalResource.resourceVersion) &&
-        Objects.equals(this.startOperatingDate, logicalResource.startOperatingDate) &&
-        Objects.equals(this.value, logicalResource.value) &&
-        Objects.equals(this.activationFeature, logicalResource.activationFeature) &&
-        Objects.equals(this.administrativeState, logicalResource.administrativeState) &&
-        Objects.equals(this.attachment, logicalResource.attachment) &&
-        Objects.equals(this.note, logicalResource.note) &&
-        Objects.equals(this.operationalState, logicalResource.operationalState) &&
-        Objects.equals(this.place, logicalResource.place) &&
-        Objects.equals(this.relatedParty, logicalResource.relatedParty) &&
-        Objects.equals(this.resourceCharacteristic, logicalResource.resourceCharacteristic) &&
-        Objects.equals(this.resourceRelationship, logicalResource.resourceRelationship) &&
-        Objects.equals(this.resourceSpecification, logicalResource.resourceSpecification) &&
-        Objects.equals(this.resourceStatus, logicalResource.resourceStatus) &&
-        Objects.equals(this.usageState, logicalResource.usageState) &&
-        Objects.equals(this.baseType, logicalResource.baseType) &&
-        Objects.equals(this.schemaLocation, logicalResource.schemaLocation) &&
-        Objects.equals(this.type, logicalResource.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, category, description, endOperatingDate, name, resourceVersion, startOperatingDate, value, activationFeature, administrativeState, attachment, note, operationalState, place, relatedParty, resourceCharacteristic, resourceRelationship, resourceSpecification, resourceStatus, usageState, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class LogicalResource {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    endOperatingDate: ").append(toIndentedString(endOperatingDate)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    resourceVersion: ").append(toIndentedString(resourceVersion)).append("\n");
-    sb.append("    startOperatingDate: ").append(toIndentedString(startOperatingDate)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    activationFeature: ").append(toIndentedString(activationFeature)).append("\n");
-    sb.append("    administrativeState: ").append(toIndentedString(administrativeState)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    operationalState: ").append(toIndentedString(operationalState)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    resourceCharacteristic: ").append(toIndentedString(resourceCharacteristic)).append("\n");
-    sb.append("    resourceRelationship: ").append(toIndentedString(resourceRelationship)).append("\n");
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("    resourceStatus: ").append(toIndentedString(resourceStatus)).append("\n");
-    sb.append("    usageState: ").append(toIndentedString(usageState)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/PhysicalResource.java b/src/main/java/org/etsi/osl/tmf/ri639/model/PhysicalResource.java
deleted file mode 100644
index d940c29becca2ae0a40626db47a907a09443c44e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/PhysicalResource.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * Physical resource is a type of resource that describes the common set of
- * attributes shared by all concrete physical resources (e.g. EQUIPMENT) in the
- * inventory.
- */
-@Schema(description = "Physical resource is a type of resource that describes the common set of attributes shared by all concrete physical resources (e.g. EQUIPMENT) in the inventory.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIPhysicalRes")
-public class PhysicalResource extends Resource {
-
-	private OffsetDateTime manufactureDate = null;
-
-	@JsonProperty("powerState")
-	private String powerState = null;
-
-	@JsonProperty("serialNumber")
-	private String serialNumber = null;
-
-	@JsonProperty("versionNumber")
-	private String versionNumber = null;
-
-	public PhysicalResource manufactureDate(OffsetDateTime manufactureDate) {
-		this.manufactureDate = manufactureDate;
-		return this;
-	}
-
-	/**
-	 * This is a string attribute that defines the date of manufacture of this item
-	 * in the fixed format \"dd/mm/yyyy\". This is an optional attribute.
-	 * 
-	 * @return manufactureDate
-	 **/
-	@Schema(description = "This is a string attribute that defines the date of manufacture of this item in the fixed format \"dd/mm/yyyy\". This is an optional attribute.")
-
-	@Valid
-	public OffsetDateTime getManufactureDate() {
-		return manufactureDate;
-	}
-
-	public void setManufactureDate(OffsetDateTime manufactureDate) {
-		this.manufactureDate = manufactureDate;
-	}
-
-	@JsonProperty("manufactureDate")
-	public String getManufactureDateStr() {
-		if (this.manufactureDate != null) {
-			return this.manufactureDate.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public void setManufactureDate(String endDate) {
-		if (endDate != null) {
-			this.manufactureDate = OffsetDateTime.parse(endDate);
-		}
-	}
-
-	public PhysicalResource powerState(String powerState) {
-		this.powerState = powerState;
-		return this;
-	}
-
-	/**
-	 * This defines the current power status of the hardware item. Values include:
-	 * 0: Unknown 1: Not Applicable 2: No Power Applied 3: Full Power Applied 4:
-	 * Power Save - Normal 5: Power Save - Degraded 6: Power Save - Standby 7: Power
-	 * Save - Critical 8: Power Save - Low Power Mode 9: Power Save - Unknown 10:
-	 * Power Cycle 11: Power Warning 12: Power Off
-	 * 
-	 * @return powerState
-	 **/
-	@Schema(description = "This defines the current power status of the hardware item. Values include:    0:  Unknown   1:  Not Applicable   2:  No Power Applied   3: Full Power Applied   4:  Power Save - Normal   5:  Power Save - Degraded   6:  Power Save - Standby   7:  Power Save - Critical   8:  Power Save - Low Power Mode   9:  Power Save - Unknown  10: Power Cycle  11: Power Warning  12: Power Off")
-
-	public String getPowerState() {
-		return powerState;
-	}
-
-	public void setPowerState(String powerState) {
-		this.powerState = powerState;
-	}
-
-	public PhysicalResource resourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-		return this;
-	}
-
-	/**
-	 * A field that identifies the specific version of an instance of a resource.
-	 * 
-	 * @return resourceVersion
-	 **/
-	@Schema(description = "A field that identifies the specific version of an instance of a resource.")
-
-	public String getResourceVersion() {
-		return resourceVersion;
-	}
-
-	public void setResourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-	}
-
-	public PhysicalResource serialNumber(String serialNumber) {
-		this.serialNumber = serialNumber;
-		return this;
-	}
-
-	/**
-	 * This is a string that represents a manufacturer-allocated number used to
-	 * identify different instances of the same hardware item. The ModelNumber and
-	 * PartNumber attributes are used to identify different types of hardware items.
-	 * This is a REQUIRED attribute.
-	 * 
-	 * @return serialNumber
-	 **/
-	@Schema(description = "This is a string that represents a manufacturer-allocated number used to identify different instances of the same hardware item. The ModelNumber and PartNumber attributes are used to identify different types of hardware items. This is a REQUIRED attribute.")
-
-	public String getSerialNumber() {
-		return serialNumber;
-	}
-
-	public void setSerialNumber(String serialNumber) {
-		this.serialNumber = serialNumber;
-	}
-
-	public PhysicalResource startOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-		return this;
-	}
-
-	/**
-	 * A date time( DateTime). The date from which the resource is operating
-	 * 
-	 * @return startOperatingDate
-	 **/
-	@Schema(description = "A date time( DateTime). The date from which the resource is operating")
-
-	@Valid
-	public OffsetDateTime getStartOperatingDate() {
-		return startOperatingDate;
-	}
-
-	public void setStartOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-	}
-
-	public PhysicalResource versionNumber(String versionNumber) {
-		this.versionNumber = versionNumber;
-		return this;
-	}
-
-	/**
-	 * This is a string that identifies the version of this physical resource. This
-	 * is an optional attribute.
-	 * 
-	 * @return versionNumber
-	 **/
-	@Schema(description = "This is a string that identifies the version of this physical resource. This is an optional attribute.")
-
-	public String getVersionNumber() {
-		return versionNumber;
-	}
-
-	public void setVersionNumber(String versionNumber) {
-		this.versionNumber = versionNumber;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		PhysicalResource physicalResource = (PhysicalResource) o;
-		return Objects.equals(this.id, physicalResource.id) && Objects.equals(this.href, physicalResource.href)
-				&& Objects.equals(this.category, physicalResource.category)
-				&& Objects.equals(this.description, physicalResource.description)
-				&& Objects.equals(this.endOperatingDate, physicalResource.endOperatingDate)
-				&& Objects.equals(this.manufactureDate, physicalResource.manufactureDate)
-				&& Objects.equals(this.name, physicalResource.name)
-				&& Objects.equals(this.powerState, physicalResource.powerState)
-				&& Objects.equals(this.resourceVersion, physicalResource.resourceVersion)
-				&& Objects.equals(this.serialNumber, physicalResource.serialNumber)
-				&& Objects.equals(this.startOperatingDate, physicalResource.startOperatingDate)
-				&& Objects.equals(this.versionNumber, physicalResource.versionNumber)
-				&& Objects.equals(this.activationFeature, physicalResource.activationFeature)
-				&& Objects.equals(this.administrativeState, physicalResource.administrativeState)
-				&& Objects.equals(this.attachment, physicalResource.attachment)
-				&& Objects.equals(this.note, physicalResource.note)
-				&& Objects.equals(this.operationalState, physicalResource.operationalState)
-				&& Objects.equals(this.place, physicalResource.place)
-				&& Objects.equals(this.relatedParty, physicalResource.relatedParty)
-				&& Objects.equals(this.resourceCharacteristic, physicalResource.resourceCharacteristic)
-				&& Objects.equals(this.resourceRelationship, physicalResource.resourceRelationship)
-				&& Objects.equals(this.resourceSpecification, physicalResource.resourceSpecification)
-				&& Objects.equals(this.resourceStatus, physicalResource.resourceStatus)
-				&& Objects.equals(this.usageState, physicalResource.usageState)
-				&& Objects.equals(this.baseType, physicalResource.baseType)
-				&& Objects.equals(this.schemaLocation, physicalResource.schemaLocation)
-				&& Objects.equals(this.type, physicalResource.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, category, description, endOperatingDate, manufactureDate, name, powerState,
-				resourceVersion, serialNumber, startOperatingDate, versionNumber, activationFeature,
-				administrativeState, attachment, note, operationalState, place, relatedParty, resourceCharacteristic,
-				resourceRelationship, resourceSpecification, resourceStatus, usageState, baseType, schemaLocation,
-				type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class PhysicalResource {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endOperatingDate: ").append(toIndentedString(endOperatingDate)).append("\n");
-		sb.append("    manufactureDate: ").append(toIndentedString(manufactureDate)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    powerState: ").append(toIndentedString(powerState)).append("\n");
-		sb.append("    resourceVersion: ").append(toIndentedString(resourceVersion)).append("\n");
-		sb.append("    serialNumber: ").append(toIndentedString(serialNumber)).append("\n");
-		sb.append("    startOperatingDate: ").append(toIndentedString(startOperatingDate)).append("\n");
-		sb.append("    versionNumber: ").append(toIndentedString(versionNumber)).append("\n");
-		sb.append("    activationFeature: ").append(toIndentedString(activationFeature)).append("\n");
-		sb.append("    administrativeState: ").append(toIndentedString(administrativeState)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    operationalState: ").append(toIndentedString(operationalState)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceCharacteristic: ").append(toIndentedString(resourceCharacteristic)).append("\n");
-		sb.append("    resourceRelationship: ").append(toIndentedString(resourceRelationship)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    resourceStatus: ").append(toIndentedString(resourceStatus)).append("\n");
-		sb.append("    usageState: ").append(toIndentedString(usageState)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Place.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Place.java
deleted file mode 100644
index 3f37bbfe2d48da500cb856ea41d956fcd79590fb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Place.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Place reference. Place defines the places where the products are sold or delivered.
- */
-@Schema(description = "Place reference. Place defines the places where the products are sold or delivered.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class Place   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public Place id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Place href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the place
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the place")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Place name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]
-   * @return name
-  **/
-  @Schema(description = "A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Place _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public Place _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public Place _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class Extensible name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Place place = (Place) o;
-    return Objects.equals(this.id, place.id) &&
-        Objects.equals(this.href, place.href) &&
-        Objects.equals(this.name, place.name) &&
-        Objects.equals(this._atBaseType, place._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, place._atSchemaLocation) &&
-        Objects.equals(this._atType, place._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Place {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/RelatedPlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/ri639/model/RelatedPlaceRefOrValue.java
deleted file mode 100644
index ca02224903f910e39fb8fdfd700a134fc3dd2026..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/RelatedPlaceRefOrValue.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation &amp; @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself
- */
-@Schema(description = "Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation & @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIRelPlaceRefVal")
-public class RelatedPlaceRefOrValue  extends BaseRootNamedEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public RelatedPlaceRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public RelatedPlaceRefOrValue role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Get role
-   * @return role
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedPlaceRefOrValue _atBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this.baseType = _atBaseType;
-  }
-
-  public RelatedPlaceRefOrValue _atSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this.schemaLocation = _atSchemaLocation;
-  }
-
-  public RelatedPlaceRefOrValue _atType(String _atType) {
-    this.type = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class Extensible name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String _atType) {
-    this.type = _atType;
-  }
-
-  public RelatedPlaceRefOrValue _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedPlaceRefOrValue relatedPlaceRefOrValue = (RelatedPlaceRefOrValue) o;
-    return Objects.equals(this.id, relatedPlaceRefOrValue.id) &&
-        Objects.equals(this.href, relatedPlaceRefOrValue.href) &&
-        Objects.equals(this.name, relatedPlaceRefOrValue.name) &&
-        Objects.equals(this.role, relatedPlaceRefOrValue.role) &&
-        Objects.equals(this.baseType, relatedPlaceRefOrValue.baseType) &&
-        Objects.equals(this.schemaLocation, relatedPlaceRefOrValue.schemaLocation) &&
-        Objects.equals(this.type, relatedPlaceRefOrValue.type) &&
-        Objects.equals(this._atReferredType, relatedPlaceRefOrValue._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, role, baseType, schemaLocation, type, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedPlaceRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/Resource.java b/src/main/java/org/etsi/osl/tmf/ri639/model/Resource.java
deleted file mode 100644
index 597d779adb05233ef771ddfe5af175183dc66279..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/Resource.java
+++ /dev/null
@@ -1,680 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Resource is an abstract entity that describes the common set of attributes
- * shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory.
- */
-@Schema(description = "Resource is an abstract entity that describes the common set of attributes shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIResource")
-public class Resource extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("category")
-	protected String category = null;
-
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	protected String description = null;
-
-	protected OffsetDateTime endOperatingDate = null;
-
-	@JsonProperty("resourceVersion")
-	protected String resourceVersion = null;
-
-	protected OffsetDateTime startOperatingDate = null;
-
-	@JsonProperty("activationFeature")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<Feature> activationFeature = new HashSet<>();
-
-	@JsonProperty("administrativeState")
-	protected ResourceAdministrativeStateType administrativeState = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<AttachmentRefOrValue> attachment = new HashSet<>();
-
-	@JsonProperty("note")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<Note> note = new HashSet<>();
-
-	@JsonProperty("operationalState")
-	protected ResourceOperationalStateType operationalState = null;
-
-	@JsonProperty("place")
-	@OneToOne(cascade = CascadeType.ALL)
-	protected RelatedPlaceRefOrValue place = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("resourceCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<Characteristic> resourceCharacteristic = new HashSet<>();
-
-	@JsonProperty("resourceRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	protected Set<ResourceRelationship> resourceRelationship = new HashSet<>();
-
-	@JsonProperty("resourceSpecification")
-	@OneToOne( cascade = {CascadeType.ALL} )
-    @JoinColumn(name = "resSpecRef", referencedColumnName = "uuid")
-	protected ResourceSpecificationRef resourceSpecification = null;
-
-	@JsonProperty("resourceStatus")
-	protected ResourceStatusType resourceStatus = ResourceStatusType.UNKNOWN;
-
-	@JsonProperty("usageState")
-	protected ResourceUsageStateType usageState = ResourceUsageStateType.IDLE;
-
-
-	
-
-	/**
-	 * Identifier of an instance of the resource. Required to be unique within the
-	 * resource type. Used in URIs as the identifier for specific instances of a
-	 * type.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of an instance of the resource. Required to be unique within the resource type.  Used in URIs as the identifier for specific instances of a type.")
-	@NotNull
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	/**
-	 * The URI for the object itself.
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "The URI for the object itself.")
-	@NotNull
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public Resource category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Category of the concrete resource. e.g Gold, Silver for MSISDN concrete
-	 * resource
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public Resource description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * free-text description of the resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "free-text description of the resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	
-
-	@JsonProperty("endOperatingDate")
-	public String getEndOperatingDateStr() {
-		if ( this.endOperatingDate != null ) {
-			return this.endOperatingDate.toString();			
-		} else {
-			return null;
-		}
-	}
-	
-	public void setEndOperatingDate(String endDate) {
-		if ( endDate!=null ) {
-			this.endOperatingDate = OffsetDateTime.parse( endDate );			
-		}
-	}
-	
-	public Resource endOperatingDate(OffsetDateTime endOperatingDate) {
-		this.endOperatingDate = endOperatingDate;
-		return this;
-	}
-
-	/**
-	 * A date time( DateTime). The date till the resource is operating
-	 * 
-	 * @return endOperatingDate
-	 **/
-	@Schema(description = "A date time( DateTime). The date till the resource is operating")
-
-	@Valid
-	public OffsetDateTime getEndOperatingDate() {
-		return endOperatingDate;
-	}
-
-	public void setEndOperatingDate(OffsetDateTime endOperatingDate) {
-		this.endOperatingDate = endOperatingDate;
-	}
-
-	public Resource name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A string used to give a name to the resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A string used to give a name to the resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Resource resourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-		return this;
-	}
-
-	/**
-	 * A field that identifies the specific version of an instance of a resource.
-	 * 
-	 * @return resourceVersion
-	 **/
-	@Schema(description = "A field that identifies the specific version of an instance of a resource.")
-
-	public String getResourceVersion() {
-		return resourceVersion;
-	}
-
-	public void setResourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-	}
-
-	public Resource startOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-		return this;
-	}
-
-	/**
-	 * A date time( DateTime). The date from which the resource is operating
-	 * 
-	 * @return startOperatingDate
-	 **/
-	@Schema(description = "A date time( DateTime). The date from which the resource is operating")
-
-
-	@JsonProperty("startOperatingDate")
-	public String getStartOperatingDateStr() {
-		if ( this.startOperatingDate != null ) {
-			return this.startOperatingDate.toString();			
-		} else {
-			return null;
-		}
-	}
-	
-	public void setStartOperatingDate(String startOperatingDate) {
-		if ( startOperatingDate!=null ) {
-			this.startOperatingDate = OffsetDateTime.parse( startOperatingDate );			
-		}
-	}
-	
-	@Valid
-	public OffsetDateTime getStartOperatingDate() {
-		return startOperatingDate;
-	}
-
-	public void setStartOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-	}
-
-	public Resource activationFeature( Set<Feature> activationFeature) {
-		this.activationFeature = activationFeature;
-		return this;
-	}
-
-	public Resource addActivationFeatureItem(Feature activationFeatureItem) {
-		if (this.activationFeature == null) {
-			this.activationFeature = new HashSet<>();
-		}
-		this.activationFeature.add(activationFeatureItem);
-		return this;
-	}
-
-	/**
-	 * Configuration features
-	 * 
-	 * @return activationFeature
-	 **/
-	@Schema(description = "Configuration features")
-	@Valid
-	public Set<Feature> getActivationFeature() {
-		return activationFeature;
-	}
-
-	public void setActivationFeature(Set<Feature> activationFeature) {
-		this.activationFeature = activationFeature;
-	}
-
-	public Resource administrativeState(ResourceAdministrativeStateType administrativeState) {
-		this.administrativeState = administrativeState;
-		return this;
-	}
-
-	/**
-	 * Get administrativeState
-	 * 
-	 * @return administrativeState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceAdministrativeStateType getAdministrativeState() {
-		return administrativeState;
-	}
-
-	public void setAdministrativeState(ResourceAdministrativeStateType administrativeState) {
-		this.administrativeState = administrativeState;
-	}
-
-	public Resource attachment( Set <AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public Resource addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Get attachment
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public Resource note(Set<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public Resource addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new HashSet<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Get note
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(Set<Note> note) {
-		this.note = note;
-	}
-
-	public Resource operationalState(ResourceOperationalStateType operationalState) {
-		this.operationalState = operationalState;
-		return this;
-	}
-
-	/**
-	 * Get operationalState
-	 * 
-	 * @return operationalState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceOperationalStateType getOperationalState() {
-		return operationalState;
-	}
-
-	public void setOperationalState(ResourceOperationalStateType operationalState) {
-		this.operationalState = operationalState;
-	}
-
-	public Resource place(RelatedPlaceRefOrValue place) {
-		this.place = place;
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public RelatedPlaceRefOrValue getPlace() {
-		return place;
-	}
-
-	public void setPlace(RelatedPlaceRefOrValue place) {
-		this.place = place;
-	}
-
-	public Resource relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Resource addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Resource resourceCharacteristic(Set<Characteristic> resourceCharacteristic) {
-		this.resourceCharacteristic = resourceCharacteristic;
-		return this;
-	}
-
-	public Resource addResourceCharacteristicItem(Characteristic resourceCharacteristicItem) {
-		if (this.resourceCharacteristic == null) {
-			this.resourceCharacteristic = new HashSet<>();
-		}
-		this.resourceCharacteristic.add(resourceCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * Get resourceCharacteristic
-	 * 
-	 * @return resourceCharacteristic
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<Characteristic> getResourceCharacteristic() {
-		return resourceCharacteristic;
-	}
-
-	public void setResourceCharacteristic(Set<Characteristic> resourceCharacteristic) {
-		this.resourceCharacteristic = resourceCharacteristic;
-	}
-
-	public Resource resourceRelationship(Set<ResourceRelationship> resourceRelationship) {
-		this.resourceRelationship = resourceRelationship;
-		return this;
-	}
-
-	public Resource addResourceRelationshipItem(ResourceRelationship resourceRelationshipItem) {
-		if (this.resourceRelationship == null) {
-			this.resourceRelationship = new HashSet<>();
-		}
-		this.resourceRelationship.add(resourceRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get resourceRelationship
-	 * 
-	 * @return resourceRelationship
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ResourceRelationship> getResourceRelationship() {
-		return resourceRelationship;
-	}
-
-	public void setResourceRelationship(Set<ResourceRelationship> resourceRelationship) {
-		this.resourceRelationship = resourceRelationship;
-	}
-
-	public Resource resourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	/**
-	 * Get resourceSpecification
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceSpecificationRef getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	public Resource resourceStatus(ResourceStatusType resourceStatus) {
-		this.resourceStatus = resourceStatus;
-		return this;
-	}
-
-	/**
-	 * Get resourceStatus
-	 * 
-	 * @return resourceStatus
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceStatusType getResourceStatus() {
-		return resourceStatus;
-	}
-
-	public void setResourceStatus(ResourceStatusType resourceStatus) {
-		this.resourceStatus = resourceStatus;
-	}
-
-	public Resource usageState(ResourceUsageStateType usageState) {
-		this.usageState = usageState;
-		return this;
-	}
-
-	/**
-	 * Get usageState
-	 * 
-	 * @return usageState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceUsageStateType getUsageState() {
-		return usageState;
-	}
-
-	public void setUsageState(ResourceUsageStateType usageState) {
-		this.usageState = usageState;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Resource resource = (Resource) o;
-		return Objects.equals(this.id, resource.id) && Objects.equals(this.href, resource.href)
-				&& Objects.equals(this.category, resource.category)
-				&& Objects.equals(this.description, resource.description)
-				&& Objects.equals(this.endOperatingDate, resource.endOperatingDate)
-				&& Objects.equals(this.name, resource.name)
-				&& Objects.equals(this.resourceVersion, resource.resourceVersion)
-				&& Objects.equals(this.startOperatingDate, resource.startOperatingDate)
-				&& Objects.equals(this.activationFeature, resource.activationFeature)
-				&& Objects.equals(this.administrativeState, resource.administrativeState)
-				&& Objects.equals(this.attachment, resource.attachment) && Objects.equals(this.note, resource.note)
-				&& Objects.equals(this.operationalState, resource.operationalState)
-				&& Objects.equals(this.place, resource.place)
-				&& Objects.equals(this.relatedParty, resource.relatedParty)
-				&& Objects.equals(this.resourceCharacteristic, resource.resourceCharacteristic)
-				&& Objects.equals(this.resourceRelationship, resource.resourceRelationship)
-				&& Objects.equals(this.resourceSpecification, resource.resourceSpecification)
-				&& Objects.equals(this.resourceStatus, resource.resourceStatus)
-				&& Objects.equals(this.usageState, resource.usageState)
-				&& Objects.equals(this.baseType, resource.baseType)
-				&& Objects.equals(this.schemaLocation, resource.schemaLocation)
-				&& Objects.equals(this.type, resource.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, category, description, endOperatingDate, name, resourceVersion,
-				startOperatingDate, activationFeature, administrativeState, attachment, note, operationalState, place,
-				relatedParty, resourceCharacteristic, resourceRelationship, resourceSpecification, resourceStatus,
-				usageState, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Resource {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endOperatingDate: ").append(toIndentedString(endOperatingDate)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    resourceVersion: ").append(toIndentedString(resourceVersion)).append("\n");
-		sb.append("    startOperatingDate: ").append(toIndentedString(startOperatingDate)).append("\n");
-		sb.append("    activationFeature: ").append(toIndentedString(activationFeature)).append("\n");
-		sb.append("    administrativeState: ").append(toIndentedString(administrativeState)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    operationalState: ").append(toIndentedString(operationalState)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceCharacteristic: ").append(toIndentedString(resourceCharacteristic)).append("\n");
-		sb.append("    resourceRelationship: ").append(toIndentedString(resourceRelationship)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    resourceStatus: ").append(toIndentedString(resourceStatus)).append("\n");
-		sb.append("    usageState: ").append(toIndentedString(usageState)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public Characteristic getResourceCharacteristicByName(String aName) {
-		for (Characteristic c : this.resourceCharacteristic) {
-			if ( c.getName().equals( aName )) {
-				return c;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAdministrativeStateType.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAdministrativeStateType.java
deleted file mode 100644
index d0d213cf85bdda677c2a4aae1d5d6b553bcf3767..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAdministrativeStateType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceAdministrativeStateType enumerations
- */
-public enum ResourceAdministrativeStateType {
-  LOCKED("locked"),
-    UNLOCKED("unlocked"),
-    SHUTDOWN("shutdown");
-
-  private String value;
-
-  ResourceAdministrativeStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ResourceAdministrativeStateType fromValue(String text) {
-    for (ResourceAdministrativeStateType b : ResourceAdministrativeStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEvent.java
deleted file mode 100644
index 1c2dfd3a5facb6404848d648dec8c2a9290e888a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,336 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen",
-    date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceAttributeValueChangeEvent {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ResourceAttributeValueChangeEventPayload event = null;
-
-  public ResourceAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * 
-   * @return eventId
-   **/
-  @Schema(description = "The identifier of the notification.")
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * 
-   * @return eventTime
-   **/
-  @Schema(description = "Time of the event occurrence.")
-
-  @Valid
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * 
-   * @return eventType
-   **/
-  @Schema(description = "The type of the notification.")
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * 
-   * @return correlationId
-   **/
-  @Schema(description = "The correlation id for this event.")
-
-  public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * 
-   * @return domain
-   **/
-  @Schema(description = "The domain of the event.")
-
-  public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * 
-   * @return title
-   **/
-  @Schema(description = "The title of the event.")
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * 
-   * @return description
-   **/
-  @Schema(description = "An explnatory of the event.")
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * 
-   * @return priority
-   **/
-  @Schema(description = "A priority.")
-
-  public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * 
-   * @return timeOcurred
-   **/
-  @Schema(description = "The time the event occured.")
-
-  @Valid
-  public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * 
-   * @return fieldPath
-   **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ResourceAttributeValueChangeEvent event(ResourceAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * 
-   * @return event
-   **/
-  @Schema(description = "")
-
-  @Valid
-  public ResourceAttributeValueChangeEventPayload getEvent() {
-    if (event == null) {
-      this.event = new ResourceAttributeValueChangeEventPayload();
-    }
-    return event;
-  }
-
-  public void setEvent(ResourceAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceAttributeValueChangeEvent resourceAttributeValueChangeEvent =
-        (ResourceAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, resourceAttributeValueChangeEvent.eventId)
-        && Objects.equals(this.eventTime, resourceAttributeValueChangeEvent.eventTime)
-        && Objects.equals(this.eventType, resourceAttributeValueChangeEvent.eventType)
-        && Objects.equals(this.correlationId, resourceAttributeValueChangeEvent.correlationId)
-        && Objects.equals(this.domain, resourceAttributeValueChangeEvent.domain)
-        && Objects.equals(this.title, resourceAttributeValueChangeEvent.title)
-        && Objects.equals(this.description, resourceAttributeValueChangeEvent.description)
-        && Objects.equals(this.priority, resourceAttributeValueChangeEvent.priority)
-        && Objects.equals(this.timeOcurred, resourceAttributeValueChangeEvent.timeOcurred)
-        && Objects.equals(this.fieldPath, resourceAttributeValueChangeEvent.fieldPath)
-        && Objects.equals(this.event, resourceAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description,
-        priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceAttributeValueChangeEvent {\n");
-
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEventPayload.java
deleted file mode 100644
index 8633744c18141cfe4d2c2f926fa71dc860414c08..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceAttributeValueChangeEventPayload   {
-  @JsonProperty("resource")
-  private Resource resource = null;
-
-  public ResourceAttributeValueChangeEventPayload resource(Resource resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  /**
-   * Get resource
-   * @return resource
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceAttributeValueChangeEventPayload resourceAttributeValueChangeEventPayload = (ResourceAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.resource, resourceAttributeValueChangeEventPayload.resource);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resource);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeNotification.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeNotification.java
deleted file mode 100644
index 0e47ffcc5b0a0de85f72d4a99ce7b519bf709ac1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceAttributeValueChangeNotification.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-public class ResourceAttributeValueChangeNotification extends Notification  {
-  
-
-  @JsonProperty("event")
-  private ResourceAttributeValueChangeEvent event = null;
-
-  public ResourceAttributeValueChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ResourceAttributeValueChangeNotification event( ResourceAttributeValueChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ResourceAttributeValueChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceAttributeValueChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceAttributeValueChangeNotification serviceCreateNotification = (ResourceAttributeValueChangeNotification) o;
-    return Objects.equals(this.eventId, serviceCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreate.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreate.java
deleted file mode 100644
index 9923a52c67262ae2e6d6eec0db7276d3aaf06c7c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreate.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Resource is an abstract entity that describes the common set of attributes shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory. Skipped properties: id,href
- */
-@Schema(description = "Resource is an abstract entity that describes the common set of attributes shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceCreate  extends ResourceUpdate {
-  
-  
-
- 
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEvent.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEvent.java
deleted file mode 100644
index 984b049eff2d7162160c4abeb32c5edaa36f0cdf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEvent.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceCreateEvent {
-	@JsonProperty("event")
-	private ResourceCreateEventPayload event = null;
-
-	@JsonProperty("eventId")
-	private String eventId = null;
-
-	@JsonProperty("eventTime")
-	private OffsetDateTime eventTime = null;
-
-	@JsonProperty("eventType")
-	private String eventType = null;
-
-	@JsonProperty("correlationId")
-	private String correlationId = null;
-
-	@JsonProperty("domain")
-	private String domain = null;
-
-	@JsonProperty("title")
-	private String title = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("priority")
-	private String priority = null;
-
-	@JsonProperty("timeOcurred")
-	private OffsetDateTime timeOcurred = null;
-
-	public ResourceCreateEvent event(ResourceCreateEventPayload event) {
-		this.event = event;
-		return this;
-	}
-
-	/**
-	 * Get event
-	 * 
-	 * @return event
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceCreateEventPayload getEvent() {
-		if ( event == null ) {
-			this.event = new ResourceCreateEventPayload();
-		}
-		return event;
-	}
-
-	public void setEvent(ResourceCreateEventPayload event) {
-		this.event = event;
-	}
-
-	public ResourceCreateEvent eventId(String eventId) {
-		this.eventId = eventId;
-		return this;
-	}
-
-	/**
-	 * The identifier of the notification.
-	 * 
-	 * @return eventId
-	 **/
-	@Schema(description = "The identifier of the notification.")
-
-	public String getEventId() {
-		return eventId;
-	}
-
-	public void setEventId(String eventId) {
-		this.eventId = eventId;
-	}
-
-	public ResourceCreateEvent eventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-		return this;
-	}
-
-	/**
-	 * Time of the event occurrence.
-	 * 
-	 * @return eventTime
-	 **/
-	@Schema(description = "Time of the event occurrence.")
-
-	@Valid
-	public OffsetDateTime getEventTime() {
-		return eventTime;
-	}
-
-	public void setEventTime(OffsetDateTime eventTime) {
-		this.eventTime = eventTime;
-	}
-
-	public ResourceCreateEvent eventType(String eventType) {
-		this.eventType = eventType;
-		return this;
-	}
-
-	/**
-	 * The type of the notification.
-	 * 
-	 * @return eventType
-	 **/
-	@Schema(description = "The type of the notification.")
-
-	public String getEventType() {
-		return eventType;
-	}
-
-	public void setEventType(String eventType) {
-		this.eventType = eventType;
-	}
-
-	public ResourceCreateEvent correlationId(String correlationId) {
-		this.correlationId = correlationId;
-		return this;
-	}
-
-	/**
-	 * The correlation id for this event.
-	 * 
-	 * @return correlationId
-	 **/
-	@Schema(description = "The correlation id for this event.")
-
-	public String getCorrelationId() {
-		return correlationId;
-	}
-
-	public void setCorrelationId(String correlationId) {
-		this.correlationId = correlationId;
-	}
-
-	public ResourceCreateEvent domain(String domain) {
-		this.domain = domain;
-		return this;
-	}
-
-	/**
-	 * The domain of the event.
-	 * 
-	 * @return domain
-	 **/
-	@Schema(description = "The domain of the event.")
-
-	public String getDomain() {
-		return domain;
-	}
-
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	public ResourceCreateEvent title(String title) {
-		this.title = title;
-		return this;
-	}
-
-	/**
-	 * The title of the event.
-	 * 
-	 * @return title
-	 **/
-	@Schema(description = "The title of the event.")
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public ResourceCreateEvent description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * An explnatory of the event.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "An explnatory of the event.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceCreateEvent priority(String priority) {
-		this.priority = priority;
-		return this;
-	}
-
-	/**
-	 * A priority.
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "A priority.")
-
-	public String getPriority() {
-		return priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-
-	public ResourceCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-		this.timeOcurred = timeOcurred;
-		return this;
-	}
-
-	/**
-	 * The time the event occured.
-	 * 
-	 * @return timeOcurred
-	 **/
-	@Schema(description = "The time the event occured.")
-
-	@Valid
-	public OffsetDateTime getTimeOcurred() {
-		return timeOcurred;
-	}
-
-	public void setTimeOcurred(OffsetDateTime timeOcurred) {
-		this.timeOcurred = timeOcurred;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCreateEvent resourceCreateEvent = (ResourceCreateEvent) o;
-		return Objects.equals(this.event, resourceCreateEvent.event)
-				&& Objects.equals(this.eventId, resourceCreateEvent.eventId)
-				&& Objects.equals(this.eventTime, resourceCreateEvent.eventTime)
-				&& Objects.equals(this.eventType, resourceCreateEvent.eventType)
-				&& Objects.equals(this.correlationId, resourceCreateEvent.correlationId)
-				&& Objects.equals(this.domain, resourceCreateEvent.domain)
-				&& Objects.equals(this.title, resourceCreateEvent.title)
-				&& Objects.equals(this.description, resourceCreateEvent.description)
-				&& Objects.equals(this.priority, resourceCreateEvent.priority)
-				&& Objects.equals(this.timeOcurred, resourceCreateEvent.timeOcurred);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority,
-				timeOcurred);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCreateEvent {\n");
-
-		sb.append("    event: ").append(toIndentedString(event)).append("\n");
-		sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-		sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-		sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-		sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-		sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-		sb.append("    title: ").append(toIndentedString(title)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEventPayload.java
deleted file mode 100644
index 07ff058524d11fcb32e82f57559b6d74c659297c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceCreateEventPayload   {
-  @JsonProperty("resource")
-  private Resource resource = null;
-
-  public ResourceCreateEventPayload resource(Resource resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  /**
-   * Get resource
-   * @return resource
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCreateEventPayload resourceCreateEventPayload = (ResourceCreateEventPayload) o;
-    return Objects.equals(this.resource, resourceCreateEventPayload.resource);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resource);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceCreateEventPayload {\n");
-    
-    sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateNotification.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateNotification.java
deleted file mode 100644
index dca63e92b11e9d7f6bddc21c205eaa90f93a4825..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceCreateNotification.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ResourceCreateNotification extends Notification  {
-  
-
-  @JsonProperty("event")
-  private ResourceCreateEvent event = null;
-
-  public ResourceCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ResourceCreateNotification event( ResourceCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ResourceCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceCreateNotification serviceCreateNotification = (ResourceCreateNotification) o;
-    return Objects.equals(this.eventId, serviceCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEvent.java
deleted file mode 100644
index 92f750dea9660c0a0c9ca76c4cffed8df0e3e4e8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEvent.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceDeleteEvent   {
-  @JsonProperty("event")
-  private ResourceDeleteEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ResourceDeleteEvent event(ResourceDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceDeleteEventPayload event) {
-    this.event = event;
-  }
-
-  public ResourceDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceDeleteEvent resourceDeleteEvent = (ResourceDeleteEvent) o;
-    return Objects.equals(this.event, resourceDeleteEvent.event) &&
-        Objects.equals(this.eventId, resourceDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceDeleteEvent.title) &&
-        Objects.equals(this.description, resourceDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceDeleteEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceDeleteEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEventPayload.java
deleted file mode 100644
index 97cfc0571dfb56f0c0b5c7a69c7c144a6fb96090..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceDeleteEventPayload.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.core.io.Resource;
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceDeleteEventPayload   {
-  @JsonProperty("resource")
-  private Resource resource = null;
-
-  public ResourceDeleteEventPayload resource(Resource resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  /**
-   * Get resource
-   * @return resource
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceDeleteEventPayload resourceDeleteEventPayload = (ResourceDeleteEventPayload) o;
-    return Objects.equals(this.resource, resourceDeleteEventPayload.resource);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resource);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceDeleteEventPayload {\n");
-    
-    sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceOperationalStateType.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceOperationalStateType.java
deleted file mode 100644
index 5c9ac616b7d2f8899a07eca7714b9d359a216585..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceOperationalStateType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceOperationalStateType enumerations
- */
-public enum ResourceOperationalStateType {
-  ENABLE("enable"),
-    DISABLE("disable");
-
-  private String value;
-
-  ResourceOperationalStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ResourceOperationalStateType fromValue(String text) {
-    for (ResourceOperationalStateType b : ResourceOperationalStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRefOrValue.java
deleted file mode 100644
index 8ad14bc7a91cba2935f0f9f4b58ed5622f610b37..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRefOrValue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Resource is an abstract entity that describes the common set of attributes shared by all concrete resources. The polymorphic attributes @type, @schemaLocation &amp; @referredType are related to the Resource entity and not the related ResourceRefOrValue class itself
- */
-@Schema(description = "Resource is an abstract entity that describes the common set of attributes shared by all concrete resources. The polymorphic attributes @type, @schemaLocation & @referredType are related to the Resource entity and not the related ResourceRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIResourceRefOrVal")
-@JsonIgnoreProperties( {"uuid"} )
-public class ResourceRefOrValue extends Resource  {
-
-	public void setId(@NotNull String id) {
-		this.id = id;
-				
-	}
-
-	public String getId() {
-		if ( id == null) {
-			return super.getId();
-		}
-		return this.id;
-	}
-  
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRelationship.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRelationship.java
deleted file mode 100644
index efbd5095ca9c8e7d6a07f9ef36f9e7f76be48ce8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceRelationship.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Linked resources to the one instantiate, 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
- * (e.g. 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
- */
-@Schema(description = "Linked resources to the one instantiate, 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 (e.g. 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")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-@Entity(name = "RIResourceRel")
-public class ResourceRelationship extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("resource")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "rsrc_rsrcref_uuid", referencedColumnName = "uuid")
-	private ResourceRef resource = null;
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public ResourceRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * 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
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(example = "bundled", required = true, 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")
-	@NotNull
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ResourceRelationship resource( ResourceRef resource) {
-		this.resource = resource;
-		return this;
-	}
-
-	/**
-	 * Get resource
-	 * 
-	 * @return resource
-	 **/
-	@Schema(description = "")
-	@NotNull
-
-	@Valid
-	public ResourceRef getResource() {
-		return resource;
-	}
-
-	public void setResource(ResourceRef resource) {
-		this.resource = resource;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceRelationship resourceRelationship = (ResourceRelationship) o;
-		return Objects.equals(this.id, resourceRelationship.id) && Objects.equals(this.href, resourceRelationship.href)
-				&& Objects.equals(this.relationshipType, resourceRelationship.relationshipType)
-				&& Objects.equals(this.resource, resourceRelationship.resource)
-				&& Objects.equals(this.baseType, resourceRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, resourceRelationship.schemaLocation)
-				&& Objects.equals(this.type, resourceRelationship.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, relationshipType, resource, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEvent.java
deleted file mode 100644
index cff716aaf8eacadcea489b99b14a813d1ebb3511..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEvent.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceStateChangeEvent   {
-  @JsonProperty("event")
-  private ResourceStateChangeEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ResourceStateChangeEvent event(ResourceStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceStateChangeEventPayload getEvent() {
-    if (event == null) {
-      this.event = new ResourceStateChangeEventPayload();
-    }
-    return event;
-  }
-
-  public void setEvent(ResourceStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-  public ResourceStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceStateChangeEvent resourceStateChangeEvent = (ResourceStateChangeEvent) o;
-    return Objects.equals(this.event, resourceStateChangeEvent.event) &&
-        Objects.equals(this.eventId, resourceStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceStateChangeEvent.domain) &&
-        Objects.equals(this.title, resourceStateChangeEvent.title) &&
-        Objects.equals(this.description, resourceStateChangeEvent.description) &&
-        Objects.equals(this.priority, resourceStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceStateChangeEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceStateChangeEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEventPayload.java
deleted file mode 100644
index 359e3e6e588e3b5786106227dc2ddf972bbec275..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceStateChangeEventPayload   {
-  @JsonProperty("resource")
-  private Resource resource = null;
-
-  public ResourceStateChangeEventPayload resource(Resource resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  /**
-   * Get resource
-   * @return resource
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Resource getResource() {
-    return resource;
-  }
-
-  public void setResource(Resource resource) {
-    this.resource = resource;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceStateChangeEventPayload resourceStateChangeEventPayload = (ResourceStateChangeEventPayload) o;
-    return Objects.equals(this.resource, resourceStateChangeEventPayload.resource);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resource);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceStateChangeEventPayload {\n");
-    
-    sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeNotification.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeNotification.java
deleted file mode 100644
index e54b0f5422138b9ce296b67803d6c07bd58d4076..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStateChangeNotification.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.ri639.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-public class ResourceStateChangeNotification extends Notification  {
-  
-
-  @JsonProperty("event")
-  private ResourceStateChangeEvent event = null;
-
-  public ResourceStateChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ResourceStateChangeNotification event( ResourceStateChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ResourceStateChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceStateChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceStateChangeNotification serviceCreateNotification = (ResourceStateChangeNotification) o;
-    return Objects.equals(this.eventId, serviceCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStatusType.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStatusType.java
deleted file mode 100644
index 70de7ede8319d63ececac2aaa6a2387c879f7e67..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceStatusType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceStatusType enumerations
- */
-public enum ResourceStatusType {
-  STANDBY("standby"),
-    ALARM("alarm"),
-    AVAILABLE("available"),
-    RESERVED("reserved"),
-    UNKNOWN("unknown"),
-    SUSPENDED("suspended");
-
-  private String value;
-
-  ResourceStatusType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ResourceStatusType fromValue(String text) {
-    for (ResourceStatusType b : ResourceStatusType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUpdate.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUpdate.java
deleted file mode 100644
index 9686f329a4b1669983b312f0e71961277acff3cf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUpdate.java
+++ /dev/null
@@ -1,710 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Resource is an abstract entity that describes the common set of attributes
- * shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory.
- * Skipped properties: id,href
- */
-@Schema(description = "Resource is an abstract entity that describes the common set of attributes shared by all concrete resources (e.g. TPE, EQUIPMENT) in the inventory. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
-public class ResourceUpdate {
-	@JsonProperty("category")
-	protected String category = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	protected OffsetDateTime endOperatingDate = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("resourceVersion")
-	protected String resourceVersion = null;
-
-	protected OffsetDateTime startOperatingDate = null;
-
-	@JsonProperty("activationFeature")
-	@Valid
-	protected List<Feature> activationFeature = null;
-
-	@JsonProperty("administrativeState")
-	protected ResourceAdministrativeStateType administrativeState = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	protected List<AttachmentRefOrValue> attachment = null;
-
-	@JsonProperty("note")
-	@Valid
-	protected List<Note> note = null;
-
-	@JsonProperty("operationalState")
-	protected ResourceOperationalStateType operationalState = null;
-
-	@JsonProperty("place")
-	protected RelatedPlaceRefOrValue place = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("resourceCharacteristic")
-	@Valid
-	protected List<Characteristic> resourceCharacteristic = null;
-
-	@JsonProperty("resourceRelationship")
-	@Valid
-	protected List<ResourceRelationship> resourceRelationship = null;
-
-	@JsonProperty("resourceSpecification")
-	protected ResourceSpecificationRef resourceSpecification = null;
-
-	@JsonProperty("resourceStatus")
-	protected ResourceStatusType resourceStatus = null;
-
-	@JsonProperty("usageState")
-	protected ResourceUsageStateType usageState = null;
-
-	@JsonProperty("@baseType")
-	protected String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String _atType = null;
-
-	public ResourceUpdate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Category of the concrete resource. e.g Gold, Silver for MSISDN concrete
-	 * resource
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ResourceUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * free-text description of the resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "free-text description of the resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceUpdate endOperatingDate(OffsetDateTime endOperatingDate) {
-		this.endOperatingDate = endOperatingDate;
-		return this;
-	}
-
-	/**
-	 * A date time( DateTime). The date till the resource is operating
-	 * 
-	 * @return endOperatingDate
-	 **/
-	@Schema(description = "A date time( DateTime). The date till the resource is operating")
-
-	@Valid
-	public OffsetDateTime getEndOperatingDate() {
-		return endOperatingDate;
-	}
-
-	public void setEndOperatingDate(OffsetDateTime endOperatingDate) {
-		this.endOperatingDate = endOperatingDate;
-	}
-
-	@JsonProperty("endOperatingDate")
-	@Valid
-	public String getEndOperatingDateStr() {
-
-		if (this.endOperatingDate != null) {
-			return this.endOperatingDate.toString();
-		} else {
-			return null;
-		}
-	}
-
-
-	public void setEndOperatingDate(String endOperatingDate) {
-		if (endOperatingDate != null) {
-			this.endOperatingDate = OffsetDateTime.parse(endOperatingDate);
-
-		}
-	}
-	
-
-	public ResourceUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A string used to give a name to the resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A string used to give a name to the resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceUpdate resourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-		return this;
-	}
-
-	/**
-	 * A field that identifies the specific version of an instance of a resource.
-	 * 
-	 * @return resourceVersion
-	 **/
-	@Schema(description = "A field that identifies the specific version of an instance of a resource.")
-
-	public String getResourceVersion() {
-		return resourceVersion;
-	}
-
-	public void setResourceVersion(String resourceVersion) {
-		this.resourceVersion = resourceVersion;
-	}
-
-	public ResourceUpdate startOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-		return this;
-	}
-
-	/**
-	 * A date time( DateTime). The date from which the resource is operating
-	 * 
-	 * @return startOperatingDate
-	 **/
-	@Schema(description = "A date time( DateTime). The date from which the resource is operating")
-
-	@Valid
-	public OffsetDateTime getStartOperatingDate() {
-		return startOperatingDate;
-	}
-	
-
-	@JsonProperty("startOperatingDate")
-	public String getStartOperatingDateStr() {
-		if (this.startOperatingDate != null) {
-			return this.startOperatingDate.toString();
-		} else {
-			return null;
-		}
-	}
-
-	
-
-	public void setStartOperatingDate(OffsetDateTime startOperatingDate) {
-		this.startOperatingDate = startOperatingDate;
-	}
-	
-
-	public void setStartOperatingDate(String  startOperatingDate) {
-		if (startOperatingDate != null) {
-			this.startOperatingDate = OffsetDateTime.parse(startOperatingDate);
-
-		}
-	}
-
-	public ResourceUpdate activationFeature(List<Feature> activationFeature) {
-		this.activationFeature = activationFeature;
-		return this;
-	}
-
-	public ResourceUpdate addActivationFeatureItem(Feature activationFeatureItem) {
-		if (this.activationFeature == null) {
-			this.activationFeature = new ArrayList<>();
-		}
-		this.activationFeature.add(activationFeatureItem);
-		return this;
-	}
-
-	/**
-	 * Configuration features
-	 * 
-	 * @return activationFeature
-	 **/
-	@Schema(description = "Configuration features")
-	@Valid
-	public List<Feature> getActivationFeature() {
-		return activationFeature;
-	}
-
-	public void setActivationFeature(List<Feature> activationFeature) {
-		this.activationFeature = activationFeature;
-	}
-
-	public ResourceUpdate administrativeState(ResourceAdministrativeStateType administrativeState) {
-		this.administrativeState = administrativeState;
-		return this;
-	}
-
-	/**
-	 * Get administrativeState
-	 * 
-	 * @return administrativeState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceAdministrativeStateType getAdministrativeState() {
-		return administrativeState;
-	}
-
-	public void setAdministrativeState(ResourceAdministrativeStateType administrativeState) {
-		this.administrativeState = administrativeState;
-	}
-
-	public ResourceUpdate attachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ResourceUpdate addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new ArrayList<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Get attachment
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ResourceUpdate note(List<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ResourceUpdate addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new ArrayList<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Get note
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(List<Note> note) {
-		this.note = note;
-	}
-
-	public ResourceUpdate operationalState(ResourceOperationalStateType operationalState) {
-		this.operationalState = operationalState;
-		return this;
-	}
-
-	/**
-	 * Get operationalState
-	 * 
-	 * @return operationalState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceOperationalStateType getOperationalState() {
-		return operationalState;
-	}
-
-	public void setOperationalState(ResourceOperationalStateType operationalState) {
-		this.operationalState = operationalState;
-	}
-
-	public ResourceUpdate place(RelatedPlaceRefOrValue place) {
-		this.place = place;
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public RelatedPlaceRefOrValue getPlace() {
-		return place;
-	}
-
-	public void setPlace(RelatedPlaceRefOrValue place) {
-		this.place = place;
-	}
-
-	public ResourceUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ResourceUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ResourceUpdate resourceCharacteristic(List<Characteristic> resourceCharacteristic) {
-		this.resourceCharacteristic = resourceCharacteristic;
-		return this;
-	}
-
-	public ResourceUpdate addResourceCharacteristicItem(Characteristic resourceCharacteristicItem) {
-		if (this.resourceCharacteristic == null) {
-			this.resourceCharacteristic = new ArrayList<>();
-		}
-		this.resourceCharacteristic.add(resourceCharacteristicItem);
-		return this;
-	}
-	
-	
-	public ResourceUpdate addResourceCharacteristicItemShort(String aname,
-			String aValue,
-			String valueType) {
-
-		Characteristic resCharacteristicItem =  new Characteristic();
-		resCharacteristicItem.setName( aname );
-					
-		Any val = new Any();
-		val.setValue( aValue );
-		val.setAlias( null );
-		
-		resCharacteristicItem.setValue( val );
-		
-		this.addResourceCharacteristicItem( resCharacteristicItem );
-		return this;
-	}
-
-	/**
-	 * Get resourceCharacteristic
-	 * 
-	 * @return resourceCharacteristic
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<Characteristic> getResourceCharacteristic() {
-		return resourceCharacteristic;
-	}
-
-	public void setResourceCharacteristic(List<Characteristic> resourceCharacteristic) {
-		this.resourceCharacteristic = resourceCharacteristic;
-	}
-
-	public ResourceUpdate resourceRelationship(List<ResourceRelationship> resourceRelationship) {
-		this.resourceRelationship = resourceRelationship;
-		return this;
-	}
-
-	public ResourceUpdate addResourceRelationshipItem(ResourceRelationship resourceRelationshipItem) {
-		if (this.resourceRelationship == null) {
-			this.resourceRelationship = new ArrayList<>();
-		}
-		this.resourceRelationship.add(resourceRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get resourceRelationship
-	 * 
-	 * @return resourceRelationship
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<ResourceRelationship> getResourceRelationship() {
-		return resourceRelationship;
-	}
-
-	public void setResourceRelationship(List<ResourceRelationship> resourceRelationship) {
-		this.resourceRelationship = resourceRelationship;
-	}
-
-	public ResourceUpdate resourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	/**
-	 * Get resourceSpecification
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceSpecificationRef getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(ResourceSpecificationRef resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	public ResourceUpdate resourceStatus(ResourceStatusType resourceStatus) {
-		this.resourceStatus = resourceStatus;
-		return this;
-	}
-
-	/**
-	 * Get resourceStatus
-	 * 
-	 * @return resourceStatus
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceStatusType getResourceStatus() {
-		return resourceStatus;
-	}
-
-	public void setResourceStatus(ResourceStatusType resourceStatus) {
-		this.resourceStatus = resourceStatus;
-	}
-
-	public ResourceUpdate usageState(ResourceUsageStateType usageState) {
-		this.usageState = usageState;
-		return this;
-	}
-
-	/**
-	 * Get usageState
-	 * 
-	 * @return usageState
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceUsageStateType getUsageState() {
-		return usageState;
-	}
-
-	public void setUsageState(ResourceUsageStateType usageState) {
-		this.usageState = usageState;
-	}
-
-	public ResourceUpdate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ResourceUpdate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ResourceUpdate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class Extensible name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceUpdate resourceUpdate = (ResourceUpdate) o;
-		return Objects.equals(this.category, resourceUpdate.category)
-				&& Objects.equals(this.description, resourceUpdate.description)
-				&& Objects.equals(this.endOperatingDate, resourceUpdate.endOperatingDate)
-				&& Objects.equals(this.name, resourceUpdate.name)
-				&& Objects.equals(this.resourceVersion, resourceUpdate.resourceVersion)
-				&& Objects.equals(this.startOperatingDate, resourceUpdate.startOperatingDate)
-				&& Objects.equals(this.activationFeature, resourceUpdate.activationFeature)
-				&& Objects.equals(this.administrativeState, resourceUpdate.administrativeState)
-				&& Objects.equals(this.attachment, resourceUpdate.attachment)
-				&& Objects.equals(this.note, resourceUpdate.note)
-				&& Objects.equals(this.operationalState, resourceUpdate.operationalState)
-				&& Objects.equals(this.place, resourceUpdate.place)
-				&& Objects.equals(this.relatedParty, resourceUpdate.relatedParty)
-				&& Objects.equals(this.resourceCharacteristic, resourceUpdate.resourceCharacteristic)
-				&& Objects.equals(this.resourceRelationship, resourceUpdate.resourceRelationship)
-				&& Objects.equals(this.resourceSpecification, resourceUpdate.resourceSpecification)
-				&& Objects.equals(this.resourceStatus, resourceUpdate.resourceStatus)
-				&& Objects.equals(this.usageState, resourceUpdate.usageState)
-				&& Objects.equals(this._atBaseType, resourceUpdate._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, resourceUpdate._atSchemaLocation)
-				&& Objects.equals(this._atType, resourceUpdate._atType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(category, description, endOperatingDate, name, resourceVersion, startOperatingDate,
-				activationFeature, administrativeState, attachment, note, operationalState, place, relatedParty,
-				resourceCharacteristic, resourceRelationship, resourceSpecification, resourceStatus, usageState,
-				_atBaseType, _atSchemaLocation, _atType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceUpdate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endOperatingDate: ").append(toIndentedString(endOperatingDate)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    resourceVersion: ").append(toIndentedString(resourceVersion)).append("\n");
-		sb.append("    startOperatingDate: ").append(toIndentedString(startOperatingDate)).append("\n");
-		sb.append("    activationFeature: ").append(toIndentedString(activationFeature)).append("\n");
-		sb.append("    administrativeState: ").append(toIndentedString(administrativeState)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    operationalState: ").append(toIndentedString(operationalState)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceCharacteristic: ").append(toIndentedString(resourceCharacteristic)).append("\n");
-		sb.append("    resourceRelationship: ").append(toIndentedString(resourceRelationship)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    resourceStatus: ").append(toIndentedString(resourceStatus)).append("\n");
-		sb.append("    usageState: ").append(toIndentedString(usageState)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	protected String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUsageStateType.java b/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUsageStateType.java
deleted file mode 100644
index bdf43f6731d97e493e34a92e2ab88a3fb7c0ca7a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ri639/model/ResourceUsageStateType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.etsi.osl.tmf.ri639.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceUsageStateType enumerations
- */
-public enum ResourceUsageStateType {
-	IDLE("idle"), ACTIVE("active"), BUSY("busy");
-
-	private String value;
-
-	ResourceUsageStateType(String value) {
-		this.value = value;
-	}
-
-	@Override
-	@JsonValue
-	public String toString() {
-		return String.valueOf(value);
-	}
-
-	@JsonCreator
-	public static ResourceUsageStateType fromValue(String text) {
-		for (ResourceUsageStateType b : ResourceUsageStateType.values()) {
-			if (String.valueOf(b.value).equals(text)) {
-				return b;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/AppointmentRef.java b/src/main/java/org/etsi/osl/tmf/ro652/model/AppointmentRef.java
deleted file mode 100644
index e601a2e61474025a84042b2b269551f3aaabbaef..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/AppointmentRef.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Refers an appointment, such as a Customer presentation or internal meeting or site visit
- */
-@Schema(description = "Refers an appointment, such as a Customer presentation or internal meeting or site visit")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class AppointmentRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public AppointmentRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier of the referred appointment
-   * @return id
-  **/
-  @Schema(description = "The identifier of the referred appointment")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AppointmentRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The reference of the appointment
-   * @return href
-  **/
-  @Schema(description = "The reference of the appointment")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AppointmentRef description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text regarding the appointment made with a party
-   * @return description
-  **/
-  @Schema(description = "An explanatory text regarding the appointment made with a party")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public AppointmentRef _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public AppointmentRef _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public AppointmentRef _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public AppointmentRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AppointmentRef appointmentRef = (AppointmentRef) o;
-    return Objects.equals(this.id, appointmentRef.id) &&
-        Objects.equals(this.href, appointmentRef.href) &&
-        Objects.equals(this.description, appointmentRef.description) &&
-        Objects.equals(this._atBaseType, appointmentRef._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, appointmentRef._atSchemaLocation) &&
-        Objects.equals(this._atType, appointmentRef._atType) &&
-        Objects.equals(this._atReferredType, appointmentRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, description, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AppointmentRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelOrder.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelOrder.java
deleted file mode 100644
index 04672efaeb853e01d556bf220f060c01a44367e1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelOrder.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Order cancel is a type of task which  can  be used to place a request to cancel an order
- */
-@Schema(description = "A Order cancel is a type of task which  can  be used to place a request to cancel an order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelOrder   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("effectiveCancellationDate")
-  private OffsetDateTime effectiveCancellationDate = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("state")
-  private TaskStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public CancelOrder id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * id of the cancellation request (this is not an order id)
-   * @return id
-  **/
-  @Schema(description = "id of the cancellation request (this is not an order id)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelOrder href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the cancellation request
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the cancellation request")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelOrder cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelOrder effectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled.
-   * @return effectiveCancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled.")
-  
-    @Valid
-    public OffsetDateTime getEffectiveCancellationDate() {
-    return effectiveCancellationDate;
-  }
-
-  public void setEffectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-  }
-
-  public CancelOrder requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelOrder state(TaskStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TaskStateType getState() {
-    return state;
-  }
-
-  public void setState(TaskStateType state) {
-    this.state = state;
-  }
-
-  public CancelOrder _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public CancelOrder _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public CancelOrder _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelOrder cancelOrder = (CancelOrder) o;
-    return Objects.equals(this.id, cancelOrder.id) &&
-        Objects.equals(this.href, cancelOrder.href) &&
-        Objects.equals(this.cancellationReason, cancelOrder.cancellationReason) &&
-        Objects.equals(this.effectiveCancellationDate, cancelOrder.effectiveCancellationDate) &&
-        Objects.equals(this.requestedCancellationDate, cancelOrder.requestedCancellationDate) &&
-        Objects.equals(this.state, cancelOrder.state) &&
-        Objects.equals(this._atBaseType, cancelOrder._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, cancelOrder._atSchemaLocation) &&
-        Objects.equals(this._atType, cancelOrder._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, cancellationReason, effectiveCancellationDate, requestedCancellationDate, state, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelOrder {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    effectiveCancellationDate: ").append(toIndentedString(effectiveCancellationDate)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrder.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrder.java
deleted file mode 100644
index 74e9baaaa5febd293429f279485e0e509d580eb3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrder.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Request for cancellation an existing resource order
- */
-@Schema(description = "Request for cancellation an existing resource order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrder   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("effectiveCancellationDate")
-  private OffsetDateTime effectiveCancellationDate = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("resourceOrder")
-  private ResourceOrderRef resourceOrder = null;
-
-  @JsonProperty("state")
-  private TaskStateType state = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public CancelResourceOrder id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * id of the cancellation request (this is not an order id)
-   * @return id
-  **/
-  @Schema(description = "id of the cancellation request (this is not an order id)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelResourceOrder href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the cancellation request
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the cancellation request")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelResourceOrder cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelResourceOrder effectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the order is cancelled.
-   * @return effectiveCancellationDate
-  **/
-  @Schema(description = "Date when the order is cancelled.")
-  
-    @Valid
-    public OffsetDateTime getEffectiveCancellationDate() {
-    return effectiveCancellationDate;
-  }
-
-  public void setEffectiveCancellationDate(OffsetDateTime effectiveCancellationDate) {
-    this.effectiveCancellationDate = effectiveCancellationDate;
-  }
-
-  public CancelResourceOrder requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelResourceOrder resourceOrder(ResourceOrderRef resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public ResourceOrderRef getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrderRef resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-  public CancelResourceOrder state(TaskStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * Get state
-   * @return state
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TaskStateType getState() {
-    return state;
-  }
-
-  public void setState(TaskStateType state) {
-    this.state = state;
-  }
-
-  public CancelResourceOrder _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public CancelResourceOrder _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public CancelResourceOrder _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrder cancelResourceOrder = (CancelResourceOrder) o;
-    return Objects.equals(this.id, cancelResourceOrder.id) &&
-        Objects.equals(this.href, cancelResourceOrder.href) &&
-        Objects.equals(this.cancellationReason, cancelResourceOrder.cancellationReason) &&
-        Objects.equals(this.effectiveCancellationDate, cancelResourceOrder.effectiveCancellationDate) &&
-        Objects.equals(this.requestedCancellationDate, cancelResourceOrder.requestedCancellationDate) &&
-        Objects.equals(this.resourceOrder, cancelResourceOrder.resourceOrder) &&
-        Objects.equals(this.state, cancelResourceOrder.state) &&
-        Objects.equals(this._atBaseType, cancelResourceOrder._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, cancelResourceOrder._atSchemaLocation) &&
-        Objects.equals(this._atType, cancelResourceOrder._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, cancellationReason, effectiveCancellationDate, requestedCancellationDate, resourceOrder, state, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrder {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    effectiveCancellationDate: ").append(toIndentedString(effectiveCancellationDate)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreate.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreate.java
deleted file mode 100644
index b990db16bc9f7e706a796a8b2a2b1fd72b132276..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreate.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Request for cancellation an existing resource order Skipped properties: id,href,state,effectiveCancellationDate
- */
-@Schema(description = "Request for cancellation an existing resource order Skipped properties: id,href,state,effectiveCancellationDate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderCreate   {
-  @JsonProperty("cancellationReason")
-  private String cancellationReason = null;
-
-  @JsonProperty("requestedCancellationDate")
-  private OffsetDateTime requestedCancellationDate = null;
-
-  @JsonProperty("resourceOrder")
-  private ResourceOrderRef resourceOrder = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public CancelResourceOrderCreate cancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-    return this;
-  }
-
-  /**
-   * Reason why the order is cancelled.
-   * @return cancellationReason
-  **/
-  @Schema(description = "Reason why the order is cancelled.")
-  
-    public String getCancellationReason() {
-    return cancellationReason;
-  }
-
-  public void setCancellationReason(String cancellationReason) {
-    this.cancellationReason = cancellationReason;
-  }
-
-  public CancelResourceOrderCreate requestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-    return this;
-  }
-
-  /**
-   * Date when the submitter wants the order to be cancelled
-   * @return requestedCancellationDate
-  **/
-  @Schema(description = "Date when the submitter wants the order to be cancelled")
-  
-    @Valid
-    public OffsetDateTime getRequestedCancellationDate() {
-    return requestedCancellationDate;
-  }
-
-  public void setRequestedCancellationDate(OffsetDateTime requestedCancellationDate) {
-    this.requestedCancellationDate = requestedCancellationDate;
-  }
-
-  public CancelResourceOrderCreate resourceOrder(ResourceOrderRef resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    @Valid
-    public ResourceOrderRef getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrderRef resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-  public CancelResourceOrderCreate _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public CancelResourceOrderCreate _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public CancelResourceOrderCreate _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderCreate cancelResourceOrderCreate = (CancelResourceOrderCreate) o;
-    return Objects.equals(this.cancellationReason, cancelResourceOrderCreate.cancellationReason) &&
-        Objects.equals(this.requestedCancellationDate, cancelResourceOrderCreate.requestedCancellationDate) &&
-        Objects.equals(this.resourceOrder, cancelResourceOrderCreate.resourceOrder) &&
-        Objects.equals(this._atBaseType, cancelResourceOrderCreate._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, cancelResourceOrderCreate._atSchemaLocation) &&
-        Objects.equals(this._atType, cancelResourceOrderCreate._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancellationReason, requestedCancellationDate, resourceOrder, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderCreate {\n");
-    
-    sb.append("    cancellationReason: ").append(toIndentedString(cancellationReason)).append("\n");
-    sb.append("    requestedCancellationDate: ").append(toIndentedString(requestedCancellationDate)).append("\n");
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEvent.java
deleted file mode 100644
index cac68f4b77ed133854cb8d69b5dd1ec5421603d1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEvent.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CancelResourceOrderCreateEventPayload event = null;
-
-  public CancelResourceOrderCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelResourceOrderCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelResourceOrderCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelResourceOrderCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelResourceOrderCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelResourceOrderCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelResourceOrderCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelResourceOrderCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelResourceOrderCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelResourceOrderCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelResourceOrderCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelResourceOrderCreateEvent event(CancelResourceOrderCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrderCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelResourceOrderCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderCreateEvent cancelResourceOrderCreateEvent = (CancelResourceOrderCreateEvent) o;
-    return Objects.equals(this.id, cancelResourceOrderCreateEvent.id) &&
-        Objects.equals(this.href, cancelResourceOrderCreateEvent.href) &&
-        Objects.equals(this.eventId, cancelResourceOrderCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelResourceOrderCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelResourceOrderCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelResourceOrderCreateEvent.correlationId) &&
-        Objects.equals(this.domain, cancelResourceOrderCreateEvent.domain) &&
-        Objects.equals(this.title, cancelResourceOrderCreateEvent.title) &&
-        Objects.equals(this.description, cancelResourceOrderCreateEvent.description) &&
-        Objects.equals(this.priority, cancelResourceOrderCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelResourceOrderCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, cancelResourceOrderCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEventPayload.java
deleted file mode 100644
index 26ca17bc41814322c01dd3c52a73adcd935091b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderCreateEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderCreateEventPayload   {
-  @JsonProperty("cancelResourceOrder")
-  private CancelResourceOrder cancelResourceOrder = null;
-
-  public CancelResourceOrderCreateEventPayload cancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelResourceOrder
-   * @return cancelResourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrder getCancelResourceOrder() {
-    return cancelResourceOrder;
-  }
-
-  public void setCancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderCreateEventPayload cancelResourceOrderCreateEventPayload = (CancelResourceOrderCreateEventPayload) o;
-    return Objects.equals(this.cancelResourceOrder, cancelResourceOrderCreateEventPayload.cancelResourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelResourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderCreateEventPayload {\n");
-    
-    sb.append("    cancelResourceOrder: ").append(toIndentedString(cancelResourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEvent.java
deleted file mode 100644
index f2a1c2a0ba83738163b04d323f403c99029654ed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEvent.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderInformationRequiredEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private CancelResourceOrderInformationRequiredEventPayload event = null;
-
-  public CancelResourceOrderInformationRequiredEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public CancelResourceOrderInformationRequiredEvent event(CancelResourceOrderInformationRequiredEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrderInformationRequiredEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelResourceOrderInformationRequiredEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderInformationRequiredEvent cancelResourceOrderInformationRequiredEvent = (CancelResourceOrderInformationRequiredEvent) o;
-    return Objects.equals(this.eventId, cancelResourceOrderInformationRequiredEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelResourceOrderInformationRequiredEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelResourceOrderInformationRequiredEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelResourceOrderInformationRequiredEvent.correlationId) &&
-        Objects.equals(this.domain, cancelResourceOrderInformationRequiredEvent.domain) &&
-        Objects.equals(this.title, cancelResourceOrderInformationRequiredEvent.title) &&
-        Objects.equals(this.description, cancelResourceOrderInformationRequiredEvent.description) &&
-        Objects.equals(this.priority, cancelResourceOrderInformationRequiredEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelResourceOrderInformationRequiredEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, cancelResourceOrderInformationRequiredEvent.fieldPath) &&
-        Objects.equals(this.event, cancelResourceOrderInformationRequiredEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderInformationRequiredEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEventPayload.java
deleted file mode 100644
index 4cf9124d2cb08b2c89df953bc25c514db3b586db..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderInformationRequiredEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderInformationRequiredEventPayload   {
-  @JsonProperty("cancelResourceOrder")
-  private CancelResourceOrder cancelResourceOrder = null;
-
-  public CancelResourceOrderInformationRequiredEventPayload cancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelResourceOrder
-   * @return cancelResourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrder getCancelResourceOrder() {
-    return cancelResourceOrder;
-  }
-
-  public void setCancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderInformationRequiredEventPayload cancelResourceOrderInformationRequiredEventPayload = (CancelResourceOrderInformationRequiredEventPayload) o;
-    return Objects.equals(this.cancelResourceOrder, cancelResourceOrderInformationRequiredEventPayload.cancelResourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelResourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderInformationRequiredEventPayload {\n");
-    
-    sb.append("    cancelResourceOrder: ").append(toIndentedString(cancelResourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEvent.java
deleted file mode 100644
index cb62a1e177bd07be000f7195b541f6907ae1260d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEvent.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private CancelResourceOrderStateChangeEventPayload event = null;
-
-  public CancelResourceOrderStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CancelResourceOrderStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public CancelResourceOrderStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public CancelResourceOrderStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public CancelResourceOrderStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public CancelResourceOrderStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public CancelResourceOrderStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public CancelResourceOrderStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public CancelResourceOrderStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CancelResourceOrderStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public CancelResourceOrderStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public CancelResourceOrderStateChangeEvent event(CancelResourceOrderStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrderStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(CancelResourceOrderStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderStateChangeEvent cancelResourceOrderStateChangeEvent = (CancelResourceOrderStateChangeEvent) o;
-    return Objects.equals(this.id, cancelResourceOrderStateChangeEvent.id) &&
-        Objects.equals(this.href, cancelResourceOrderStateChangeEvent.href) &&
-        Objects.equals(this.eventId, cancelResourceOrderStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, cancelResourceOrderStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, cancelResourceOrderStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, cancelResourceOrderStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, cancelResourceOrderStateChangeEvent.domain) &&
-        Objects.equals(this.title, cancelResourceOrderStateChangeEvent.title) &&
-        Objects.equals(this.description, cancelResourceOrderStateChangeEvent.description) &&
-        Objects.equals(this.priority, cancelResourceOrderStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, cancelResourceOrderStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, cancelResourceOrderStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEventPayload.java
deleted file mode 100644
index 4defc2bcd1865bb6d02f84ae851e1be2e11ee82b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CancelResourceOrderStateChangeEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CancelResourceOrderStateChangeEventPayload   {
-  @JsonProperty("cancelResourceOrder")
-  private CancelResourceOrder cancelResourceOrder = null;
-
-  public CancelResourceOrderStateChangeEventPayload cancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-    return this;
-  }
-
-  /**
-   * Get cancelResourceOrder
-   * @return cancelResourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public CancelResourceOrder getCancelResourceOrder() {
-    return cancelResourceOrder;
-  }
-
-  public void setCancelResourceOrder(CancelResourceOrder cancelResourceOrder) {
-    this.cancelResourceOrder = cancelResourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CancelResourceOrderStateChangeEventPayload cancelResourceOrderStateChangeEventPayload = (CancelResourceOrderStateChangeEventPayload) o;
-    return Objects.equals(this.cancelResourceOrder, cancelResourceOrderStateChangeEventPayload.cancelResourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cancelResourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CancelResourceOrderStateChangeEventPayload {\n");
-    
-    sb.append("    cancelResourceOrder: ").append(toIndentedString(cancelResourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/CharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/ro652/model/CharacteristicRelationship.java
deleted file mode 100644
index ac85cb06c1df19706f40e7457f800da95261f4e9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/CharacteristicRelationship.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Another Characteristic that is related to the current Characteristic;
- */
-@Schema(description = "Another Characteristic that is related to the current Characteristic;")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class CharacteristicRelationship   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public CharacteristicRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the characteristic
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the characteristic")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CharacteristicRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * The type of relationship
-   * @return relationshipType
-  **/
-  @Schema(description = "The type of relationship")
-  
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public CharacteristicRelationship _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public CharacteristicRelationship _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public CharacteristicRelationship _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CharacteristicRelationship characteristicRelationship = (CharacteristicRelationship) o;
-    return Objects.equals(this.id, characteristicRelationship.id) &&
-        Objects.equals(this.relationshipType, characteristicRelationship.relationshipType) &&
-        Objects.equals(this._atBaseType, characteristicRelationship._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, characteristicRelationship._atSchemaLocation) &&
-        Objects.equals(this._atType, characteristicRelationship._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, relationshipType, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CharacteristicRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/ro652/model/EntityRef.java
deleted file mode 100644
index bff7bd2717ac34ebc7345134d101f2f4da3b358b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/EntityRef.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class EntityRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a related entity.
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a related entity.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the related entity.
-   * @return href
-  **/
-  @Schema(description = "Reference of the related entity.")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public EntityRef _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public EntityRef _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public EntityRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this._atBaseType, entityRef._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, entityRef._atSchemaLocation) &&
-        Objects.equals(this._atType, entityRef._atType) &&
-        Objects.equals(this._atReferredType, entityRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscription.java
deleted file mode 100644
index 92c132d23f29fc47551752ac966c9f1b2f327f2b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscription.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscriptionInput.java
deleted file mode 100644
index 000dd04f737ecad6d4ba290fc969afb6428181c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ExternalId.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ExternalId.java
deleted file mode 100644
index 454c1ba4c82f5b70b97de725184d3015be5e0833..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ExternalId.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An identification of an entity that is owned by or originates in a software system different from the current system, for example a ProductOrder handed off from a commerce platform into an order handling system. The structure identifies the system itself, the nature of the entity within the system (e.g. class name) and the unique ID of the entity within the system. It is anticipated that multiple external IDs can be held for a single entity, e.g. if the entity passed through multiple systems on the way to the current system. In this case the consumer is expected to sequence the IDs in the array in reverse order of provenance, i.e. most recent system first in the list.
- */
-@Schema(description = "An identification of an entity that is owned by or originates in a software system different from the current system, for example a ProductOrder handed off from a commerce platform into an order handling system. The structure identifies the system itself, the nature of the entity within the system (e.g. class name) and the unique ID of the entity within the system. It is anticipated that multiple external IDs can be held for a single entity, e.g. if the entity passed through multiple systems on the way to the current system. In this case the consumer is expected to sequence the IDs in the array in reverse order of provenance, i.e. most recent system first in the list.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ExternalId   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("entityType")
-  private String entityType = null;
-
-  @JsonProperty("owner")
-  private String owner = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ExternalId id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * ID of the entity within the external system.
-   * @return id
-  **/
-  @Schema(description = "ID of the entity within the external system.")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExternalId entityType(String entityType) {
-    this.entityType = entityType;
-    return this;
-  }
-
-  /**
-   * Type of the entity within the external system
-   * @return entityType
-  **/
-  @Schema(description = "Type of the entity within the external system")
-      @NotNull
-
-    public String getEntityType() {
-    return entityType;
-  }
-
-  public void setEntityType(String entityType) {
-    this.entityType = entityType;
-  }
-
-  public ExternalId owner(String owner) {
-    this.owner = owner;
-    return this;
-  }
-
-  /**
-   * Name of the external system that owns the entity.
-   * @return owner
-  **/
-  @Schema(description = "Name of the external system that owns the entity.")
-      @NotNull
-
-    public String getOwner() {
-    return owner;
-  }
-
-  public void setOwner(String owner) {
-    this.owner = owner;
-  }
-
-  public ExternalId _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ExternalId _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ExternalId _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExternalId externalId = (ExternalId) o;
-    return Objects.equals(this.id, externalId.id) &&
-        Objects.equals(this.entityType, externalId.entityType) &&
-        Objects.equals(this.owner, externalId.owner) &&
-        Objects.equals(this._atBaseType, externalId._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, externalId._atSchemaLocation) &&
-        Objects.equals(this._atType, externalId._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, entityType, owner, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExternalId {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    entityType: ").append(toIndentedString(entityType)).append("\n");
-    sb.append("    owner: ").append(toIndentedString(owner)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/Quantity.java b/src/main/java/org/etsi/osl/tmf/ro652/model/Quantity.java
deleted file mode 100644
index 4b6899d742f0de03775539f85c409e309541dd1d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/Quantity.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * An amount in a given unit
- */
-@Schema(description = "An amount in a given unit")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class Quantity   {
-  @JsonProperty("amount")
-  private Float amount = 1.0f;
-
-  @JsonProperty("units")
-  private String units = null;
-
-  public Quantity amount(Float amount) {
-    this.amount = amount;
-    return this;
-  }
-
-  /**
-   * Numeric value in a given unit
-   * @return amount
-  **/
-  @Schema(description = "Numeric value in a given unit")
-  
-    public Float getAmount() {
-    return amount;
-  }
-
-  public void setAmount(Float amount) {
-    this.amount = amount;
-  }
-
-  public Quantity units(String units) {
-    this.units = units;
-    return this;
-  }
-
-  /**
-   * Unit
-   * @return units
-  **/
-  @Schema(description = "Unit")
-  
-    public String getUnits() {
-    return units;
-  }
-
-  public void setUnits(String units) {
-    this.units = units;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Quantity quantity = (Quantity) o;
-    return Objects.equals(this.amount, quantity.amount) &&
-        Objects.equals(this.units, quantity.units);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(amount, units);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Quantity {\n");
-    
-    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-    sb.append("    units: ").append(toIndentedString(units)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/RelatedPlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/ro652/model/RelatedPlaceRefOrValue.java
deleted file mode 100644
index d9369f4cab920f5c8c8d0f7ae7ab0484db3624f0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/RelatedPlaceRefOrValue.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation &amp; @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself
- */
-@Schema(description = "Related Entity reference. A related place defines a place described by reference or by value linked to a specific entity. The polymorphic attributes @type, @schemaLocation & @referredType are related to the place entity and not the RelatedPlaceRefOrValue class itself")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class RelatedPlaceRefOrValue   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public RelatedPlaceRefOrValue id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the place
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the place")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public RelatedPlaceRefOrValue href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Unique reference of the place
-   * @return href
-  **/
-  @Schema(description = "Unique reference of the place")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public RelatedPlaceRefOrValue name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]
-   * @return name
-  **/
-  @Schema(description = "A user-friendly name for the place, such as [Paris Store], [London Store], [Main Home]")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public RelatedPlaceRefOrValue role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * Get role
-   * @return role
-  **/
-  @Schema(description = "")
-      @NotNull
-
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
-  public RelatedPlaceRefOrValue _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public RelatedPlaceRefOrValue _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public RelatedPlaceRefOrValue _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public RelatedPlaceRefOrValue _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RelatedPlaceRefOrValue relatedPlaceRefOrValue = (RelatedPlaceRefOrValue) o;
-    return Objects.equals(this.id, relatedPlaceRefOrValue.id) &&
-        Objects.equals(this.href, relatedPlaceRefOrValue.href) &&
-        Objects.equals(this.name, relatedPlaceRefOrValue.name) &&
-        Objects.equals(this.role, relatedPlaceRefOrValue.role) &&
-        Objects.equals(this._atBaseType, relatedPlaceRefOrValue._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, relatedPlaceRefOrValue._atSchemaLocation) &&
-        Objects.equals(this._atType, relatedPlaceRefOrValue._atType) &&
-        Objects.equals(this._atReferredType, relatedPlaceRefOrValue._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, name, role, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RelatedPlaceRefOrValue {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOperationalStateType.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOperationalStateType.java
deleted file mode 100644
index d2e48220ae51716ec6d494e2e01291a5e8cf2ce1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOperationalStateType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceOperationalStateType enumerations
- */
-public enum ResourceOperationalStateType {
-  ENABLE("enable"),
-    DISABLE("disable");
-
-  private String value;
-
-  ResourceOperationalStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ResourceOperationalStateType fromValue(String text) {
-    for (ResourceOperationalStateType b : ResourceOperationalStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrder.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrder.java
deleted file mode 100644
index 80e632c6cc24c4eea098b9ce4287de28859bef96..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrder.java
+++ /dev/null
@@ -1,756 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Resource Order is a request to provision a set of Resources (logical and
- * physical) triggered by the request to provision a Service through a Service
- * Order
- */
-@Schema(description = "A Resource Order is a request to provision a set of Resources (logical and physical) triggered by the request to provision a Service through a Service Order")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrder {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("category")
-	private String category = null;
-
-	private OffsetDateTime completionDate = null;
-
-	private OffsetDateTime expectedCompletionDate = null;
-
-	private OffsetDateTime requestedCompletionDate = null;
-
-	private OffsetDateTime requestedStartDate = null;
-
-	private OffsetDateTime startDate = null;
-
-
-	@JsonProperty("description")
-	private String description = null;
-
-
-	@JsonProperty("externalId")
-	private String externalId = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	private OffsetDateTime orderDate = null;
-
-	@JsonProperty("orderType")
-	private String orderType = null;
-
-	@JsonProperty("priority")
-	private Integer priority = null;
-
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("externalReference")
-	@Valid
-	private Set<ExternalId> externalReference = new HashSet<>();
-
-	@JsonProperty("note")
-	@Valid
-	private Set<Note> note = new HashSet<>();
-
-	@JsonProperty("orderItem")
-	@Valid
-	private Set<ResourceOrderItem> orderItem = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	public ResourceOrder id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Identifier of an instance of the Resource Order. Required to be unique within
-	 * the resource type. Used in URIs as the identifier for specific instances of a
-	 * type.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of an instance of the Resource Order. Required to be unique within the resource type.  Used in URIs as the identifier for specific instances of a type.")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ResourceOrder href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink to access the order
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink to access the order")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ResourceOrder category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Used to categorize the order from a business perspective that can be useful
-	 * for the OM system.
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system.")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ResourceOrder completionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-		return this;
-	}
-
-	/**
-	 * Effective delivery date amended by the provider
-	 * 
-	 * @return completionDate
-	 **/
-	@Schema(description = "Effective delivery date amended by the provider")
-
-	@Valid
-	@JsonProperty("completionDate")
-	public String getCompletionDateString() {
-		if ( this.completionDate == null) {
-			return null;
-		}
-		return this.completionDate.toString();
-	}
-	
-	public OffsetDateTime getCompletionDate() {
-		return completionDate;
-	}
-
-	public void setCompletionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-	}
-
-	
-	public void setCompletionDate(String completionDate) {
-		if (completionDate!=null) {
-			this.completionDate = OffsetDateTime.parse( completionDate );			
-		}
-	}
-
-
-	public ResourceOrder description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * free-text description of the Resource Order
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "free-text description of the Resource Order")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	
-	public ResourceOrder expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Expected delivery date amended by the provider
-	 * 
-	 * @return expectedCompletionDate
-	 **/
-	@Schema(description = "Expected delivery date amended by the provider")
-
-	@Valid
-
-	@JsonProperty("expectedCompletionDate")
-	public String getExpectedCompletionDateString() {
-
-		if ( this.expectedCompletionDate == null) {
-			return null;
-		}
-		return this.expectedCompletionDate.toString();
-	}
-	
-	public OffsetDateTime getExpectedCompletionDate() {
-		return expectedCompletionDate;
-	}
-
-	public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-	}
-	
-	public void setExpectedCompletionDate(String expectedCompletionDate) {
-		if (expectedCompletionDate!=null) {
-			this.expectedCompletionDate = OffsetDateTime.parse( expectedCompletionDate );
-			
-		}
-	}
-	
-
-	public ResourceOrder externalId(String externalId) {
-		this.externalId = externalId;
-		return this;
-	}
-
-	/**
-	 * DEPRECATED: Use externalReference Instead. ID given by the consumer (to
-	 * facilitate searches afterwards)
-	 * 
-	 * @return externalId
-	 **/
-	@Schema(description = "DEPRECATED: Use externalReference Instead. ID given by the consumer (to facilitate searches afterwards)")
-
-	public String getExternalId() {
-		return externalId;
-	}
-
-	public void setExternalId(String externalId) {
-		this.externalId = externalId;
-	}
-
-	public ResourceOrder name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A string used to give a name to the Resource Order
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A string used to give a name to the Resource Order")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	
-	public ResourceOrder orderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-		return this;
-	}
-
-	/**
-	 * Get orderDate
-	 * 
-	 * @return orderDate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	@JsonProperty("orderDate")
-	public String getOrderDateString() {
-		if ( this.orderDate == null) {
-			return null;
-		}
-		return this.orderDate.toString();
-	}
-	
-	public OffsetDateTime getOrderDate() {
-		return orderDate;
-	}
-
-	public void setOrderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-	}
-
-	public void setOrderDate(String orderDate) {
-
-		if (orderDate!=null) {
-			this.orderDate = OffsetDateTime.parse( orderDate );
-			
-		}
-	}
-
-	public ResourceOrder orderType(String orderType) {
-		this.orderType = orderType;
-		return this;
-	}
-
-	/**
-	 * Name of the Resource Order type
-	 * 
-	 * @return orderType
-	 **/
-	@Schema(description = "Name of the Resource Order type")
-
-	public String getOrderType() {
-		return orderType;
-	}
-
-	public void setOrderType(String orderType) {
-		this.orderType = orderType;
-	}
-
-	public ResourceOrder priority(Integer priority) {
-		this.priority = priority;
-		return this;
-	}
-
-	/**
-	 * A way that can be used by consumers to prioritize orders in OM system (from 0
-	 * to 4 : 0 is the highest priority, and 4 the lowest)
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-
-	public Integer getPriority() {
-		return priority;
-	}
-
-	public void setPriority(Integer priority) {
-		this.priority = priority;
-	}
-
-	public ResourceOrder requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Requested delivery date from the requestor perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestor perspective")
-
-	@Valid
-	public OffsetDateTime getRequestedCompletionDate() {
-		return requestedCompletionDate;
-	}
-
-	public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-	}
-	
-	public void setRequestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate!=null) {
-			this.requestedCompletionDate = OffsetDateTime.parse( requestedCompletionDate );
-			
-		}
-	}
-	
-	/**
-	 * Requested delivery date from the requestors perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestors perspective")
-
-	@Valid
-
-	@JsonProperty("requestedCompletionDate")
-	public String getRequestedCompletionDateString() {
-
-		if ( this.requestedCompletionDate == null) {
-			return null;
-		}
-		return this.requestedCompletionDate.toString();
-	}
-
-	/**
-	 * Order start date wished by the requestor
-	 * 
-	 * @return requestedStartDate
-	 **/
-	@Schema(description = "Order start date wished by the requestor")
-
-	@Valid
-	@JsonProperty("requestedStartDate")
-	public String getRequestedStartDateString() {
-
-		if ( this.requestedStartDate == null) {
-			return null;
-		}
-		return this.requestedStartDate.toString();
-	}
-	
-	public OffsetDateTime getRequestedStartDate() {
-		return requestedStartDate;
-	}
-
-	public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-	}
-
-	public ResourceOrder requestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-		return this;
-	}
-	
-	public void setRequestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate!=null) {
-			this.requestedStartDate = OffsetDateTime.parse( requestedStartDate );
-			
-		}
-	}
-
-	public ResourceOrder startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-	/**
-	 * Date when the order was started for processing
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the order was started for processing")
-
-	@Valid
-	@JsonProperty("startDate")
-	public String getStartDateString() {
-		if ( this.startDate == null) {
-			return null;
-		}
-		return this.startDate.toString();
-	}
-	
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-	
-	public void setStartDate(String requestedStartDate) {
-		if (requestedStartDate!=null) {
-			this.startDate = OffsetDateTime.parse( requestedStartDate );			
-		}
-	}
-
-
-	public ResourceOrder state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The life cycle state of the resource.
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The life cycle state of the resource.")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public ResourceOrder externalReference(Set<ExternalId> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public ResourceOrder addExternalReferenceItem(ExternalId externalReferenceItem) {
-		 
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ExternalId> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(Set<ExternalId> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public ResourceOrder note(Set<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ResourceOrder addNoteItem(Note noteItem) {
-		 
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Get note
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(Set<Note> note) {
-		this.note = note;
-	}
-
-	public ResourceOrder orderItem(Set<ResourceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-		return this;
-	}
-
-	public ResourceOrder addOrderItemItem(ResourceOrderItem orderItemItem) {
-
-		this.orderItem.add(orderItemItem);
-		return this;
-	}
-
-	/**
-	 * Get orderItem
-	 * 
-	 * @return orderItem
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ResourceOrderItem> getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(Set<ResourceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public ResourceOrder relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ResourceOrder addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ResourceOrder _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ResourceOrder _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ResourceOrder _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceOrder resourceOrder = (ResourceOrder) o;
-		return Objects.equals(this.id, resourceOrder.id) && Objects.equals(this.href, resourceOrder.href)
-				&& Objects.equals(this.category, resourceOrder.category)
-				&& Objects.equals(this.completionDate, resourceOrder.completionDate)
-				&& Objects.equals(this.description, resourceOrder.description)
-				&& Objects.equals(this.expectedCompletionDate, resourceOrder.expectedCompletionDate)
-				&& Objects.equals(this.externalId, resourceOrder.externalId)
-				&& Objects.equals(this.name, resourceOrder.name)
-				&& Objects.equals(this.orderDate, resourceOrder.orderDate)
-				&& Objects.equals(this.orderType, resourceOrder.orderType)
-				&& Objects.equals(this.priority, resourceOrder.priority)
-				&& Objects.equals(this.requestedCompletionDate, resourceOrder.requestedCompletionDate)
-				&& Objects.equals(this.requestedStartDate, resourceOrder.requestedStartDate)
-				&& Objects.equals(this.startDate, resourceOrder.startDate)
-				&& Objects.equals(this.state, resourceOrder.state)
-				&& Objects.equals(this.externalReference, resourceOrder.externalReference)
-				&& Objects.equals(this.note, resourceOrder.note)
-				&& Objects.equals(this.orderItem, resourceOrder.orderItem)
-				&& Objects.equals(this.relatedParty, resourceOrder.relatedParty)
-				&& Objects.equals(this._atBaseType, resourceOrder._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, resourceOrder._atSchemaLocation)
-				&& Objects.equals(this._atType, resourceOrder._atType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, category, completionDate, description, expectedCompletionDate, externalId, name,
-				orderDate, orderType, priority, requestedCompletionDate, requestedStartDate, startDate, state,
-				externalReference, note, orderItem, relatedParty, _atBaseType, _atSchemaLocation, _atType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceOrder {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-		sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-		sb.append("    orderType: ").append(toIndentedString(orderType)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-		sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEvent.java
deleted file mode 100644
index acc8d431850f225ea94e323af05785c6cd9c50e1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ResourceOrderAttributeValueChangeEventPayload event = null;
-
-  public ResourceOrderAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ResourceOrderAttributeValueChangeEvent event(ResourceOrderAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceOrderAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderAttributeValueChangeEvent resourceOrderAttributeValueChangeEvent = (ResourceOrderAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, resourceOrderAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceOrderAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceOrderAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceOrderAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceOrderAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, resourceOrderAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, resourceOrderAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, resourceOrderAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceOrderAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, resourceOrderAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, resourceOrderAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEventPayload.java
deleted file mode 100644
index b8c5340e51dd68373e68cf42f51ede52e703577f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderAttributeValueChangeEventPayload   {
-  @JsonProperty("resourceOrder")
-  private ResourceOrder resourceOrder = null;
-
-  public ResourceOrderAttributeValueChangeEventPayload resourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrder getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderAttributeValueChangeEventPayload resourceOrderAttributeValueChangeEventPayload = (ResourceOrderAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.resourceOrder, resourceOrderAttributeValueChangeEventPayload.resourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreate.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreate.java
deleted file mode 100644
index 2849a43925dc4b880cd39a86dfdd6d4b72643b49..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreate.java
+++ /dev/null
@@ -1,664 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Resource Order is a request to provision a set of Resources (logical and
- * physical) triggered by the request to provision a Service through a Service
- * Order Skipped properties: id,href
- */
-@Schema(description = "A Resource Order is a request to provision a set of Resources (logical and physical) triggered by the request to provision a Service through a Service Order Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderCreate {
-	@JsonProperty("category")
-	private String category = null;
-
-	@JsonProperty("completionDate")
-	private OffsetDateTime completionDate = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("expectedCompletionDate")
-	private OffsetDateTime expectedCompletionDate = null;
-
-	@JsonProperty("externalId")
-	private String externalId = null;
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("orderDate")
-	private OffsetDateTime orderDate = null;
-
-	@JsonProperty("orderType")
-	private String orderType = null;
-
-	@JsonProperty("priority")
-	private Integer priority = null;
-
-	private OffsetDateTime requestedCompletionDate = null;
-
-	private OffsetDateTime requestedStartDate = null;
-
-	@JsonProperty("startDate")
-	private OffsetDateTime startDate = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("externalReference")
-	@Valid
-	private List<ExternalId> externalReference = null;
-
-	@JsonProperty("note")
-	@Valid
-	private List<Note> note = null;
-
-	@JsonProperty("orderItem")
-	@Valid
-	private List<ResourceOrderItem> orderItem = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	public ResourceOrderCreate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Used to categorize the order from a business perspective that can be useful
-	 * for the OM system.
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system.")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ResourceOrderCreate completionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-		return this;
-	}
-
-	/**
-	 * Date when the order was completed
-	 * 
-	 * @return completionDate
-	 **/
-	@Schema(description = "Date when the order was completed")
-
-	@Valid
-	public OffsetDateTime getCompletionDate() {
-		return completionDate;
-	}
-
-	public void setCompletionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-	}
-
-	public ResourceOrderCreate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * free-text description of the Resource Order
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "free-text description of the Resource Order")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourceOrderCreate expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Date when the order was completed
-	 * 
-	 * @return expectedCompletionDate
-	 **/
-	@Schema(description = "Date when the order was completed")
-
-	@Valid
-	public OffsetDateTime getExpectedCompletionDate() {
-		return expectedCompletionDate;
-	}
-
-	public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-	}
-
-	public ResourceOrderCreate externalId(String externalId) {
-		this.externalId = externalId;
-		return this;
-	}
-
-	/**
-	 * DEPRECATED: Use externalReference Instead. ID given by the consumer (to
-	 * facilitate searches afterwards)
-	 * 
-	 * @return externalId
-	 **/
-	@Schema(description = "DEPRECATED: Use externalReference Instead. ID given by the consumer (to facilitate searches afterwards)")
-
-	public String getExternalId() {
-		return externalId;
-	}
-
-	public void setExternalId(String externalId) {
-		this.externalId = externalId;
-	}
-
-	public ResourceOrderCreate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A string used to give a name to the Resource Order
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A string used to give a name to the Resource Order")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ResourceOrderCreate orderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-		return this;
-	}
-
-	/**
-	 * Date when the order was created
-	 * 
-	 * @return orderDate
-	 **/
-	@Schema(description = "Date when the order was created")
-
-	@Valid
-	public OffsetDateTime getOrderDate() {
-		return orderDate;
-	}
-
-	public void setOrderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-	}
-
-	public ResourceOrderCreate orderType(String orderType) {
-		this.orderType = orderType;
-		return this;
-	}
-
-	/**
-	 * Name of the Resource Order type
-	 * 
-	 * @return orderType
-	 **/
-	@Schema(description = "Name of the Resource Order type")
-
-	public String getOrderType() {
-		return orderType;
-	}
-
-	public void setOrderType(String orderType) {
-		this.orderType = orderType;
-	}
-
-	public ResourceOrderCreate priority(Integer priority) {
-		this.priority = priority;
-		return this;
-	}
-
-	/**
-	 * A way that can be used by consumers to prioritize orders in OM system (from 0
-	 * to 4 : 0 is the highest priority, and 4 the lowest)
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-
-	public Integer getPriority() {
-		return priority;
-	}
-
-	public void setPriority(Integer priority) {
-		this.priority = priority;
-	}
-
-	public ResourceOrderCreate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-		return this;
-	}
-	
-	public ResourceOrderCreate requestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate!=null) {
-			this.requestedCompletionDate = OffsetDateTime.parse( requestedCompletionDate );
-			
-		}
-		return this;
-	}
-
-	/**
-	 * Requested delivery date from the requestor perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestor perspective")
-
-	@Valid
-	public OffsetDateTime getRequestedCompletionDate() {
-		return requestedCompletionDate;
-	}
-
-
-	@JsonProperty("requestedCompletionDate")
-	public String getRequestedCompletionDateStr() {
-		if ( requestedCompletionDate != null) {
-			return requestedCompletionDate.toString();	
-		} else {
-			return null;
-		}
-	}
-	
-	
-	public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-	}
-
-
-	
-	public void setRequestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate!=null) {
-			this.requestedCompletionDate = OffsetDateTime.parse( requestedCompletionDate );
-			
-		}
-	}
-
-	public ResourceOrderCreate requestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-		return this;
-	}
-
-	public ResourceOrderCreate requestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate!=null) {
-			this.requestedStartDate = OffsetDateTime.parse( requestedStartDate );
-			
-		}
-		return this;
-	}
-
-	
-	/**
-	 * Order start date wished by the requestor
-	 * 
-	 * @return requestedStartDate
-	 **/
-	@Schema(description = "Order start date wished by the requestor")
-
-	@Valid
-	public OffsetDateTime getRequestedStartDate() {
-		return requestedStartDate;
-	}
-	
-	@JsonProperty("requestedStartDate")
-	public String getRequestedStartDateStr() {
-
-		if ( requestedStartDate != null) {
-			return requestedStartDate.toString();	
-		}
-		
-		return null;
-	}
-
-	public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-	}
-	
-
-	public void setRequestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate!=null) {
-			this.requestedStartDate = OffsetDateTime.parse( requestedStartDate );
-			
-		}
-	}
-
-	public ResourceOrderCreate startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-
-	/**
-	 * Date when the order was actually started
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the order was actually started")
-
-	@Valid
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-
-	public ResourceOrderCreate state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The life cycle state of the resource.
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The life cycle state of the resource.")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public ResourceOrderCreate externalReference(List<ExternalId> externalReference) {
-		this.externalReference = externalReference;
-		return this;
-	}
-
-	public ResourceOrderCreate addExternalReferenceItem(ExternalId externalReferenceItem) {
-		if (this.externalReference == null) {
-			this.externalReference = new ArrayList<>();
-		}
-		this.externalReference.add(externalReferenceItem);
-		return this;
-	}
-
-	/**
-	 * Get externalReference
-	 * 
-	 * @return externalReference
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<ExternalId> getExternalReference() {
-		return externalReference;
-	}
-
-	public void setExternalReference(List<ExternalId> externalReference) {
-		this.externalReference = externalReference;
-	}
-
-	public ResourceOrderCreate note(List<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ResourceOrderCreate addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new ArrayList<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Get note
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(List<Note> note) {
-		this.note = note;
-	}
-
-	public ResourceOrderCreate orderItem(List<ResourceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-		return this;
-	}
-
-	public ResourceOrderCreate addOrderItemItem(ResourceOrderItem orderItemItem) {
-		if (this.orderItem == null) {
-			this.orderItem = new ArrayList<>();
-		}
-		this.orderItem.add(orderItemItem);
-		return this;
-	}
-
-	/**
-	 * Get orderItem
-	 * 
-	 * @return orderItem
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<ResourceOrderItem> getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(List<ResourceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public ResourceOrderCreate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ResourceOrderCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ResourceOrderCreate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ResourceOrderCreate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ResourceOrderCreate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceOrderCreate resourceOrderCreate = (ResourceOrderCreate) o;
-		return Objects.equals(this.category, resourceOrderCreate.category)
-				&& Objects.equals(this.completionDate, resourceOrderCreate.completionDate)
-				&& Objects.equals(this.description, resourceOrderCreate.description)
-				&& Objects.equals(this.expectedCompletionDate, resourceOrderCreate.expectedCompletionDate)
-				&& Objects.equals(this.externalId, resourceOrderCreate.externalId)
-				&& Objects.equals(this.name, resourceOrderCreate.name)
-				&& Objects.equals(this.orderDate, resourceOrderCreate.orderDate)
-				&& Objects.equals(this.orderType, resourceOrderCreate.orderType)
-				&& Objects.equals(this.priority, resourceOrderCreate.priority)
-				&& Objects.equals(this.requestedCompletionDate, resourceOrderCreate.requestedCompletionDate)
-				&& Objects.equals(this.requestedStartDate, resourceOrderCreate.requestedStartDate)
-				&& Objects.equals(this.startDate, resourceOrderCreate.startDate)
-				&& Objects.equals(this.state, resourceOrderCreate.state)
-				&& Objects.equals(this.externalReference, resourceOrderCreate.externalReference)
-				&& Objects.equals(this.note, resourceOrderCreate.note)
-				&& Objects.equals(this.orderItem, resourceOrderCreate.orderItem)
-				&& Objects.equals(this.relatedParty, resourceOrderCreate.relatedParty)
-				&& Objects.equals(this._atBaseType, resourceOrderCreate._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, resourceOrderCreate._atSchemaLocation)
-				&& Objects.equals(this._atType, resourceOrderCreate._atType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(category, completionDate, description, expectedCompletionDate, externalId, name, orderDate,
-				orderType, priority, requestedCompletionDate, requestedStartDate, startDate, state, externalReference,
-				note, orderItem, relatedParty, _atBaseType, _atSchemaLocation, _atType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceOrderCreate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-		sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-		sb.append("    orderType: ").append(toIndentedString(orderType)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-		sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEvent.java
deleted file mode 100644
index fd501cff2a6cf0b619df0aae58c83496c11b8421..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEvent.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderCreateEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceOrderCreateEventPayload event = null;
-
-  public ResourceOrderCreateEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceOrderCreateEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceOrderCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceOrderCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceOrderCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceOrderCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceOrderCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceOrderCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceOrderCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceOrderCreateEvent event(ResourceOrderCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceOrderCreateEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderCreateEvent resourceOrderCreateEvent = (ResourceOrderCreateEvent) o;
-    return Objects.equals(this.id, resourceOrderCreateEvent.id) &&
-        Objects.equals(this.href, resourceOrderCreateEvent.href) &&
-        Objects.equals(this.eventId, resourceOrderCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceOrderCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceOrderCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceOrderCreateEvent.correlationId) &&
-        Objects.equals(this.domain, resourceOrderCreateEvent.domain) &&
-        Objects.equals(this.title, resourceOrderCreateEvent.title) &&
-        Objects.equals(this.description, resourceOrderCreateEvent.description) &&
-        Objects.equals(this.priority, resourceOrderCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceOrderCreateEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceOrderCreateEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderCreateEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEventPayload.java
deleted file mode 100644
index c7ff262e083de73f4d1fe6a8b1def323c1d3d1a0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderCreateEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderCreateEventPayload   {
-  @JsonProperty("resourceOrder")
-  private ResourceOrder resourceOrder = null;
-
-  public ResourceOrderCreateEventPayload resourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrder getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderCreateEventPayload resourceOrderCreateEventPayload = (ResourceOrderCreateEventPayload) o;
-    return Objects.equals(this.resourceOrder, resourceOrderCreateEventPayload.resourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderCreateEventPayload {\n");
-    
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEvent.java
deleted file mode 100644
index a9af7ee627a05896636cc3da9ff5347760853282..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEvent.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderDeleteEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceOrderDeleteEventPayload event = null;
-
-  public ResourceOrderDeleteEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceOrderDeleteEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceOrderDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceOrderDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceOrderDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceOrderDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceOrderDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceOrderDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceOrderDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceOrderDeleteEvent event(ResourceOrderDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceOrderDeleteEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderDeleteEvent resourceOrderDeleteEvent = (ResourceOrderDeleteEvent) o;
-    return Objects.equals(this.id, resourceOrderDeleteEvent.id) &&
-        Objects.equals(this.href, resourceOrderDeleteEvent.href) &&
-        Objects.equals(this.eventId, resourceOrderDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceOrderDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceOrderDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceOrderDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, resourceOrderDeleteEvent.domain) &&
-        Objects.equals(this.title, resourceOrderDeleteEvent.title) &&
-        Objects.equals(this.description, resourceOrderDeleteEvent.description) &&
-        Objects.equals(this.priority, resourceOrderDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceOrderDeleteEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceOrderDeleteEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderDeleteEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEventPayload.java
deleted file mode 100644
index 839e4b9b826b7db511117f92bb8c74b0d8eed742..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderDeleteEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderDeleteEventPayload   {
-  @JsonProperty("resourceOrder")
-  private ResourceOrder resourceOrder = null;
-
-  public ResourceOrderDeleteEventPayload resourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrder getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderDeleteEventPayload resourceOrderDeleteEventPayload = (ResourceOrderDeleteEventPayload) o;
-    return Objects.equals(this.resourceOrder, resourceOrderDeleteEventPayload.resourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderDeleteEventPayload {\n");
-    
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEvent.java
deleted file mode 100644
index ae07f106de3d9be79c8c1d8c2a04c591c04a761f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEvent.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderInformationRequiredEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ResourceOrderInformationRequiredEventPayload event = null;
-
-  public ResourceOrderInformationRequiredEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceOrderInformationRequiredEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceOrderInformationRequiredEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceOrderInformationRequiredEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceOrderInformationRequiredEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceOrderInformationRequiredEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceOrderInformationRequiredEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderInformationRequiredEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderInformationRequiredEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceOrderInformationRequiredEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ResourceOrderInformationRequiredEvent event(ResourceOrderInformationRequiredEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderInformationRequiredEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceOrderInformationRequiredEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderInformationRequiredEvent resourceOrderInformationRequiredEvent = (ResourceOrderInformationRequiredEvent) o;
-    return Objects.equals(this.eventId, resourceOrderInformationRequiredEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceOrderInformationRequiredEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceOrderInformationRequiredEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceOrderInformationRequiredEvent.correlationId) &&
-        Objects.equals(this.domain, resourceOrderInformationRequiredEvent.domain) &&
-        Objects.equals(this.title, resourceOrderInformationRequiredEvent.title) &&
-        Objects.equals(this.description, resourceOrderInformationRequiredEvent.description) &&
-        Objects.equals(this.priority, resourceOrderInformationRequiredEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceOrderInformationRequiredEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, resourceOrderInformationRequiredEvent.fieldPath) &&
-        Objects.equals(this.event, resourceOrderInformationRequiredEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderInformationRequiredEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEventPayload.java
deleted file mode 100644
index 2f46a9636942a9a7daa346fa9eeb57ead3e0c43f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderInformationRequiredEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderInformationRequiredEventPayload   {
-  @JsonProperty("resourceOrder")
-  private ResourceOrder resourceOrder = null;
-
-  public ResourceOrderInformationRequiredEventPayload resourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrder getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderInformationRequiredEventPayload resourceOrderInformationRequiredEventPayload = (ResourceOrderInformationRequiredEventPayload) o;
-    return Objects.equals(this.resourceOrder, resourceOrderInformationRequiredEventPayload.resourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderInformationRequiredEventPayload {\n");
-    
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItem.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItem.java
deleted file mode 100644
index 61fc8abf0103acf3addcdb23d3c5f31abcf023a0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItem.java
+++ /dev/null
@@ -1,333 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.etsi.osl.tmf.ri639.model.ResourceRefOrValue;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * An identified part of the order. A resource order is decomposed into one or more order items.
- */
-@Schema(description = "An identified part of the order. A resource order is decomposed into one or more order items.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderItem   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("action")
-  private String action = null;
-
-  @JsonProperty("quantity")
-  private Integer quantity = null;
-
-  @JsonProperty("state")
-  private ResourceOrderStateType state = null;
-
-  @JsonProperty("appointment")
-  private AppointmentRef appointment = null;
-
-  @JsonProperty("orderItemRelationship")
-  @Valid
-  private List<ResourceOrderItemRelationship> orderItemRelationship = null;
-
-  @JsonProperty("resource")
-  private ResourceRefOrValue resource = null;
-
-  @JsonProperty("resourceSpecification")
-  private ResourceSpecificationRef resourceSpecification = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ResourceOrderItem id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the line item (generally it is a sequence number 01, 02, 03, ...)
-   * @return id
-  **/
-  @Schema(description = "Identifier of the line item (generally it is a sequence number 01, 02, 03, ...)")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceOrderItem action(String action) {
-    this.action = action;
-    return this;
-  }
-
-  /**
-   * Can be \"add\" / \"modify\" / \"no_change\"/ \"delete\"
-   * @return action
-  **/
-  @Schema(description = "Can be \"add\" / \"modify\" / \"no_change\"/ \"delete\"")
-  
-    public String getAction() {
-    return action;
-  }
-
-  public void setAction(String action) {
-    this.action = action;
-  }
-
-  public ResourceOrderItem quantity(Integer quantity) {
-    this.quantity = quantity;
-    return this;
-  }
-
-  /**
-   * Quantity ordered
-   * @return quantity
-  **/
-  @Schema(description = "Quantity ordered")
-  
-    public Integer getQuantity() {
-    return quantity;
-  }
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  public ResourceOrderItem state(ResourceOrderStateType state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * State of the order item : described in the state machine diagram
-   * @return state
-  **/
-  @Schema(description = "State of the order item : described in the state machine diagram")
-  
-    public ResourceOrderStateType getState() {
-    return state;
-  }
-
-  public void setState(ResourceOrderStateType state) {
-    this.state = state;
-  }
-
-  public ResourceOrderItem appointment(AppointmentRef appointment) {
-    this.appointment = appointment;
-    return this;
-  }
-
-  /**
-   * Get appointment
-   * @return appointment
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public AppointmentRef getAppointment() {
-    return appointment;
-  }
-
-  public void setAppointment(AppointmentRef appointment) {
-    this.appointment = appointment;
-  }
-
-  public ResourceOrderItem orderItemRelationship(List<ResourceOrderItemRelationship> orderItemRelationship) {
-    this.orderItemRelationship = orderItemRelationship;
-    return this;
-  }
-
-  public ResourceOrderItem addOrderItemRelationshipItem(ResourceOrderItemRelationship orderItemRelationshipItem) {
-    if (this.orderItemRelationship == null) {
-      this.orderItemRelationship = new ArrayList<>();
-    }
-    this.orderItemRelationship.add(orderItemRelationshipItem);
-    return this;
-  }
-
-  /**
-   * Get orderItemRelationship
-   * @return orderItemRelationship
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ResourceOrderItemRelationship> getOrderItemRelationship() {
-    return orderItemRelationship;
-  }
-
-  public void setOrderItemRelationship(List<ResourceOrderItemRelationship> orderItemRelationship) {
-    this.orderItemRelationship = orderItemRelationship;
-  }
-
-  public ResourceOrderItem resource( ResourceRefOrValue resource) {
-    this.resource = resource;
-    return this;
-  }
-
-  /**
-   * Get resource
-   * @return resource
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceRefOrValue getResource() {
-    return resource;
-  }
-
-  public void setResourceRefOrValue( ResourceRefOrValue resource) {
-    this.resource = resource;
-  }
-
-  public ResourceOrderItem resourceSpecification(ResourceSpecificationRef resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-    return this;
-  }
-
-  /**
-   * Get resourceSpecification
-   * @return resourceSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceSpecificationRef getResourceSpecification() {
-    return resourceSpecification;
-  }
-
-  public void setResourceSpecification(ResourceSpecificationRef resourceSpecification) {
-    this.resourceSpecification = resourceSpecification;
-  }
-
-  public ResourceOrderItem _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceOrderItem _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceOrderItem _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderItem resourceOrderItem = (ResourceOrderItem) o;
-    return Objects.equals(this.id, resourceOrderItem.id) &&
-        Objects.equals(this.action, resourceOrderItem.action) &&
-        Objects.equals(this.quantity, resourceOrderItem.quantity) &&
-        Objects.equals(this.state, resourceOrderItem.state) &&
-        Objects.equals(this.appointment, resourceOrderItem.appointment) &&
-        Objects.equals(this.orderItemRelationship, resourceOrderItem.orderItemRelationship) &&
-        Objects.equals(this.resource, resourceOrderItem.resource) &&
-        Objects.equals(this.resourceSpecification, resourceOrderItem.resourceSpecification) &&
-        Objects.equals(this._atBaseType, resourceOrderItem._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceOrderItem._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceOrderItem._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, action, quantity, state, appointment, orderItemRelationship, resource, resourceSpecification, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderItem {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    action: ").append(toIndentedString(action)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    appointment: ").append(toIndentedString(appointment)).append("\n");
-    sb.append("    orderItemRelationship: ").append(toIndentedString(orderItemRelationship)).append("\n");
-    sb.append("    resource: ").append(toIndentedString(resource)).append("\n");
-    sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRef.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRef.java
deleted file mode 100644
index 1f72b05dcf76274d33180af26ba052d6dec3a4f2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRef.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * ResourceOrderItemRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderItemRef   {
-  @JsonProperty("itemId")
-  private String itemId = null;
-
-  @JsonProperty("resourceOrderHref")
-  private String resourceOrderHref = null;
-
-  @JsonProperty("resourceOrderId")
-  private String resourceOrderId = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ResourceOrderItemRef itemId(String itemId) {
-    this.itemId = itemId;
-    return this;
-  }
-
-  /**
-   * Identifier of the line item
-   * @return itemId
-  **/
-  @Schema(description = "Identifier of the line item")
-  
-    public String getItemId() {
-    return itemId;
-  }
-
-  public void setItemId(String itemId) {
-    this.itemId = itemId;
-  }
-
-  public ResourceOrderItemRef resourceOrderHref(String resourceOrderHref) {
-    this.resourceOrderHref = resourceOrderHref;
-    return this;
-  }
-
-  /**
-   * Link to the order to which this item belongs to
-   * @return resourceOrderHref
-  **/
-  @Schema(description = "Link to the order to which this item belongs to")
-  
-    public String getResourceOrderHref() {
-    return resourceOrderHref;
-  }
-
-  public void setResourceOrderHref(String resourceOrderHref) {
-    this.resourceOrderHref = resourceOrderHref;
-  }
-
-  public ResourceOrderItemRef resourceOrderId(String resourceOrderId) {
-    this.resourceOrderId = resourceOrderId;
-    return this;
-  }
-
-  /**
-   * Identifier of the order that this item belongs to
-   * @return resourceOrderId
-  **/
-  @Schema(description = "Identifier of the order that this item belongs to")
-  
-    public String getResourceOrderId() {
-    return resourceOrderId;
-  }
-
-  public void setResourceOrderId(String resourceOrderId) {
-    this.resourceOrderId = resourceOrderId;
-  }
-
-  public ResourceOrderItemRef _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceOrderItemRef _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceOrderItemRef _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public ResourceOrderItemRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderItemRef resourceOrderItemRef = (ResourceOrderItemRef) o;
-    return Objects.equals(this.itemId, resourceOrderItemRef.itemId) &&
-        Objects.equals(this.resourceOrderHref, resourceOrderItemRef.resourceOrderHref) &&
-        Objects.equals(this.resourceOrderId, resourceOrderItemRef.resourceOrderId) &&
-        Objects.equals(this._atBaseType, resourceOrderItemRef._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceOrderItemRef._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceOrderItemRef._atType) &&
-        Objects.equals(this._atReferredType, resourceOrderItemRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(itemId, resourceOrderHref, resourceOrderId, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderItemRef {\n");
-    
-    sb.append("    itemId: ").append(toIndentedString(itemId)).append("\n");
-    sb.append("    resourceOrderHref: ").append(toIndentedString(resourceOrderHref)).append("\n");
-    sb.append("    resourceOrderId: ").append(toIndentedString(resourceOrderId)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRelationship.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRelationship.java
deleted file mode 100644
index aa4a498016405a75038e50faf085ac019a275384..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderItemRelationship.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ResourceOrderItemRelationship
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderItemRelationship   {
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("orderItem")
-  private ResourceOrderItemRef orderItem = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ResourceOrderItemRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of the order item relationship
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of the order item relationship")
-  
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public ResourceOrderItemRelationship orderItem(ResourceOrderItemRef orderItem) {
-    this.orderItem = orderItem;
-    return this;
-  }
-
-  /**
-   * Get orderItem
-   * @return orderItem
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderItemRef getOrderItem() {
-    return orderItem;
-  }
-
-  public void setOrderItem(ResourceOrderItemRef orderItem) {
-    this.orderItem = orderItem;
-  }
-
-  public ResourceOrderItemRelationship _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceOrderItemRelationship _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceOrderItemRelationship _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderItemRelationship resourceOrderItemRelationship = (ResourceOrderItemRelationship) o;
-    return Objects.equals(this.relationshipType, resourceOrderItemRelationship.relationshipType) &&
-        Objects.equals(this.orderItem, resourceOrderItemRelationship.orderItem) &&
-        Objects.equals(this._atBaseType, resourceOrderItemRelationship._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceOrderItemRelationship._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceOrderItemRelationship._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(relationshipType, orderItem, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderItemRelationship {\n");
-    
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderRef.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderRef.java
deleted file mode 100644
index 466a971d75d216233c5276949578455643bbca76..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderRef.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ResourceOrderRef
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderRef   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ResourceOrderRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The unique identifier of the related resource order
-   * @return id
-  **/
-  @Schema(description = "The unique identifier of the related resource order")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceOrderRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink to access the related Resource Order
-   * @return href
-  **/
-  @Schema(description = "Hyperlink to access the related Resource Order")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceOrderRef _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceOrderRef _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceOrderRef _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public ResourceOrderRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderRef resourceOrderRef = (ResourceOrderRef) o;
-    return Objects.equals(this.id, resourceOrderRef.id) &&
-        Objects.equals(this.href, resourceOrderRef.href) &&
-        Objects.equals(this._atBaseType, resourceOrderRef._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceOrderRef._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceOrderRef._atType) &&
-        Objects.equals(this._atReferredType, resourceOrderRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, _atBaseType, _atSchemaLocation, _atType, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEvent.java
deleted file mode 100644
index 30fa86f443e7d94bc41cf3a36d4400e1a654f86b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEvent.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderStateChangeEvent   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("event")
-  private ResourceOrderStateChangeEventPayload event = null;
-
-  public ResourceOrderStateChangeEvent id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the Process flow
-   * @return id
-  **/
-  @Schema(description = "Identifier of the Process flow")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ResourceOrderStateChangeEvent href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the ProcessFlow
-   * @return href
-  **/
-  @Schema(description = "Reference of the ProcessFlow")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ResourceOrderStateChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ResourceOrderStateChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ResourceOrderStateChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ResourceOrderStateChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ResourceOrderStateChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ResourceOrderStateChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ResourceOrderStateChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderStateChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderStateChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ResourceOrderStateChangeEvent event(ResourceOrderStateChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrderStateChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ResourceOrderStateChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderStateChangeEvent resourceOrderStateChangeEvent = (ResourceOrderStateChangeEvent) o;
-    return Objects.equals(this.id, resourceOrderStateChangeEvent.id) &&
-        Objects.equals(this.href, resourceOrderStateChangeEvent.href) &&
-        Objects.equals(this.eventId, resourceOrderStateChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, resourceOrderStateChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, resourceOrderStateChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, resourceOrderStateChangeEvent.correlationId) &&
-        Objects.equals(this.domain, resourceOrderStateChangeEvent.domain) &&
-        Objects.equals(this.title, resourceOrderStateChangeEvent.title) &&
-        Objects.equals(this.description, resourceOrderStateChangeEvent.description) &&
-        Objects.equals(this.priority, resourceOrderStateChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, resourceOrderStateChangeEvent.timeOcurred) &&
-        Objects.equals(this.event, resourceOrderStateChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderStateChangeEvent {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEventPayload.java
deleted file mode 100644
index 4c6024d4510cae1a7c3f94c5458814defcb9c6f1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateChangeEventPayload.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderStateChangeEventPayload   {
-  @JsonProperty("resourceOrder")
-  private ResourceOrder resourceOrder = null;
-
-  public ResourceOrderStateChangeEventPayload resourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-    return this;
-  }
-
-  /**
-   * Get resourceOrder
-   * @return resourceOrder
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ResourceOrder getResourceOrder() {
-    return resourceOrder;
-  }
-
-  public void setResourceOrder(ResourceOrder resourceOrder) {
-    this.resourceOrder = resourceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderStateChangeEventPayload resourceOrderStateChangeEventPayload = (ResourceOrderStateChangeEventPayload) o;
-    return Objects.equals(this.resourceOrder, resourceOrderStateChangeEventPayload.resourceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(resourceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderStateChangeEventPayload {\n");
-    
-    sb.append("    resourceOrder: ").append(toIndentedString(resourceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateType.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateType.java
deleted file mode 100644
index 54c7000797512eab744430662599a220f5bb9d22..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderStateType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.ro652.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of the order
- */
-public enum ResourceOrderStateType {
-	
-	INITIAL("INITIAL"),
-
-	ACKNOWLEDGED("ACKNOWLEDGED"),
-
-	REJECTED("REJECTED"),
-
-	PENDING("PENDING"),
-
-	HELD("HELD"),
-
-	INPROGRESS("INPROGRESS"),
-
-	CANCELLED("CANCELLED"),
-
-	COMPLETED("COMPLETED"),
-
-	FAILED("FAILED"),
-
-	PARTIAL("PARTIAL");
-
-	private String value;
-
-	ResourceOrderStateType(String value) {
-		this.value = value;
-	}
-
-	@Override
-	@JsonValue
-	public String toString() {
-		return String.valueOf(value);
-	}
-
-	@JsonCreator
-	public static ResourceOrderStateType fromValue(String text) {
-		for (ResourceOrderStateType b : ResourceOrderStateType.values()) {
-			if (String.valueOf(b.value).equals(text)) {
-				return b;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderUpdate.java b/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderUpdate.java
deleted file mode 100644
index a6a99bc210a356883c5e6dca9a9b03638641f482..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/ResourceOrderUpdate.java
+++ /dev/null
@@ -1,530 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Resource Order is a request to provision a set of Resources (logical and physical) triggered by the request to provision a Service through a Service Order Skipped properties: id,href,completionDate,orderDate
- */
-@Schema(description = "A Resource Order is a request to provision a set of Resources (logical and physical) triggered by the request to provision a Service through a Service Order Skipped properties: id,href,completionDate,orderDate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-09-28T23:39:08.914219800+03:00[Europe/Athens]")
-public class ResourceOrderUpdate   {
-  @JsonProperty("category")
-  private String category = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("expectedCompletionDate")
-  private OffsetDateTime expectedCompletionDate = null;
-
-  @JsonProperty("externalId")
-  private String externalId = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("orderType")
-  private String orderType = null;
-
-  @JsonProperty("priority")
-  private Integer priority = null;
-
-  @JsonProperty("requestedCompletionDate")
-  private OffsetDateTime requestedCompletionDate = null;
-
-  @JsonProperty("requestedStartDate")
-  private OffsetDateTime requestedStartDate = null;
-
-  @JsonProperty("startDate")
-  private OffsetDateTime startDate = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("externalReference")
-  @Valid
-  private List<ExternalId> externalReference = null;
-
-  @JsonProperty("note")
-  @Valid
-  private List<Note> note = null;
-
-  @JsonProperty("orderItem")
-  @Valid
-  private List<ResourceOrderItem> orderItem = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  private List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  public ResourceOrderUpdate category(String category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * Used to categorize the order from a business perspective that can be useful for the OM system.
-   * @return category
-  **/
-  @Schema(description = "Used to categorize the order from a business perspective that can be useful for the OM system.")
-  
-    public String getCategory() {
-    return category;
-  }
-
-  public void setCategory(String category) {
-    this.category = category;
-  }
-
-  public ResourceOrderUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * free-text description of the Resource Order
-   * @return description
-  **/
-  @Schema(description = "free-text description of the Resource Order")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ResourceOrderUpdate expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Date when the order was completed
-   * @return expectedCompletionDate
-  **/
-  @Schema(description = "Date when the order was completed")
-  
-    @Valid
-    public OffsetDateTime getExpectedCompletionDate() {
-    return expectedCompletionDate;
-  }
-
-  public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-    this.expectedCompletionDate = expectedCompletionDate;
-  }
-
-  public ResourceOrderUpdate externalId(String externalId) {
-    this.externalId = externalId;
-    return this;
-  }
-
-  /**
-   * DEPRECATED: Use externalReference Instead. ID given by the consumer (to facilitate searches afterwards)
-   * @return externalId
-  **/
-  @Schema(description = "DEPRECATED: Use externalReference Instead. ID given by the consumer (to facilitate searches afterwards)")
-  
-    public String getExternalId() {
-    return externalId;
-  }
-
-  public void setExternalId(String externalId) {
-    this.externalId = externalId;
-  }
-
-  public ResourceOrderUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A string used to give a name to the Resource Order
-   * @return name
-  **/
-  @Schema(description = "A string used to give a name to the Resource Order")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ResourceOrderUpdate orderType(String orderType) {
-    this.orderType = orderType;
-    return this;
-  }
-
-  /**
-   * Name of the Resource Order type
-   * @return orderType
-  **/
-  @Schema(description = "Name of the Resource Order type")
-  
-    public String getOrderType() {
-    return orderType;
-  }
-
-  public void setOrderType(String orderType) {
-    this.orderType = orderType;
-  }
-
-  public ResourceOrderUpdate priority(Integer priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)
-   * @return priority
-  **/
-  @Schema(description = "A way that can be used by consumers to prioritize orders in OM system (from 0 to 4 : 0 is the highest priority, and 4 the lowest)")
-  
-    public Integer getPriority() {
-    return priority;
-  }
-
-  public void setPriority(Integer priority) {
-    this.priority = priority;
-  }
-
-  public ResourceOrderUpdate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-    return this;
-  }
-
-  /**
-   * Requested delivery date from the requestor perspective
-   * @return requestedCompletionDate
-  **/
-  @Schema(description = "Requested delivery date from the requestor perspective")
-  
-    @Valid
-    public OffsetDateTime getRequestedCompletionDate() {
-    return requestedCompletionDate;
-  }
-
-  public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-    this.requestedCompletionDate = requestedCompletionDate;
-  }
-
-  public ResourceOrderUpdate requestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-    return this;
-  }
-
-  /**
-   * Order start date wished by the requestor
-   * @return requestedStartDate
-  **/
-  @Schema(description = "Order start date wished by the requestor")
-  
-    @Valid
-    public OffsetDateTime getRequestedStartDate() {
-    return requestedStartDate;
-  }
-
-  public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-    this.requestedStartDate = requestedStartDate;
-  }
-
-  public ResourceOrderUpdate startDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-    return this;
-  }
-
-  /**
-   * Date when the order was actually started
-   * @return startDate
-  **/
-  @Schema(description = "Date when the order was actually started")
-  
-    @Valid
-    public OffsetDateTime getStartDate() {
-    return startDate;
-  }
-
-  public void setStartDate(OffsetDateTime startDate) {
-    this.startDate = startDate;
-  }
-
-  public ResourceOrderUpdate state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * The life cycle state of the resource.
-   * @return state
-  **/
-  @Schema(description = "The life cycle state of the resource.")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public ResourceOrderUpdate externalReference(List<ExternalId> externalReference) {
-    this.externalReference = externalReference;
-    return this;
-  }
-
-  public ResourceOrderUpdate addExternalReferenceItem(ExternalId externalReferenceItem) {
-    if (this.externalReference == null) {
-      this.externalReference = new ArrayList<>();
-    }
-    this.externalReference.add(externalReferenceItem);
-    return this;
-  }
-
-  /**
-   * Get externalReference
-   * @return externalReference
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ExternalId> getExternalReference() {
-    return externalReference;
-  }
-
-  public void setExternalReference(List<ExternalId> externalReference) {
-    this.externalReference = externalReference;
-  }
-
-  public ResourceOrderUpdate note(List<Note> note) {
-    this.note = note;
-    return this;
-  }
-
-  public ResourceOrderUpdate addNoteItem(Note noteItem) {
-    if (this.note == null) {
-      this.note = new ArrayList<>();
-    }
-    this.note.add(noteItem);
-    return this;
-  }
-
-  /**
-   * Get note
-   * @return note
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<Note> getNote() {
-    return note;
-  }
-
-  public void setNote(List<Note> note) {
-    this.note = note;
-  }
-
-  public ResourceOrderUpdate orderItem(List<ResourceOrderItem> orderItem) {
-    this.orderItem = orderItem;
-    return this;
-  }
-
-  public ResourceOrderUpdate addOrderItemItem(ResourceOrderItem orderItemItem) {
-    if (this.orderItem == null) {
-      this.orderItem = new ArrayList<>();
-    }
-    this.orderItem.add(orderItemItem);
-    return this;
-  }
-
-  /**
-   * Get orderItem
-   * @return orderItem
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<ResourceOrderItem> getOrderItem() {
-    return orderItem;
-  }
-
-  public void setOrderItem(List<ResourceOrderItem> orderItem) {
-    this.orderItem = orderItem;
-  }
-
-  public ResourceOrderUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ResourceOrderUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * Get relatedParty
-   * @return relatedParty
-  **/
-  @Schema(description = "")
-      @Valid
-    public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ResourceOrderUpdate _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return _atBaseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public ResourceOrderUpdate _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public ResourceOrderUpdate _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return _atType
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ResourceOrderUpdate resourceOrderUpdate = (ResourceOrderUpdate) o;
-    return Objects.equals(this.category, resourceOrderUpdate.category) &&
-        Objects.equals(this.description, resourceOrderUpdate.description) &&
-        Objects.equals(this.expectedCompletionDate, resourceOrderUpdate.expectedCompletionDate) &&
-        Objects.equals(this.externalId, resourceOrderUpdate.externalId) &&
-        Objects.equals(this.name, resourceOrderUpdate.name) &&
-        Objects.equals(this.orderType, resourceOrderUpdate.orderType) &&
-        Objects.equals(this.priority, resourceOrderUpdate.priority) &&
-        Objects.equals(this.requestedCompletionDate, resourceOrderUpdate.requestedCompletionDate) &&
-        Objects.equals(this.requestedStartDate, resourceOrderUpdate.requestedStartDate) &&
-        Objects.equals(this.startDate, resourceOrderUpdate.startDate) &&
-        Objects.equals(this.state, resourceOrderUpdate.state) &&
-        Objects.equals(this.externalReference, resourceOrderUpdate.externalReference) &&
-        Objects.equals(this.note, resourceOrderUpdate.note) &&
-        Objects.equals(this.orderItem, resourceOrderUpdate.orderItem) &&
-        Objects.equals(this.relatedParty, resourceOrderUpdate.relatedParty) &&
-        Objects.equals(this._atBaseType, resourceOrderUpdate._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, resourceOrderUpdate._atSchemaLocation) &&
-        Objects.equals(this._atType, resourceOrderUpdate._atType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(category, description, expectedCompletionDate, externalId, name, orderType, priority, requestedCompletionDate, requestedStartDate, startDate, state, externalReference, note, orderItem, relatedParty, _atBaseType, _atSchemaLocation, _atType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ResourceOrderUpdate {\n");
-    
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-    sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    orderType: ").append(toIndentedString(orderType)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-    sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-    sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    externalReference: ").append(toIndentedString(externalReference)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/ro652/model/TaskStateType.java b/src/main/java/org/etsi/osl/tmf/ro652/model/TaskStateType.java
deleted file mode 100644
index 5535f44bb4f9eda207a96dc11f9d0eeea654b76a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/ro652/model/TaskStateType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.etsi.osl.tmf.ro652.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of a task
- */
-public enum TaskStateType {
-  ACKNOWLEDGED("acknowledged"),
-    TERMINATEDWITHERROR("terminatedWithError"),
-    INPROGRESS("inProgress"),
-    DONE("done");
-
-  private String value;
-
-  TaskStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static TaskStateType fromValue(String text) {
-    for (TaskStateType b : TaskStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ApplicableTimePeriod.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ApplicableTimePeriod.java
deleted file mode 100644
index 7a3d6c44f133fa632beeddef6a212d8b7c3b52cd..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ApplicableTimePeriod.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * The period of time for which Capacity or CapacityDemand applies.
- */
-@Schema(description = "The period of time for which Capacity or CapacityDemand applies.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-@Entity(name = "ApplcbleTPer")
-public class ApplicableTimePeriod extends BaseRootEntity {
-
-	@JsonProperty("dayOfWeek")
-	private String dayOfWeek = null;
-
-	private OffsetDateTime fromDateTime = null;
-
-	private OffsetDateTime endDateTime = null;
-
-	@JsonProperty("rangeInterval")
-	private String rangeInterval = null;
-
-	public ApplicableTimePeriod dayOfWeek(String dayOfWeek) {
-		this.dayOfWeek = dayOfWeek;
-		return this;
-	}
-
-	/**
-	 * A day or days representing when the schedule is applicable. For example 2, 3
-	 * represent Monday and Tuesday.
-	 * 
-	 * @return dayOfWeek
-	 **/
-	@Schema(description = "A day or days representing when the schedule is applicable. For example 2, 3 represent Monday and Tuesday.")
-
-	public String getDayOfWeek() {
-		return dayOfWeek;
-	}
-
-	public void setDayOfWeek(String dayOfWeek) {
-		this.dayOfWeek = dayOfWeek;
-	}
-
-	public ApplicableTimePeriod fromDateTime(OffsetDateTime fromDateTime) {
-		this.fromDateTime = fromDateTime;
-		return this;
-	}
-
-	@JsonProperty("fromDateTime")
-	public String getfromDateTimeString() {
-
-		if (this.fromDateTime == null) {
-			return null;
-		}
-		return this.fromDateTime.toString();
-	}
-
-	/**
-	 * The period of time for which the schedule is applicable. Instance values are
-	 * mutually exclusive with daysOfWeek values.
-	 * 
-	 * @return fromToDateTime
-	 **/
-	@Schema(description = "The period of time for which the schedule is applicable.  Instance values are mutually exclusive with daysOfWeek values.")
-
-	@Valid
-	public OffsetDateTime getFromDateTime() {
-		return fromDateTime;
-	}
-
-	public void setFromDateTime(OffsetDateTime fromDateTime) {
-		this.fromDateTime = fromDateTime;
-	}
-	
-	public void setFromDateTime(String fromDateTime) {
-		this.fromDateTime = OffsetDateTime.parse( fromDateTime );
-	}
-
-	public ApplicableTimePeriod endDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-		return this;
-	}
-
-	@JsonProperty("endDateTime")
-	public String getendDateTimeString() {
-
-		if (this.endDateTime == null) {
-			return null;
-		}
-		return this.endDateTime.toString();
-	}
-
-	/**
-	 * The period of time for which the schedule is applicable. Instance values are
-	 * mutually exclusive with daysOfWeek values.
-	 * 
-	 * @return fromToDateTime
-	 **/
-	@Schema(description = "The period of time for which the schedule is applicable.  Instance values are mutually exclusive with daysOfWeek values.")
-
-	@Valid
-	public OffsetDateTime getEndDateTime() {
-		return endDateTime;
-	}
-
-	public void setEndDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-	}
-	
-	public void setEndDateTime(String endDateTime) {
-		this.endDateTime = OffsetDateTime.parse( endDateTime );
-	}
-
-	public ApplicableTimePeriod rangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies the inclusion or exclusion of the from and to
-	 * DateTime attributes. Possible values are \"open\", \"closed\",
-	 * \"closedBottom\" and \"closedTop\".
-	 * 
-	 * @return rangeInterval
-	 **/
-	@Schema(description = "An indicator that specifies the inclusion or exclusion of the from and to DateTime attributes.  Possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-
-	public String getRangeInterval() {
-		return rangeInterval;
-	}
-
-	public void setRangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ApplicableTimePeriod applicableTimePeriod = (ApplicableTimePeriod) o;
-		return Objects.equals(this.getBaseType(), applicableTimePeriod.getBaseType())
-				&& Objects.equals(this.getSchemaLocation(), applicableTimePeriod.getSchemaLocation())
-				&& Objects.equals(this.getType(), applicableTimePeriod.getType())
-				&& Objects.equals(this.dayOfWeek, applicableTimePeriod.dayOfWeek)
-				&& Objects.equals(this.fromDateTime, applicableTimePeriod.fromDateTime)
-				&& Objects.equals(this.rangeInterval, applicableTimePeriod.rangeInterval);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getBaseType(), getSchemaLocation(), getType(), dayOfWeek, fromDateTime, rangeInterval);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ApplicableTimePeriod {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(getBaseType())).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(getSchemaLocation())).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(getType())).append("\n");
-		sb.append("    dayOfWeek: ").append(toIndentedString(dayOfWeek)).append("\n");
-		sb.append("    fromToDateTime: ").append(toIndentedString( fromDateTime )).append("\n");
-		sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/AppliedCapacityAmount.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/AppliedCapacityAmount.java
deleted file mode 100644
index 5d8c750a88c6a177b250d8045bdd10817ba04601..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/AppliedCapacityAmount.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * The amount of CapcityDemand applied to a CapacityAmount.
- */
-@Schema(description = "The amount of CapcityDemand applied to a CapacityAmount.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-@Entity(name = "ApplCapacityAmnt")
-public class AppliedCapacityAmount extends BaseRootEntity {
-
-	@JsonProperty("appliedDemandAmount")
-	private Integer appliedDemandAmount = null;
-
-	@JsonProperty("resourceCapacityDemand")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "appcapcityamount_resCapctDemnduuid", referencedColumnName = "uuid")
-	private ResourceCapacityDemand resourceCapacityDemand = null;
-
-	@JsonProperty("resources")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> resources = new HashSet<>();
-
-	public AppliedCapacityAmount appliedDemandAmount(Integer appliedDemandAmount) {
-		this.appliedDemandAmount = appliedDemandAmount;
-		return this;
-	}
-
-	/**
-	 * An amount of demand applied to a CapacityAmount. Note that this is a
-	 * composite attribute defined by CapacityAmount.
-	 * 
-	 * @return appliedDemandAmount
-	 **/
-	@Schema(description = "An amount of demand applied to a CapacityAmount. Note that this is a composite attribute defined by CapacityAmount.")
-
-	public Integer getAppliedDemandAmount() {
-		return appliedDemandAmount;
-	}
-
-	public void setAppliedDemandAmount(Integer appliedDemandAmount) {
-		this.appliedDemandAmount = appliedDemandAmount;
-	}
-
-	public AppliedCapacityAmount resourceCapacityDemand(ResourceCapacityDemand resourceCapacityDemand) {
-		this.resourceCapacityDemand = resourceCapacityDemand;
-		return this;
-	}
-
-	/**
-	 * Get resourceCapacityDemand
-	 * 
-	 * @return resourceCapacityDemand
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceCapacityDemand getResourceCapacityDemand() {
-		return resourceCapacityDemand;
-	}
-
-	public void setResourceCapacityDemand(ResourceCapacityDemand resourceCapacityDemand) {
-		this.resourceCapacityDemand = resourceCapacityDemand;
-	}
-
-	public AppliedCapacityAmount resource(Set<ResourceRef> resource) {
-		this.resources = resource;
-		return this;
-	}
-
-	public AppliedCapacityAmount addResourceItem(ResourceRef resourceItem) {
-		this.resources.add(resourceItem);
-		return this;
-	}
-
-	/**
-	 * Get resource
-	 * 
-	 * @return resource
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ResourceRef> getResource() {
-		return resources;
-	}
-
-	public void setResource(Set<ResourceRef> resource) {
-		this.resources = resource;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AppliedCapacityAmount appliedCapacityAmount = (AppliedCapacityAmount) o;
-		return Objects.equals(this.baseType, appliedCapacityAmount.baseType)
-				&& Objects.equals(this.getSchemaLocation(), appliedCapacityAmount.getSchemaLocation())
-				&& Objects.equals(this.getType(), appliedCapacityAmount.getType())
-				&& Objects.equals(this.appliedDemandAmount, appliedCapacityAmount.appliedDemandAmount)
-				&& Objects.equals(this.resourceCapacityDemand, appliedCapacityAmount.resourceCapacityDemand)
-				&& Objects.equals(this.resources, appliedCapacityAmount.resources);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, baseType(null), getSchemaLocation(), getType());
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AppliedCapacityAmount {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(getSchemaLocation())).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(getType())).append("\n");
-		sb.append("    appliedDemandAmount: ").append(toIndentedString(appliedDemandAmount)).append("\n");
-		sb.append("    resourceCapacityDemand: ").append(toIndentedString(resourceCapacityDemand)).append("\n");
-		sb.append("    resource: ").append(toIndentedString(resources)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheck.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheck.java
deleted file mode 100644
index bb2f5cbdab634c8a51207fdd28891ccd6badbb3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheck.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the availabilityCheck task resource for resource pool management
- */
-@Schema(description = "the availabilityCheck task resource for resource pool management")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class AvailabilityCheck {
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("resourceCapacityDemand")
-	private ResourceCapacityDemand resourceCapacityDemand = null;
-
-	@JsonProperty("availableResources")
-	private List<ResourceRef> availableResources = null;
-
-	
-	
-	
-	/**
-	 * @return the availableResources
-	 */
-	public List<ResourceRef> getAvailableResources() {
-		return availableResources;
-	}
-
-	/**
-	 * @param availableResources the availableResources to set
-	 */
-	public void setAvailableResources(List<ResourceRef> availableResources) {
-		this.availableResources = availableResources;
-	}
-
-	/**
-	 * @return the resourceCapacityDemand
-	 */
-	public ResourceCapacityDemand getResourceCapacityDemand() {
-		return resourceCapacityDemand;
-	}
-
-	/**
-	 * @param resourceCapacityDemand the resourceCapacityDemand to set
-	 */
-	public void setResourceCapacityDemand(ResourceCapacityDemand resourceCapacityDemand) {
-		this.resourceCapacityDemand = resourceCapacityDemand;
-	}
-
-	public AvailabilityCheck href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A string. Hyperlink to access the availabilityCheck task for resource pool
-	 * Management
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A string. Hyperlink to access the availabilityCheck task for resource pool Management")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public AvailabilityCheck id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * A string. Identifier of an instance of the availabilityCheck task for
-	 * resource pool Management
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "A string. Identifier of an instance of the availabilityCheck task for resource pool Management")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public AvailabilityCheck _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public AvailabilityCheck _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public AvailabilityCheck _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AvailabilityCheck availabilityCheck = (AvailabilityCheck) o;
-		return Objects.equals(this.href, availabilityCheck.href) && Objects.equals(this.id, availabilityCheck.id)
-				&& Objects.equals(this._atType, availabilityCheck._atType)
-				&& Objects.equals(this._atSchemaLocation, availabilityCheck._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, availabilityCheck._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(href, id, _atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AvailabilityCheck {\n");
-
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheckCreate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheckCreate.java
deleted file mode 100644
index 3c7c766da18f0d68be626840a38ae22b6e43a5e2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/AvailabilityCheckCreate.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the availabilityCheck task resource for resource pool management Skipped
- * properties: id,href
- */
-@Schema(description = "the availabilityCheck task resource for resource pool management Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class AvailabilityCheckCreate {
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("resourceCapacityDemand")
-	private ResourceCapacityDemand resourceCapacityDemand = null;
-
-	/**
-	 * @return the resourceCapacityDemand
-	 */
-	public ResourceCapacityDemand getResourceCapacityDemand() {
-		return resourceCapacityDemand;
-	}
-
-	/**
-	 * @param resourceCapacityDemand the resourceCapacityDemand to set
-	 */
-	public void setResourceCapacityDemand(ResourceCapacityDemand resourceCapacityDemand) {
-		this.resourceCapacityDemand = resourceCapacityDemand;
-	}
-
-	public AvailabilityCheckCreate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public AvailabilityCheckCreate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public AvailabilityCheckCreate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AvailabilityCheckCreate availabilityCheckCreate = (AvailabilityCheckCreate) o;
-		return Objects.equals(this._atType, availabilityCheckCreate._atType)
-				&& Objects.equals(this._atSchemaLocation, availabilityCheckCreate._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, availabilityCheckCreate._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AvailabilityCheckCreate {\n");
-
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/Capacity.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/Capacity.java
deleted file mode 100644
index c12d75104c949ddfe2c464372f86d65534741460..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/Capacity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.pcm620.model.PlaceRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Entity(name = "Capacity")
-public class Capacity extends BaseRootEntity {
-
-	@JsonProperty("capacityAmount")
-	private Integer capacityAmount;
-	
-	@JsonProperty("relatedParty")	
-	@OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "capacity_relParuuid", referencedColumnName = "uuid")
-	private RelatedParty relatedParty;
-	
-	
-	@JsonProperty("place")
-	@OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "capacity_placeuuid", referencedColumnName = "uuid")
-	private PlaceRef place;
-	
-//	@JsonProperty("applicableTimePeriod")
-//	private ApplicableTimePeriod applicableTimePeriod;
-	
-	@JsonProperty("resources")
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> resources = new HashSet<>();
-	
-	@JsonProperty("appliedCapacityAmount")
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AppliedCapacityAmount> appliedCapacityAmount = new HashSet<>();
-	
-
-	public Capacity addResourceRefItem(ResourceRef aResourceRef) {
-		this.resources.add(aResourceRef);
-		return this;
-	}
-
-	public Capacity addAppliedCapacityAmountItem(AppliedCapacityAmount anAppliedCapacityAmount) {
-		this.appliedCapacityAmount.add(anAppliedCapacityAmount);
-		return this;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ChannelRef.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ChannelRef.java
deleted file mode 100644
index 6884744597f7dfaf4b05c27c212a3266acc5b1d9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ChannelRef.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Channel reference. The channel defines the channel for selling product offerings.
- */
-@Schema(description = "Channel reference. The channel defines the channel for selling product offerings.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ChannelRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ChannelRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the channel
-   * @return href
-  **/
-  @Schema(description = "Reference of the channel")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ChannelRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the channel
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the channel")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ChannelRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the channel
-   * @return name
-  **/
-  @Schema(description = "Name of the channel")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ChannelRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ChannelRef channelRef = (ChannelRef) o;
-    return Objects.equals(this.href, channelRef.href) &&
-        Objects.equals(this.id, channelRef.id) &&
-        Objects.equals(this.name, channelRef.name) &&
-        Objects.equals(this._atReferredType, channelRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ChannelRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/Error.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/Error.java
deleted file mode 100644
index 05ef1edfe213b2a053f9ad9df3703cca9c63ca0f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/Error.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Error
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private Integer reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application related code.
-   * @return code
-  **/
-  @Schema(description = "Application related code.")
-      @NotNull
-
-    public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(Integer reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Text that explains the reason for error.
-   * @return reason
-  **/
-  @Schema(description = "Text that explains the reason for error.")
-      @NotNull
-
-    public Integer getReason() {
-    return reason;
-  }
-
-  public void setReason(Integer reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * (optional) Text that provide more details and corrective actions related to the error.
-   * @return message
-  **/
-  @Schema(description = "(optional) Text that provide more details and corrective actions related to the error.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * (optional) http error code extension like 400-2
-   * @return status
-  **/
-  @Schema(description = "(optional) http error code extension like 400-2")
-  
-    public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * (optional) A URL to online documentation that provides more information about the error.
-   * @return referenceError
-  **/
-  @Schema(description = "(optional) A URL to online documentation that provides more information about the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * (optional) The class type of a REST resource.
-   * @return _atType
-  **/
-  @Schema(description = "(optional) The class type of a REST resource.")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public Error _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * (optional) A link to the schema describing a REST resource.
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "(optional) A link to the schema describing a REST resource.")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this._atType, error._atType) &&
-        Objects.equals(this._atSchemaLocation, error._atSchemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, _atType, _atSchemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscription.java
deleted file mode 100644
index 2ade4c2b95f494de643b5fa9955d7d7e03dabe59..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscription.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscription
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscriptionInput.java
deleted file mode 100644
index 4179e48510b20e6171da23b7dc05c115806df61c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscriptionInput
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/Extract.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/Extract.java
deleted file mode 100644
index ff896c90e9c25bb09d5e4048e0861306125d73fc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/Extract.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the extract task resource for resource pool management
- */
-@Schema(description = "the extract task resource for resource pool management")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class Extract {
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-	
-	@JsonProperty("capacity")
-	private Capacity capacity = null;
-
-	@JsonProperty("resourcePool")
-	private ResourcePoolRef resourcePool = null;
-
-	
-	
-	
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public void setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-	}
-
-	/**
-	 * @return the resourcePool
-	 */
-	public ResourcePoolRef getResourcePool() {
-		return resourcePool;
-	}
-
-	/**
-	 * @param resourcePool the resourcePool to set
-	 */
-	public void setResourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-	}
-
-	public Extract href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A string. Hyperlink to access the availableCheck task for resource pool
-	 * Management
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A string. Hyperlink to access the availableCheck task for resource pool Management")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public Extract id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * A string. Identifier of an instance of the extract task for resource pool
-	 * Management
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "A string. Identifier of an instance of the extract task for resource pool Management")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Extract _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public Extract _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public Extract _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Extract extract = (Extract) o;
-		return Objects.equals(this.href, extract.href) && Objects.equals(this.id, extract.id)
-				&& Objects.equals(this._atType, extract._atType)
-				&& Objects.equals(this._atSchemaLocation, extract._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, extract._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(href, id, _atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Extract {\n");
-
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ExtractCreate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ExtractCreate.java
deleted file mode 100644
index a2e5a09d54209149c22df34025ba4362183e12b2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ExtractCreate.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the extract task resource for resource pool management Skipped properties:
- * id,href
- */
-@Schema(description = "the extract task resource for resource pool management Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ExtractCreate {
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("capacity")
-	private Capacity capacity = null;
-
-	@JsonProperty("resourcePool")
-	private ResourcePoolRef resourcePool = null;
-
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public void setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-	}
-
-	/**
-	 * @return the resourcePool
-	 */
-	public ResourcePoolRef getResourcePool() {
-		return resourcePool;
-	}
-
-	/**
-	 * @param resourcePool the resourcePool to set
-	 */
-	public void setResourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-	}
-
-	public ExtractCreate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public ExtractCreate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ExtractCreate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ExtractCreate extractCreate = (ExtractCreate) o;
-		return Objects.equals(this._atType, extractCreate._atType)
-				&& Objects.equals(this._atSchemaLocation, extractCreate._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, extractCreate._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ExtractCreate {\n");
-
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ProductOfferingRef.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ProductOfferingRef.java
deleted file mode 100644
index a0a6750d9454dfb1fbdf418bd1f1a672d14955e7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ProductOfferingRef.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.
- */
-@Schema(description = "ProductOffering reference. A product offering represents entities that are orderable from the provider of the catalog, this resource includes pricing information.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ProductOfferingRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-//  @JsonProperty("bundledProductOffering")
-//  @Valid
-//  private List<BundledProductOfferingRef> bundledProductOffering = null;
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public ProductOfferingRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the product offering
-   * @return href
-  **/
-  @Schema(description = "Reference of the product offering")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ProductOfferingRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the product offering
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of the product offering")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ProductOfferingRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the product offering
-   * @return name
-  **/
-  @Schema(description = "Name of the product offering")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-//  public ProductOfferingRef bundledProductOffering(List<BundledProductOfferingRef> bundledProductOffering) {
-//    this.bundledProductOffering = bundledProductOffering;
-//    return this;
-//  }
-//
-//  public ProductOfferingRef addBundledProductOfferingItem(BundledProductOfferingRef bundledProductOfferingItem) {
-//    if (this.bundledProductOffering == null) {
-//      this.bundledProductOffering = new ArrayList<>();
-//    }
-//    this.bundledProductOffering.add(bundledProductOfferingItem);
-//    return this;
-//  }
-//
-//  /**
-//   * Get bundledProductOffering
-//   * @return bundledProductOffering
-//  **/
-//  @Schema(description = "")
-//      @Valid
-//    public List<BundledProductOfferingRef> getBundledProductOffering() {
-//    return bundledProductOffering;
-//  }
-//
-//  public void setBundledProductOffering(List<BundledProductOfferingRef> bundledProductOffering) {
-//    this.bundledProductOffering = bundledProductOffering;
-//  }
-//
-//  public ProductOfferingRef _atReferredType(String _atReferredType) {
-//    this._atReferredType = _atReferredType;
-//    return this;
-//  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ProductOfferingRef productOfferingRef = (ProductOfferingRef) o;
-    return Objects.equals(this.href, productOfferingRef.href) &&
-        Objects.equals(this.id, productOfferingRef.id) &&
-        Objects.equals(this.name, productOfferingRef.name) &&
-//        Objects.equals(this.bundledProductOffering, productOfferingRef.bundledProductOffering) &&
-        Objects.equals(this._atReferredType, productOfferingRef._atReferredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name,  _atReferredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ProductOfferingRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-//    sb.append("    bundledProductOffering: ").append(toIndentedString(bundledProductOffering)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/Push.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/Push.java
deleted file mode 100644
index eecff8954b9a60c6f5ed3357b3f7a5be35318c5d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/Push.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the push task resource for resource pool management
- */
-@Schema(description = "the push task resource for resource pool management")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class Push {
-	@JsonProperty("href")
-	private String href = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("capacity")
-	private Capacity capacity = null;
-
-	@JsonProperty("resourcePool")
-	private ResourcePoolRef resourcePool = null;
-
-	
-	
-	
-	
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public void setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-	}
-
-	/**
-	 * @return the resourcePool
-	 */
-	public ResourcePoolRef getResourcePool() {
-		return resourcePool;
-	}
-
-	/**
-	 * @param resourcePool the resourcePool to set
-	 */
-	public void setResourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-	}
-
-	public Push href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * A string. Hyperlink to access the push task for resource pool Management
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "A string. Hyperlink to access the push task for resource pool Management")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public Push id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * A string. Identifier of an instance of the push task resource
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "A string. Identifier of an instance of the push task resource")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Push _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public Push _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public Push _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Push push = (Push) o;
-		return Objects.equals(this.href, push.href) && Objects.equals(this.id, push.id)
-				&& Objects.equals(this._atType, push._atType)
-				&& Objects.equals(this._atSchemaLocation, push._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, push._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(href, id, _atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Push {\n");
-
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/PushCreate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/PushCreate.java
deleted file mode 100644
index 5db481d114513da8bc30171be6612194eabf57a4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/PushCreate.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * the push task resource for resource pool management Skipped properties:
- * id,href
- */
-@Schema(description = "the push task resource for resource pool management Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class PushCreate {
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("capacity")
-	private Capacity capacity = null;
-
-	@JsonProperty("resourcePool")
-	private ResourcePoolRef resourcePool = null;
-
-	
-	
-	
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public void setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-	}
-
-	/**
-	 * @return the resourcePool
-	 */
-	public ResourcePoolRef getResourcePool() {
-		return resourcePool;
-	}
-
-	/**
-	 * @param resourcePool the resourcePool to set
-	 */
-	public void setResourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-	}
-
-	public PushCreate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * The class type of the actual resource (for type extension).
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "The class type of the actual resource (for type extension).")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public PushCreate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A link to the schema describing a resource (for type extension).
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A link to the schema describing a resource (for type extension).")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public PushCreate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * The base type for use in polymorphic collections
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "The base type for use in polymorphic collections")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		PushCreate pushCreate = (PushCreate) o;
-		return Objects.equals(this._atType, pushCreate._atType)
-				&& Objects.equals(this._atSchemaLocation, pushCreate._atSchemaLocation)
-				&& Objects.equals(this._atBaseType, pushCreate._atBaseType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atType, _atSchemaLocation, _atBaseType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class PushCreate {\n");
-
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/RequestedPeriod.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/RequestedPeriod.java
deleted file mode 100644
index 9657d06a1749e11f020dd79f4bda141ecf55fc9f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/RequestedPeriod.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The period of time for which user requested to use the resources. The user can request on the start date without the end date.
- */
-@Schema(description = "The period of time for which user requested to use the resources. The user can request on the start date without the end date.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class RequestedPeriod   {
-  @JsonProperty("@baseType")
-  private String _atBaseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String _atSchemaLocation = null;
-
-  @JsonProperty("@type")
-  private String _atType = null;
-
-  @JsonProperty("daysOfWeek")
-  private String daysOfWeek = null;
-
-  @JsonProperty("fromToDateTime")
-  private OffsetDateTime fromToDateTime = null;
-
-  @JsonProperty("rangeInterval")
-  private String rangeInterval = null;
-
-  @JsonProperty("validFor")
-  private String validFor = null;
-
-  public RequestedPeriod _atBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-    return this;
-  }
-
-  /**
-   * A string. Generic attribute indicating the base class type of the extension class of the current object. Useful only when the class type of the current  object is unknown to the implementation.
-   * @return _atBaseType
-  **/
-  @Schema(description = "A string. Generic attribute indicating the base class type of the extension class of the current object. Useful only when the class type of the current  object is unknown to the implementation.")
-  
-    public String getAtBaseType() {
-    return _atBaseType;
-  }
-
-  public void setAtBaseType(String _atBaseType) {
-    this._atBaseType = _atBaseType;
-  }
-
-  public RequestedPeriod _atSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-    return this;
-  }
-
-  /**
-   * A string. Generic attribute containing the link to the schema that defines the structure of the class type of the current object.
-   * @return _atSchemaLocation
-  **/
-  @Schema(description = "A string. Generic attribute containing the link to the schema that defines the structure of the class type of the current object.")
-  
-    public String getAtSchemaLocation() {
-    return _atSchemaLocation;
-  }
-
-  public void setAtSchemaLocation(String _atSchemaLocation) {
-    this._atSchemaLocation = _atSchemaLocation;
-  }
-
-  public RequestedPeriod _atType(String _atType) {
-    this._atType = _atType;
-    return this;
-  }
-
-  /**
-   * A string. Generic attribute containing the name of the resource class type.
-   * @return _atType
-  **/
-  @Schema(description = "A string. Generic attribute containing the name of the resource class type.")
-  
-    public String getAtType() {
-    return _atType;
-  }
-
-  public void setAtType(String _atType) {
-    this._atType = _atType;
-  }
-
-  public RequestedPeriod daysOfWeek(String daysOfWeek) {
-    this.daysOfWeek = daysOfWeek;
-    return this;
-  }
-
-  /**
-   * A day or days representing when the schedule is applicable. For example 2, 3 represent Monday and Tuesday.
-   * @return daysOfWeek
-  **/
-  @Schema(description = "A day or days representing when the schedule is applicable. For example 2, 3 represent Monday and Tuesday.")
-  
-    public String getDaysOfWeek() {
-    return daysOfWeek;
-  }
-
-  public void setDaysOfWeek(String daysOfWeek) {
-    this.daysOfWeek = daysOfWeek;
-  }
-
-  public RequestedPeriod fromToDateTime(OffsetDateTime fromToDateTime) {
-    this.fromToDateTime = fromToDateTime;
-    return this;
-  }
-
-  /**
-   * The period of time for which the schedule is applicable.  Instance values are mutually exclusive with daysOfWeek values.
-   * @return fromToDateTime
-  **/
-  @Schema(description = "The period of time for which the schedule is applicable.  Instance values are mutually exclusive with daysOfWeek values.")
-  
-    @Valid
-    public OffsetDateTime getFromToDateTime() {
-    return fromToDateTime;
-  }
-
-  public void setFromToDateTime(OffsetDateTime fromToDateTime) {
-    this.fromToDateTime = fromToDateTime;
-  }
-
-  public RequestedPeriod rangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-    return this;
-  }
-
-  /**
-   * An indicator that specifies the inclusion or exclusion of the from and to DateTime attributes.  Possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".
-   * @return rangeInterval
-  **/
-  @Schema(description = "An indicator that specifies the inclusion or exclusion of the from and to DateTime attributes.  Possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-  
-    public String getRangeInterval() {
-    return rangeInterval;
-  }
-
-  public void setRangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-  }
-
-  public RequestedPeriod validFor(String validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period of time during which the schedule is considered of interest to the business.
-   * @return validFor
-  **/
-  @Schema(description = "The period of time during which the schedule is considered of interest to the business.")
-  
-    public String getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(String validFor) {
-    this.validFor = validFor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    RequestedPeriod requestedPeriod = (RequestedPeriod) o;
-    return Objects.equals(this._atBaseType, requestedPeriod._atBaseType) &&
-        Objects.equals(this._atSchemaLocation, requestedPeriod._atSchemaLocation) &&
-        Objects.equals(this._atType, requestedPeriod._atType) &&
-        Objects.equals(this.daysOfWeek, requestedPeriod.daysOfWeek) &&
-        Objects.equals(this.fromToDateTime, requestedPeriod.fromToDateTime) &&
-        Objects.equals(this.rangeInterval, requestedPeriod.rangeInterval) &&
-        Objects.equals(this.validFor, requestedPeriod.validFor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_atBaseType, _atSchemaLocation, _atType, daysOfWeek, fromToDateTime, rangeInterval, validFor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class RequestedPeriod {\n");
-    
-    sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-    sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-    sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-    sb.append("    daysOfWeek: ").append(toIndentedString(daysOfWeek)).append("\n");
-    sb.append("    fromToDateTime: ").append(toIndentedString(fromToDateTime)).append("\n");
-    sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/Reservation.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/Reservation.java
deleted file mode 100644
index 18b7d5d1759b1fce43305fd5322e5a39a1c3998a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/Reservation.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.sim638.model.ServiceOrderRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * reservation api resource
- */
-@Schema(description = "reservation api resource")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-
-@Entity(name = "Reservation")
-public class Reservation extends BaseEntity {
-
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("relatedParty")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "reserv_relParuuid", referencedColumnName = "uuid")
-	private RelatedParty relatedParty = null;
-
-	@JsonProperty("reservationState")
-	private String reservationState = null;
-
-	@JsonProperty("reservationItem")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ReservationItem> reservationItem =  new HashSet<>();
-
-
-	@Column(name="reqPeriodStartDate")
-	private OffsetDateTime requestedPeriodStartDateTime = null;
-
-	@Column(name="reqPeriodEndDate")
-	private OffsetDateTime requestedPeriodEndDateTime = null;
-
-
-	
-	
-//	@JsonProperty("productOfferingRef")
-//	private ProductOfferingRef productOfferingRef = null;
-
-	@JsonProperty("serviceOrderRef")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "Reserv_soRefuuid", referencedColumnName = "uuid")
-	private ServiceOrderRef serviceOrderRef = null;
-
-
-
-	/**
-	 * A string. Identifier of an instance of the Reservation.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "A string. Identifier of an instance of the Reservation.")
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-	
-	
-	
-
-	/**
-	 * @return the serviceOrderRef
-	 */
-	public ServiceOrderRef getServiceOrderRef() {
-		return serviceOrderRef;
-	}
-
-
-
-
-
-	/**
-	 * @param serviceOrderRef the serviceOrderRef to set
-	 */
-	public void setServiceOrderRef(ServiceOrderRef serviceOrderRef) {
-		this.serviceOrderRef = serviceOrderRef;
-	}
-
-	/**
-	 * @param serviceOrderRef the serviceOrderRef to set
-	 * @return 
-	 */
-	public Reservation serviceOrderRef(ServiceOrderRef serviceOrderRef) {
-		this.serviceOrderRef = serviceOrderRef;
-		return this;
-	}
-
-
-	
-	/**
-	 * End of the time period, using IETC-RFC-3339 format
-	 * 
-	 * @return endDateTime
-	 **/
-	@Schema(description = "End of the time period, using IETC-RFC-3339 format")
-	@Valid
-	@JsonProperty("requestedPeriodEndDateTime")
-	public String getRequestedPeriodEndDateTimeString() {
-		if ( requestedPeriodEndDateTime != null) {
-			return requestedPeriodEndDateTime.toString();			
-		}
-		return null;
-	}
-	
-	public OffsetDateTime getRequestedPeriodEndDateTime() {
-		return requestedPeriodEndDateTime;
-	}
-
-	public void setRequestedPeriodEndDateTime(OffsetDateTime endDateTime) {
-		this.requestedPeriodEndDateTime = endDateTime;
-	}
-
-	public Reservation requestedPeriodStartDateTime(OffsetDateTime startDateTime) {
-		this.requestedPeriodStartDateTime = startDateTime;
-		return this;
-	}
-
-
-	public void setRequestedPeriodEndDateTime(String endDateTime) {
-		this.requestedPeriodEndDateTime = OffsetDateTime.parse( endDateTime );
-	}
-
-	
-
-
-	
-	/**
-	 * Start of the time period, using IETC-RFC-3339 format. If you define a start,
-	 * you must also define an end
-	 * 
-	 * @return startDateTime
-	 **/
-	@Schema(description = "Start of the time period, using IETC-RFC-3339 format. If you define a start, you must also define an end")
-	@Valid
-	@JsonProperty("requestedPeriodStartDateTime")
-	public String getRequestedPeriodStartDateTimeString() {
-		if ( requestedPeriodStartDateTime != null) {
-			return requestedPeriodStartDateTime.toString();			
-		}
-		return null;			
-		
-	}
-	
-	public OffsetDateTime getRequestedPeriodStartDateTime() {
-		return requestedPeriodStartDateTime;
-	}
-	
-	
-	public void setRequestedPeriodStartDateTime(OffsetDateTime startDateTime) {
-		this.requestedPeriodStartDateTime = startDateTime;
-	}
-	
-	public void setRequestedPeriodStartDateTime(String startDateTime) {
-		if ( startDateTime!= null ) {
-			this.requestedPeriodStartDateTime = OffsetDateTime.parse( startDateTime );
-		}
-	}
-	
-	
-	
-
-	public Reservation relatedParty(RelatedParty relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public RelatedParty getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(RelatedParty relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Reservation reservationState(String reservationState) {
-		this.reservationState = reservationState;
-		return this;
-	}
-
-	/**
-	 * A string. The life cycle state of the reservation.
-	 * 
-	 * @return reservationState
-	 **/
-	@Schema(description = "A string. The life cycle state of the reservation.")
-
-	public String getReservationState() {
-		return reservationState;
-	}
-
-	public void setReservationState(String reservationState) {
-		this.reservationState = reservationState;
-	}
-
-	public Reservation reservationItem(Set<ReservationItem> reservationItem) {
-		this.reservationItem = reservationItem;
-		return this;
-	}
-
-	public Reservation addReservationItemItem(ReservationItem reservationItemItem) {
-		if (this.reservationItem == null) {
-			this.reservationItem = new HashSet<>();
-		}
-		this.reservationItem.add(reservationItemItem);
-		return this;
-	}
-
-	/**
-	 * Get reservationItem
-	 * 
-	 * @return reservationItem
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ReservationItem> getReservationItem() {
-		return reservationItem;
-	}
-
-	public void setReservationItem(Set<ReservationItem> reservationItem) {
-		this.reservationItem = reservationItem;
-	}
-
-	
-
-//	public Reservation requestedPeriod(TimePeriod requestedPeriod) {
-//		this.requestedPeriod = requestedPeriod;
-//		return this;
-//	}
-//
-//	/**
-//	 * Get requestedPeriod
-//	 * 
-//	 * @return requestedPeriod
-//	 **/
-//	@Schema(description = "")
-//
-//	@Valid
-//	public TimePeriod getRequestedPeriod() {
-//		return requestedPeriod;
-//	}
-//
-//	public void setRequestedPeriod(TimePeriod requestedPeriod) {
-//		this.requestedPeriod = requestedPeriod;
-//	}
-
-//	public Reservation productOfferingRef(ProductOfferingRef productOfferingRef) {
-//		this.productOfferingRef = productOfferingRef;
-//		return this;
-//	}
-//
-//	/**
-//	 * Get productOfferingRef
-//	 * 
-//	 * @return productOfferingRef
-//	 **/
-//	@Schema(description = "")
-//
-//	@Valid
-//	public ProductOfferingRef getProductOfferingRef() {
-//		return productOfferingRef;
-//	}
-//
-//	public void setProductOfferingRef(ProductOfferingRef productOfferingRef) {
-//		this.productOfferingRef = productOfferingRef;
-//	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Reservation reservation = (Reservation) o;
-		return Objects.equals(this.getBaseType(), reservation.getBaseType())
-				&& Objects.equals(this.getSchemaLocation(), reservation.getSchemaLocation())
-				&& Objects.equals(this.getType(), reservation.getType())
-				&& Objects.equals(this.description, reservation.description)
-				&& Objects.equals(this.href, reservation.href) && Objects.equals(this.id, reservation.id)
-				&& Objects.equals(this.relatedParty, reservation.relatedParty)
-				&& Objects.equals(this.reservationState, reservation.reservationState)
-				&& Objects.equals(this.validFor, reservation.validFor)
-				&& Objects.equals(this.reservationItem, reservation.reservationItem);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getBaseType(), getSchemaLocation(), getType(), description, href, id, relatedParty,
-				reservationState, validFor, reservationItem);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Reservation {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(getBaseType())).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(getSchemaLocation())).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(getType())).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    reservationState: ").append(toIndentedString(reservationState)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    reservationItem: ").append(toIndentedString(reservationItem)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationCreate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationCreate.java
deleted file mode 100644
index 8cb47d2e7ef04bf60e5744fabb5036e7ec13333c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationCreate.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * reservation api resource Skipped properties: id,href
- */
-@Schema(description = "reservation api resource Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ReservationCreate extends  ReservationUpdate {
-  
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationItem.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationItem.java
deleted file mode 100644
index 16fbddf8500dbea10b5b768c3b07d5904469ef3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationItem.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * An identified part of the reservation. A reservation is decomposed into one
- * or more reservation items.
- */
-@Schema(description = "An identified part of the reservation. A reservation is decomposed into one or more reservation items.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-
-@Entity(name = "ReservationItem")
-public class ReservationItem extends BaseRootEntity {
-
-	@JsonProperty("quantity")
-	private Integer quantity = null;
-
-	@JsonProperty("subReservationState")
-	private String subReservationState = null;
-
-	@JsonProperty("resourceCapacity")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "reservitem_resrcapuuid", referencedColumnName = "uuid")
-	private ResourceCapacityDemand resourceCapacity = null;
-
-	@JsonProperty("appliedCapacityAmount")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "reservitem_appliedcapuuid", referencedColumnName = "uuid")
-	private AppliedCapacityAmount appliedCapacityAmount = null;
-
-	public ReservationItem quantity(Integer quantity) {
-		this.quantity = quantity;
-		return this;
-	}
-
-	/**
-	 * Represents the number of reservationItems that make up the reservation.
-	 * 
-	 * @return quantity
-	 **/
-	@Schema(description = "Represents the number of reservationItems that make up the reservation.")
-
-	public Integer getQuantity() {
-		return quantity;
-	}
-
-	public void setQuantity(Integer quantity) {
-		this.quantity = quantity;
-	}
-
-	public ReservationItem subReservationState(String subReservationState) {
-		this.subReservationState = subReservationState;
-		return this;
-	}
-
-	/**
-	 * A string. The life cycle state of the each reservation item.
-	 * 
-	 * @return subReservationState
-	 **/
-	@Schema(description = "A string. The life cycle state of the each reservation item.")
-
-	public String getSubReservationState() {
-		return subReservationState;
-	}
-
-	public void setSubReservationState(String subReservationState) {
-		this.subReservationState = subReservationState;
-	}
-
-	public ReservationItem resourceCapacity(ResourceCapacityDemand resourceCapacity) {
-		this.resourceCapacity = resourceCapacity;
-		return this;
-	}
-
-	/**
-	 * Get resourceCapacity
-	 * 
-	 * @return resourceCapacity
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourceCapacityDemand getResourceCapacity() {
-		return resourceCapacity;
-	}
-
-	public void setResourceCapacity(ResourceCapacityDemand resourceCapacity) {
-		this.resourceCapacity = resourceCapacity;
-	}
-
-	public ReservationItem appliedCapacityAmount(AppliedCapacityAmount appliedCapacityAmount) {
-		this.appliedCapacityAmount = appliedCapacityAmount;
-		return this;
-	}
-
-	/**
-	 * Get appliedCapacityAmount
-	 * 
-	 * @return appliedCapacityAmount
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AppliedCapacityAmount getAppliedCapacityAmount() {
-		return appliedCapacityAmount;
-	}
-
-	public void setAppliedCapacityAmount(AppliedCapacityAmount appliedCapacityAmount) {
-		this.appliedCapacityAmount = appliedCapacityAmount;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ReservationItem reservationItem = (ReservationItem) o;
-		return Objects.equals(this.getBaseType(), reservationItem.getBaseType())
-				&& Objects.equals(this.getSchemaLocation(), reservationItem.getSchemaLocation())
-				&& Objects.equals(this.getType(), reservationItem.getType())
-				&& Objects.equals(this.quantity, reservationItem.quantity)
-				&& Objects.equals(this.subReservationState, reservationItem.subReservationState)
-				&& Objects.equals(this.resourceCapacity, reservationItem.resourceCapacity)
-				&& Objects.equals(this.appliedCapacityAmount, reservationItem.appliedCapacityAmount);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getBaseType(), getSchemaLocation(), getType(), quantity, subReservationState, resourceCapacity,
-				appliedCapacityAmount);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ReservationItem {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(getBaseType())).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(getSchemaLocation())).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(getType())).append("\n");
-		sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-		sb.append("    subReservationState: ").append(toIndentedString(subReservationState)).append("\n");
-		sb.append("    resourceCapacity: ").append(toIndentedString(resourceCapacity)).append("\n");
-		sb.append("    appliedCapacityAmount: ").append(toIndentedString(appliedCapacityAmount)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationMapper.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationMapper.java
deleted file mode 100644
index 3a215aea3bd89c5fa1d6f1b4a592dde72421c68e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import org.mapstruct.BeanMapping;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.NullValuePropertyMappingStrategy;
-
-
-@Mapper( 
-		nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-		nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS   )
-public interface ReservationMapper {
-
-
-
-	@Mapping(target = "baseType", ignore = true)
-	@Mapping(target = "schemaLocation", ignore = true)
-	@Mapping(target = "href", ignore = true)
-	@Mapping(target = "type", ignore = true)
-	@Mapping(target = "uuid", ignore = true)
-	@Mapping(target = "lastUpdate", ignore = true)
-	@Mapping(target = "lifecycleStatus", ignore = true)
-	@Mapping(target = "lifecycleStatusEnum", ignore = true)
-	@Mapping(target = "version", ignore = true)
-	Reservation fromReservationDTO( ReservationUpdate resdto);	
-	
-	
-	@Mapping(target = "baseType", ignore = true)
-	@Mapping(target = "schemaLocation", ignore = true)
-	@Mapping(target = "href", ignore = true)
-	@Mapping(target = "type", ignore = true)
-	@Mapping(target = "uuid", ignore = true)
-	@Mapping(target = "lastUpdate", ignore = true)
-	@Mapping(target = "lifecycleStatus", ignore = true)
-	@Mapping(target = "lifecycleStatusEnum", ignore = true)
-	@Mapping(target = "version", ignore = true)
-	@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
-	Reservation updateReservation( @MappingTarget  Reservation entity, ReservationUpdate  updateEntity);
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationStateType.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationStateType.java
deleted file mode 100644
index 8177a0b844b2c20a74109551b75c6dd0a45fb411..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationStateType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * ResourceStatusType enumerations
- */
-public enum ReservationStateType {
-  	INPROGRESS("inprogress"),
-    COMPLETED("completed"),
-    REJECTED("rejected"),
-    CANCELLED("cancelled");
-
-  private String value;
-
-  ReservationStateType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ReservationStateType fromValue(String text) {
-    for (ReservationStateType b : ReservationStateType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationUpdate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationUpdate.java
deleted file mode 100644
index 34f087bd3b79c0607113591417250af93b37b9ae..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ReservationUpdate.java
+++ /dev/null
@@ -1,468 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.sim638.model.ServiceOrderRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * reservation api resource Skipped properties: id,href
- */
-/**
- * @author ctranoris
- *
- */
-@Schema(description = "reservation api resource Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ReservationUpdate {
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-	
-
-
-	@JsonProperty("name")
-	private String name = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("relatedParty")
-	private RelatedParty relatedParty = null;
-
-	@JsonProperty("reservationState")
-	private String reservationState = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("reservationItem")
-	@Valid
-	private List<ReservationItem> reservationItem = null;
-
-//  @JsonProperty("channelRef")
-//  private ChannelRef channelRef = null;
-
-//  @JsonProperty("requestedPeriod")
-//  private RequestedPeriod requestedPeriod = null;
-
-//  @JsonProperty("productOfferingRef")
-//  private ProductOfferingRef productOfferingRef = null;
-
-	private OffsetDateTime requestedPeriodEndDateTime = null;
-
-	private OffsetDateTime requestedPeriodStartDateTime = null;
-
-	@JsonProperty("serviceOrderRef")
-	private ServiceOrderRef serviceOrderRef = null;
-
-	/**
-	 * @return the serviceOrderRef
-	 */
-	public ServiceOrderRef getServiceOrderRef() {
-		return serviceOrderRef;
-	}
-
-	/**
-	 * @param serviceOrderRef the serviceOrderRef to set
-	 */
-	public void setServiceOrderRef(ServiceOrderRef serviceOrderRef) {
-		this.serviceOrderRef = serviceOrderRef;
-	}
-
-	public ReservationUpdate serviceOrderRef(ServiceOrderRef serviceOrderRef) {
-		this.serviceOrderRef = serviceOrderRef;
-		return this;
-	}
-
-	@JsonProperty("requestedPeriodEndDateTime")
-	public String getRequestedPeriodEndDateTimeStr() {
-		if (requestedPeriodEndDateTime != null) {
-			return requestedPeriodEndDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-	
-	
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the requestedPeriodEndDateTime
-	 */
-	public OffsetDateTime getRequestedPeriodEndDateTime() {
-		return requestedPeriodEndDateTime;
-	}
-
-	/**
-	 * @param requestedPeriodEndDateTime the requestedPeriodEndDateTime to set
-	 */
-	public void setRequestedPeriodEndDateTime(OffsetDateTime requestedPeriodEndDateTime) {
-		this.requestedPeriodEndDateTime = requestedPeriodEndDateTime;
-	}
-	
-	
-	public ReservationUpdate requestedPeriodEndDateTime(OffsetDateTime requestedPeriodEndDateTime) {
-		this.requestedPeriodEndDateTime = requestedPeriodEndDateTime;
-		return this;
-	}
-
-	public void setRequestedPeriodEndDateTime(String requestedPeriodEndDateTime) {
-
-		if (requestedPeriodEndDateTime != null) {
-			this.requestedPeriodEndDateTime = OffsetDateTime.parse(requestedPeriodEndDateTime);
-
-		}
-	}
-
-	/**
-	 * @return the requestedPeriodStartDateTime
-	 */
-	public OffsetDateTime getRequestedPeriodStartDateTime() {
-		return requestedPeriodStartDateTime;
-	}
-
-	/**
-	 * @param requestedPeriodStartDateTime the requestedPeriodStartDateTime to set
-	 */
-	public void setRequestedPeriodStartDateTime(OffsetDateTime requestedPeriodStartDateTime) {
-		this.requestedPeriodStartDateTime = requestedPeriodStartDateTime;
-	}
-	
-	public ReservationUpdate requestedPeriodStartDateTime(OffsetDateTime requestedPeriodStartDateTime) {
-		this.requestedPeriodStartDateTime = requestedPeriodStartDateTime;
-		return this;
-	}
-
-	@JsonProperty("requestedPeriodStartDateTime")
-	public String getRequestedPeriodStartDateTimeStr() {
-		if (requestedPeriodStartDateTime != null) {
-			return requestedPeriodStartDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public void setRequestedPeriodStartDateTime(String requestedPeriodStartDateTime) {
-
-		if (requestedPeriodStartDateTime != null) {
-			this.requestedPeriodStartDateTime = OffsetDateTime.parse(requestedPeriodStartDateTime);
-
-		}
-	}
-
-	public ReservationUpdate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * Get _atBaseType
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ReservationUpdate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A string. Generic attribute containing the link to the schema that defines
-	 * the structure of the class type of the current object.
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A string. Generic attribute containing the link to the schema that defines the structure of the class type of the current object.")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ReservationUpdate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * A string. Indicates the (class) type of reservation. Ex.
-	 * serviceItemReservation, resourceItemReservation
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "A string. Indicates the (class) type of reservation. Ex. serviceItemReservation, resourceItemReservation")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public ReservationUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A string. free-text description of the reservation.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A string. free-text description of the reservation.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ReservationUpdate relatedParty(RelatedParty relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	/**
-	 * Get relatedParty
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public RelatedParty getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(RelatedParty relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ReservationUpdate reservationState(String reservationState) {
-		this.reservationState = reservationState;
-		return this;
-	}
-
-	/**
-	 * A string. The life cycle state of the reservation.
-	 * 
-	 * @return reservationState
-	 **/
-	@Schema(description = "A string. The life cycle state of the reservation.")
-
-	public String getReservationState() {
-		return reservationState;
-	}
-
-	public void setReservationState(String reservationState) {
-		this.reservationState = reservationState;
-	}
-
-	public ReservationUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period of time for which the reservation is applicable.
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period of time for which the reservation is applicable.")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ReservationUpdate reservationItem(List<ReservationItem> reservationItem) {
-		this.reservationItem = reservationItem;
-		return this;
-	}
-
-	public ReservationUpdate addReservationItemItem(ReservationItem reservationItemItem) {
-		if (this.reservationItem == null) {
-			this.reservationItem = new ArrayList<>();
-		}
-		this.reservationItem.add(reservationItemItem);
-		return this;
-	}
-
-	/**
-	 * Get reservationItem
-	 * 
-	 * @return reservationItem
-	 **/
-	@Schema(description = "")
-	@Valid
-	public List<ReservationItem> getReservationItem() {
-		return reservationItem;
-	}
-
-	public void setReservationItem(List<ReservationItem> reservationItem) {
-		this.reservationItem = reservationItem;
-	}
-
-//	public ReservationUpdate channelRef(ChannelRef channelRef) {
-//		this.channelRef = channelRef;
-//		return this;
-//	}
-//
-//	/**
-//	 * Get channelRef
-//	 * 
-//	 * @return channelRef
-//	 **/
-//	@Schema(description = "")
-//
-//	@Valid
-//	public ChannelRef getChannelRef() {
-//		return channelRef;
-//	}
-//
-//	public void setChannelRef(ChannelRef channelRef) {
-//		this.channelRef = channelRef;
-//	}
-//
-//	public ReservationUpdate requestedPeriod(RequestedPeriod requestedPeriod) {
-//		this.requestedPeriod = requestedPeriod;
-//		return this;
-//	}
-//
-//	/**
-//	 * Get requestedPeriod
-//	 * 
-//	 * @return requestedPeriod
-//	 **/
-//	@Schema(description = "")
-//
-//	@Valid
-//	public RequestedPeriod getRequestedPeriod() {
-//		return requestedPeriod;
-//	}
-//
-//	public void setRequestedPeriod(RequestedPeriod requestedPeriod) {
-//		this.requestedPeriod = requestedPeriod;
-//	}
-//
-//	public ReservationUpdate productOfferingRef(ProductOfferingRef productOfferingRef) {
-//		this.productOfferingRef = productOfferingRef;
-//		return this;
-//	}
-//
-//	/**
-//	 * Get productOfferingRef
-//	 * 
-//	 * @return productOfferingRef
-//	 **/
-//	@Schema(description = "")
-//
-//	@Valid
-//	public ProductOfferingRef getProductOfferingRef() {
-//		return productOfferingRef;
-//	}
-//
-//	public void setProductOfferingRef(ProductOfferingRef productOfferingRef) {
-//		this.productOfferingRef = productOfferingRef;
-//	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ReservationUpdate reservationUpdate = (ReservationUpdate) o;
-		return Objects.equals(this._atBaseType, reservationUpdate._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, reservationUpdate._atSchemaLocation)
-				&& Objects.equals(this._atType, reservationUpdate._atType)
-				&& Objects.equals(this.description, reservationUpdate.description)
-				&& Objects.equals(this.relatedParty, reservationUpdate.relatedParty)
-				&& Objects.equals(this.reservationState, reservationUpdate.reservationState)
-				&& Objects.equals(this.validFor, reservationUpdate.validFor)
-				&& Objects.equals(this.reservationItem, reservationUpdate.reservationItem);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atBaseType, _atSchemaLocation, _atType, description, relatedParty, reservationState,
-				validFor, reservationItem);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ReservationUpdate {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    reservationState: ").append(toIndentedString(reservationState)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    reservationItem: ").append(toIndentedString(reservationItem)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourceCapacityDemand.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourceCapacityDemand.java
deleted file mode 100644
index 1c0d3930a305a48d0c11b573e6839db757cc7fb0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourceCapacityDemand.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.pcm620.model.PlaceRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * the amount of capacity that is planned to be consumed or has been consumed.
- */
-@Schema(description = "the amount of capacity that is planned to be consumed or has been consumed.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-@Entity(name = "ResCapacityDemand")
-public class ResourceCapacityDemand extends BaseRootEntity {
-
-	@JsonProperty("capacityDemandAmount")
-	private Integer capacityDemandAmount = null;
-
-	@JsonProperty("resourcePool")
-	@ManyToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "rescapcitydem_resPooluuid", referencedColumnName = "uuid")
-	private ResourcePoolRef resourcePool = null;
-
-	@JsonProperty("applicableTimePeriod")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "rescapcitydem_applTimePerduuid", referencedColumnName = "uuid")
-	private ApplicableTimePeriod applicableTimePeriod = null;
-
-	@JsonProperty("place")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "rescapcitydem_placeuuid", referencedColumnName = "uuid")
-	private PlaceRef place = null;
-
-
-	@JsonProperty("resources")
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> resources = new HashSet<>();
-	
-	
-	
-	/**
-	 * @return the resources
-	 */
-	public Set<ResourceRef> getResources() {
-		return resources;
-	}
-
-	/**
-	 * @param resources the resources to set
-	 */
-	public void setResources(Set<ResourceRef> resources) {
-		this.resources = resources;
-	}
-
-	public ResourceCapacityDemand capacityDemandAmount(Integer capacityDemandAmount) {
-		this.capacityDemandAmount = capacityDemandAmount;
-		return this;
-	}
-
-	/**
-	 * A value and units that define the CapacityDemand, such as 10000 ea, 10B Mb.
-	 * Instance values are mutually exclusive with From and To capacityDemandAmounts
-	 * and range interval.
-	 * 
-	 * @return capacityDemandAmount
-	 **/
-	@Schema(description = "A value and units that define the CapacityDemand, such as 10000 ea, 10B Mb.  Instance values are mutually exclusive with From and To capacityDemandAmounts and range interval.")
-
-	public Integer getCapacityDemandAmount() {
-		return capacityDemandAmount;
-	}
-
-	public void setCapacityDemandAmount(Integer capacityDemandAmount) {
-		this.capacityDemandAmount = capacityDemandAmount;
-	}
-
-	public ResourceCapacityDemand resourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-		return this;
-	}
-
-	/**
-	 * Get resourcePool
-	 * 
-	 * @return resourcePool
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ResourcePoolRef getResourcePool() {
-		return resourcePool;
-	}
-
-	public void setResourcePool(ResourcePoolRef resourcePool) {
-		this.resourcePool = resourcePool;
-	}
-
-	public ResourceCapacityDemand applicableTimePeriod(ApplicableTimePeriod applicableTimePeriod) {
-		this.applicableTimePeriod = applicableTimePeriod;
-		return this;
-	}
-
-	/**
-	 * Get applicableTimePeriod
-	 * 
-	 * @return applicableTimePeriod
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ApplicableTimePeriod getApplicableTimePeriod() {
-		return applicableTimePeriod;
-	}
-
-	public void setApplicableTimePeriod(ApplicableTimePeriod applicableTimePeriod) {
-		this.applicableTimePeriod = applicableTimePeriod;
-	}
-
-	public ResourceCapacityDemand place(PlaceRef place) {
-		this.place = place;
-		return this;
-	}
-
-	/**
-	 * Get place
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public PlaceRef getPlace() {
-		return place;
-	}
-
-	public void setPlace(PlaceRef place) {
-		this.place = place;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourceCapacityDemand resourceCapacityDemand = (ResourceCapacityDemand) o;
-		return Objects.equals(this.getBaseType(), resourceCapacityDemand.getBaseType())
-				&& Objects.equals(this.getSchemaLocation(), resourceCapacityDemand.getSchemaLocation())
-				&& Objects.equals(this.getType(), resourceCapacityDemand.getType())
-				&& Objects.equals(this.capacityDemandAmount, resourceCapacityDemand.capacityDemandAmount)
-				
-				&& Objects.equals(this.applicableTimePeriod, resourceCapacityDemand.applicableTimePeriod)
-				&& Objects.equals(this.place, resourceCapacityDemand.place);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(getBaseType(), getSchemaLocation(), getType(), capacityDemandAmount, 
-				applicableTimePeriod, place);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourceCapacityDemand {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(getBaseType())).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(getSchemaLocation())).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(getType())).append("\n");
-		sb.append("    capacityDemandAmount: ").append(toIndentedString(capacityDemandAmount)).append("\n");
-		
-		sb.append("    applicableTimePeriod: ").append(toIndentedString(applicableTimePeriod)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePool.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePool.java
deleted file mode 100644
index 14d953f598f5db9538d836643d6ae4ac03d6a900..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePool.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
-
-/**
- * manages resource capacity with the resource state
- */
-@Schema(description = "manages resource capacity with the resource state")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-
-@Entity(name = "ResourcePool")
-public class ResourcePool extends BaseEntity {
-
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-
-	@JsonProperty("capacity")
-	@OneToOne(cascade = CascadeType.ALL)
-	@JoinColumn(name = "resr_capacuuid", referencedColumnName = "uuid")
-	private Capacity capacity = null;
-	
-	
-	
-	
-//	@JsonProperty("resourceCollection")
-//	@Valid
-//	@ManyToMany(fetch = FetchType.EAGER, cascade = { CascadeType.DETACH })
-//	@JoinTable()
-//	@JsonIgnore
-//	private Set<ResourceCollectionRef> resourceCollection = new HashSet<>();
-
-	
-
-	/**
-	 * Unique identifier of this REST resource
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of this REST resource")
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-	
-	
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public ResourcePool setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-		return this;
-	}
-
-
-
-
-
-//	public ResourcePool resourceCollection(Set<ResourceCollectionRef> resourceCollection) {
-//		this.resourceCollection = resourceCollection;
-//		return this;
-//	}
-//
-//	public ResourcePool addResourceCollectionItem(ResourceCollectionRef resourceCollectionItem) {
-//		if (this.resourceCollection == null) {
-//			this.resourceCollection = new HashSet<>();
-//		}
-//		this.resourceCollection.add(resourceCollectionItem);
-//		return this;
-//	}
-//
-//	/**
-//	 * Get resourceCollection
-//	 * 
-//	 * @return resourceCollection
-//	 **/
-//	@Schema(description = "")
-//	@Valid
-//	public Set<ResourceCollectionRef> getResourceCollection() {
-//		return resourceCollection;
-//	}
-//
-//	public void setResourceCollection(Set<ResourceCollectionRef> resourceCollection) {
-//		this.resourceCollection = resourceCollection;
-//	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourcePool resourcePool = (ResourcePool) o;
-		return Objects.equals(this.description, resourcePool.description)
-				&& Objects.equals(this.href, resourcePool.href); 
-//				&& Objects.equals(this.resourceCollection, resourcePool.resourceCollection);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(baseType, schemaLocation, type, description, href, id
-//				, resourceCollection
-				);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourcePool {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(  baseType )).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString( type)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-//		sb.append("    resourceCollection: ").append(toIndentedString(resourceCollection)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolCreate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolCreate.java
deleted file mode 100644
index 5e92c130185d3884012826e271040a89587cdb4d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolCreate.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * manages resource capacity with the resource state Skipped properties: id,href
- */
-@Schema(description = "manages resource capacity with the resource state Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ResourcePoolCreate extends ResourcePoolUpdate {
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolMapper.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolMapper.java
deleted file mode 100644
index ad222a160a24d405afb04da085979eacf4cd90fa..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import org.mapstruct.BeanMapping;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.NullValuePropertyMappingStrategy;
-
-@Mapper( 
-		nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-		nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS   )
-public interface ResourcePoolMapper {
-
-	@Mapping(target = "uuid", ignore = true)
-	@Mapping(target = "baseType", ignore = true)
-	@Mapping(target = "href", ignore = true)
-	@Mapping(target = "schemaLocation", ignore = true)
-	@Mapping(target = "type", ignore = true)
-	@Mapping(target = "lastUpdate", ignore = true)
-	@Mapping(target = "lifecycleStatus", ignore = true)
-	@Mapping(target = "lifecycleStatusEnum", ignore = true)
-	@Mapping(target = "version", ignore = true)
-	@Mapping(target = "validFor", ignore = true)
-	ResourcePool fromResourcePoolDTO( ResourcePoolUpdate rpdto );
-	
-	
-	@Mapping(target = "baseType", ignore = true)
-	@Mapping(target = "schemaLocation", ignore = true)
-	@Mapping(target = "href", ignore = true)
-	@Mapping(target = "type", ignore = true)
-	@Mapping(target = "uuid", ignore = true)
-	@Mapping(target = "lastUpdate", ignore = true)
-	@Mapping(target = "lifecycleStatus", ignore = true)
-	@Mapping(target = "lifecycleStatusEnum", ignore = true)
-	@Mapping(target = "validFor", ignore = true)
-	@Mapping(target = "version", ignore = true)
-	@BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
-	ResourcePool updateResourcePool(@MappingTarget ResourcePool entity, ResourcePoolUpdate updateEntity);
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolRef.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolRef.java
deleted file mode 100644
index 5371ba8d2edbc52029fbc78d76812aaa744565fe..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolRef.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * manages resource capacity with the resource state
- */
-@Schema(description = "manages resource capacity with the resource state")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-@Entity(name = "ResourcePoolRef")
-@JsonIgnoreProperties({ "uuid" })
-public class ResourcePoolRef extends BaseRootEntity {
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("resources")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> resources = new HashSet<>();
-
-	public ResourcePoolRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * A string. Indicates the type of the referred object. This attribute is to be
-	 * used when the object is representing a reference to an existing object
-	 * instead of the of the object itself.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "A string. Indicates the type of the referred object. This attribute is to be used when the object is representing a reference to an existing object instead of the of the object itself.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	public ResourcePoolRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * A string. Identifier of an instance of the Resource Pool.
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "A string. Identifier of an instance of the Resource Pool.")
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ResourcePoolRef resources(Set<ResourceRef> resourceCollection) {
-		this.resources = resourceCollection;
-		return this;
-	}
-
-	public ResourcePoolRef addResourcesItem(ResourceRef resourceCollectionItem) {
-		if (this.resources == null) {
-			this.resources = new HashSet<>();
-		}
-		this.resources.add(resourceCollectionItem);
-		return this;
-	}
-
-	/**
-	 * Get resourceCollection
-	 * 
-	 * @return resourceCollection
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<ResourceRef> getResources() {
-		return resources;
-	}
-
-	public void setResources(Set<ResourceRef> resourceCollection) {
-		this.resources = resourceCollection;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourcePoolRef resourcePoolRef = (ResourcePoolRef) o;
-		return Objects.equals(this._atReferredType, resourcePoolRef._atReferredType)
-				&& Objects.equals(this.href, resourcePoolRef.href) && Objects.equals(this.id, resourcePoolRef.id)
-				&& Objects.equals(this.resources, resourcePoolRef.resources);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atReferredType, href, id, resources);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourcePoolRef {\n");
-
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    resourceCollection: ").append(toIndentedString(resources)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolUpdate.java b/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolUpdate.java
deleted file mode 100644
index 0e6b236d225044816ed84c9d5ccb78dfd29c9a0e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/rpm685/model/ResourcePoolUpdate.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.etsi.osl.tmf.rpm685.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * manages resource capacity with the resource state Skipped properties: id,href
- */
-@Schema(description = "manages resource capacity with the resource state Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-10-05T08:56:49.602231700+03:00[Europe/Athens]")
-public class ResourcePoolUpdate {
-	@JsonProperty("@baseType")
-	private String _atBaseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String _atSchemaLocation = null;
-
-	@JsonProperty("@type")
-	private String _atType = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("relatedParty")
-	private String relatedParty = null;
-
-
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("capacity")
-	@Valid
-	private Capacity capacity = null;
-
-	public ResourcePoolUpdate _atBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-		return this;
-	}
-
-	/**
-	 * A string. Generic attribute indicating the base class type of the extension
-	 * class of the current object. Useful only when the class type of the current
-	 * object is unknown to the implementation.
-	 * 
-	 * @return _atBaseType
-	 **/
-	@Schema(description = "A string. Generic attribute indicating the base class type of the extension class of the current object. Useful only when the class type of the current  object is unknown to the implementation.")
-
-	public String getAtBaseType() {
-		return _atBaseType;
-	}
-
-	public void setAtBaseType(String _atBaseType) {
-		this._atBaseType = _atBaseType;
-	}
-
-	public ResourcePoolUpdate _atSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * A string. Generic attribute containing the link to the schema that defines
-	 * the structure of the class type of the current object.
-	 * 
-	 * @return _atSchemaLocation
-	 **/
-	@Schema(description = "A string. Generic attribute containing the link to the schema that defines the structure of the class type of the current object.")
-
-	public String getAtSchemaLocation() {
-		return _atSchemaLocation;
-	}
-
-	public void setAtSchemaLocation(String _atSchemaLocation) {
-		this._atSchemaLocation = _atSchemaLocation;
-	}
-
-	public ResourcePoolUpdate _atType(String _atType) {
-		this._atType = _atType;
-		return this;
-	}
-
-	/**
-	 * A string. Generic attribute containing the name of the resource class type.
-	 * 
-	 * @return _atType
-	 **/
-	@Schema(description = "A string. Generic attribute containing the name of the resource class type.")
-
-	public String getAtType() {
-		return _atType;
-	}
-
-	public void setAtType(String _atType) {
-		this._atType = _atType;
-	}
-
-	public ResourcePoolUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A string. free-text description of the Resource Pool.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A string. free-text description of the Resource Pool.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ResourcePoolUpdate relatedParty(String relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	/**
-	 * A related party defines party or party role linked to a specific entity, who
-	 * uses the resource of Resource Pool.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A related party defines party or party role linked to a specific entity, who uses the resource of Resource Pool.")
-
-	public String getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(String relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the capacity
-	 */
-	public Capacity getCapacity() {
-		return capacity;
-	}
-
-	/**
-	 * @param capacity the capacity to set
-	 */
-	public void setCapacity( Capacity capacity) {
-		this.capacity = capacity;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ResourcePoolUpdate resourcePoolUpdate = (ResourcePoolUpdate) o;
-		return Objects.equals(this._atBaseType, resourcePoolUpdate._atBaseType)
-				&& Objects.equals(this._atSchemaLocation, resourcePoolUpdate._atSchemaLocation)
-				&& Objects.equals(this._atType, resourcePoolUpdate._atType)
-				&& Objects.equals(this.description, resourcePoolUpdate.description)
-				&& Objects.equals(this.relatedParty, resourcePoolUpdate.relatedParty);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(_atBaseType, _atSchemaLocation, _atType, description, relatedParty);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ResourcePoolUpdate {\n");
-
-		sb.append("    _atBaseType: ").append(toIndentedString(_atBaseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(_atSchemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(_atType)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/Error.java b/src/main/java/org/etsi/osl/tmf/sac640/model/Error.java
deleted file mode 100644
index fa1825ed34c0693c33ab28777ae251ebf81d3cd7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/Error.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscription.java
deleted file mode 100644
index e0e4e631ce0d978a8ea2cb5fc15c8d354a370cc8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscription.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscriptionInput.java
deleted file mode 100644
index 264377e8934720ce4e8a5e8f255fd56ec4ef1779..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/HeaderItem.java b/src/main/java/org/etsi/osl/tmf/sac640/model/HeaderItem.java
deleted file mode 100644
index 9d6cad883d5e57ae0a0b450ec5896abc58ec5eb7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/HeaderItem.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * An item typically included in a request or response
- */
-@Schema(description = "An item typically included in a request or response")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class HeaderItem   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("value")
-  private String value = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public HeaderItem name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of the header item, e.g. locale
-   * @return name
-  **/
-  @Schema(description = "The name of the header item, e.g. locale")
-      @NotNull
-
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public HeaderItem value(String value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * The value of the header item, e.g. en-us
-   * @return value
-  **/
-  @Schema(description = "The value of the header item, e.g. en-us")
-      @NotNull
-
-    public String getValue() {
-    return value;
-  }
-
-  public void setValue(String value) {
-    this.value = value;
-  }
-
-  public HeaderItem baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public HeaderItem schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public HeaderItem type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HeaderItem headerItem = (HeaderItem) o;
-    return Objects.equals(this.name, headerItem.name) &&
-        Objects.equals(this.value, headerItem.value) &&
-        Objects.equals(this.baseType, headerItem.baseType) &&
-        Objects.equals(this.schemaLocation, headerItem.schemaLocation) &&
-        Objects.equals(this.type, headerItem.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, value, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HeaderItem {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/Monitor.java b/src/main/java/org/etsi/osl/tmf/sac640/model/Monitor.java
deleted file mode 100644
index 9eaebb337db7f7d33e3bfa0b5ce27cb0e3f12399..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/Monitor.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Monitoring of resources
- */
-@Schema(description = "Monitoring of resources")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class Monitor   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("sourceHref")
-  private String sourceHref = null;
-
-  @JsonProperty("state")
-  private String state = null;
-
-  @JsonProperty("request")
-  private Request request = null;
-
-  @JsonProperty("response")
-  private Response response = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Monitor id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of an instance of the monitor. Required to be unique within the resource type.  Used in URIs as the identifier for specific instances of a type
-   * @return id
-  **/
-  @Schema(description = "Identifier of an instance of the monitor. Required to be unique within the resource type.  Used in URIs as the identifier for specific instances of a type")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Monitor href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * reference to this monitor
-   * @return href
-  **/
-  @Schema(description = "reference to this monitor")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public Monitor sourceHref(String sourceHref) {
-    this.sourceHref = sourceHref;
-    return this;
-  }
-
-  /**
-   * The monitored resource href
-   * @return sourceHref
-  **/
-  @Schema(description = "The monitored resource href")
-  
-    public String getSourceHref() {
-    return sourceHref;
-  }
-
-  public void setSourceHref(String sourceHref) {
-    this.sourceHref = sourceHref;
-  }
-
-  public Monitor state(String state) {
-    this.state = state;
-    return this;
-  }
-
-  /**
-   * The Monitor state of the resource.  InProgress, InError, Completed
-   * @return state
-  **/
-  @Schema(description = "The Monitor state of the resource.  InProgress, InError, Completed")
-  
-    public String getState() {
-    return state;
-  }
-
-  public void setState(String state) {
-    this.state = state;
-  }
-
-  public Monitor request(Request request) {
-    this.request = request;
-    return this;
-  }
-
-  /**
-   * Get request
-   * @return request
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Request getRequest() {
-    return request;
-  }
-
-  public void setRequest(Request request) {
-    this.request = request;
-  }
-
-  public Monitor response(Response response) {
-    this.response = response;
-    return this;
-  }
-
-  /**
-   * Get response
-   * @return response
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Response getResponse() {
-    return response;
-  }
-
-  public void setResponse(Response response) {
-    this.response = response;
-  }
-
-  public Monitor baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Monitor schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Monitor type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Monitor monitor = (Monitor) o;
-    return Objects.equals(this.id, monitor.id) &&
-        Objects.equals(this.href, monitor.href) &&
-        Objects.equals(this.sourceHref, monitor.sourceHref) &&
-        Objects.equals(this.state, monitor.state) &&
-        Objects.equals(this.request, monitor.request) &&
-        Objects.equals(this.response, monitor.response) &&
-        Objects.equals(this.baseType, monitor.baseType) &&
-        Objects.equals(this.schemaLocation, monitor.schemaLocation) &&
-        Objects.equals(this.type, monitor.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, sourceHref, state, request, response, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Monitor {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    sourceHref: ").append(toIndentedString(sourceHref)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    request: ").append(toIndentedString(request)).append("\n");
-    sb.append("    response: ").append(toIndentedString(response)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeEvent.java
deleted file mode 100644
index c1f57f292681fda17bb47f9e57e4c84b4d0e712f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorAttributeValueChangeEvent   {
-  @JsonProperty("monitor")
-  private Monitor monitor = null;
-
-  public MonitorAttributeValueChangeEvent monitor(Monitor monitor) {
-    this.monitor = monitor;
-    return this;
-  }
-
-  /**
-   * Get monitor
-   * @return monitor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Monitor getMonitor() {
-    return monitor;
-  }
-
-  public void setMonitor(Monitor monitor) {
-    this.monitor = monitor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorAttributeValueChangeEvent monitorAttributeValueChangeEvent = (MonitorAttributeValueChangeEvent) o;
-    return Objects.equals(this.monitor, monitorAttributeValueChangeEvent.monitor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(monitor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorAttributeValueChangeEvent {\n");
-    
-    sb.append("    monitor: ").append(toIndentedString(monitor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeNotification.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeNotification.java
deleted file mode 100644
index d7ae820568631626699cc784a26466e82f935710..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorAttributeValueChangeNotification.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorAttributeValueChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private MonitorAttributeValueChangeEvent event = null;
-
-  public MonitorAttributeValueChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public MonitorAttributeValueChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public MonitorAttributeValueChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public MonitorAttributeValueChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public MonitorAttributeValueChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-  
-    public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public MonitorAttributeValueChangeNotification event(MonitorAttributeValueChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public MonitorAttributeValueChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(MonitorAttributeValueChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorAttributeValueChangeNotification monitorAttributeValueChangeNotification = (MonitorAttributeValueChangeNotification) o;
-    return Objects.equals(this.eventId, monitorAttributeValueChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, monitorAttributeValueChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, monitorAttributeValueChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, monitorAttributeValueChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, monitorAttributeValueChangeNotification.resourcePath) &&
-        Objects.equals(this.event, monitorAttributeValueChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorAttributeValueChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateEvent.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateEvent.java
deleted file mode 100644
index 6c4f2d989964d06ac9c4dbfbffb88d17cba19401..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateEvent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorCreateEvent   {
-  @JsonProperty("monitor")
-  private Monitor monitor = null;
-
-  public MonitorCreateEvent monitor(Monitor monitor) {
-    this.monitor = monitor;
-    return this;
-  }
-
-  /**
-   * Get monitor
-   * @return monitor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Monitor getMonitor() {
-    return monitor;
-  }
-
-  public void setMonitor(Monitor monitor) {
-    this.monitor = monitor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorCreateEvent monitorCreateEvent = (MonitorCreateEvent) o;
-    return Objects.equals(this.monitor, monitorCreateEvent.monitor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(monitor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorCreateEvent {\n");
-    
-    sb.append("    monitor: ").append(toIndentedString(monitor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateNotification.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateNotification.java
deleted file mode 100644
index 2efceaa72a3f008257cd65bf508d5a17ccaeb9c2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorCreateNotification.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorCreateNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private MonitorCreateEvent event = null;
-
-  public MonitorCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public MonitorCreateNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public MonitorCreateNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public MonitorCreateNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public MonitorCreateNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-  
-    public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public MonitorCreateNotification event(MonitorCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public MonitorCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(MonitorCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorCreateNotification monitorCreateNotification = (MonitorCreateNotification) o;
-    return Objects.equals(this.eventId, monitorCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, monitorCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, monitorCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, monitorCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, monitorCreateNotification.resourcePath) &&
-        Objects.equals(this.event, monitorCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteEvent.java
deleted file mode 100644
index 9fe5ca38c4f210d5af0b03b8b45b89e03e83cc42..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteEvent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorDeleteEvent   {
-  @JsonProperty("monitor")
-  private Monitor monitor = null;
-
-  public MonitorDeleteEvent monitor(Monitor monitor) {
-    this.monitor = monitor;
-    return this;
-  }
-
-  /**
-   * Get monitor
-   * @return monitor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Monitor getMonitor() {
-    return monitor;
-  }
-
-  public void setMonitor(Monitor monitor) {
-    this.monitor = monitor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorDeleteEvent monitorDeleteEvent = (MonitorDeleteEvent) o;
-    return Objects.equals(this.monitor, monitorDeleteEvent.monitor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(monitor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorDeleteEvent {\n");
-    
-    sb.append("    monitor: ").append(toIndentedString(monitor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteNotification.java
deleted file mode 100644
index 1c7ac6ebe0a0f10a1ec2140e49485726558c5f60..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorDeleteNotification.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorDeleteNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private MonitorDeleteEvent event = null;
-
-  public MonitorDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public MonitorDeleteNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public MonitorDeleteNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public MonitorDeleteNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public MonitorDeleteNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-  
-    public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public MonitorDeleteNotification event(MonitorDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public MonitorDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(MonitorDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorDeleteNotification monitorDeleteNotification = (MonitorDeleteNotification) o;
-    return Objects.equals(this.eventId, monitorDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, monitorDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, monitorDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, monitorDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, monitorDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, monitorDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeEvent.java
deleted file mode 100644
index 4d860316e10c5a58e97d8f8a73153b36f99ad8a6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeEvent.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorStateChangeEvent   {
-  @JsonProperty("monitor")
-  private Monitor monitor = null;
-
-  public MonitorStateChangeEvent monitor(Monitor monitor) {
-    this.monitor = monitor;
-    return this;
-  }
-
-  /**
-   * Get monitor
-   * @return monitor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Monitor getMonitor() {
-    return monitor;
-  }
-
-  public void setMonitor(Monitor monitor) {
-    this.monitor = monitor;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorStateChangeEvent monitorStateChangeEvent = (MonitorStateChangeEvent) o;
-    return Objects.equals(this.monitor, monitorStateChangeEvent.monitor);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(monitor);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorStateChangeEvent {\n");
-    
-    sb.append("    monitor: ").append(toIndentedString(monitor)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeNotification.java b/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeNotification.java
deleted file mode 100644
index 6cd970e0001cc456e2fddb31d6812166c03e4537..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/MonitorStateChangeNotification.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class MonitorStateChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private MonitorStateChangeEvent event = null;
-
-  public MonitorStateChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public MonitorStateChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public MonitorStateChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public MonitorStateChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public MonitorStateChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-  
-    public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public MonitorStateChangeNotification event(MonitorStateChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public MonitorStateChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(MonitorStateChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MonitorStateChangeNotification monitorStateChangeNotification = (MonitorStateChangeNotification) o;
-    return Objects.equals(this.eventId, monitorStateChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, monitorStateChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, monitorStateChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, monitorStateChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, monitorStateChangeNotification.resourcePath) &&
-        Objects.equals(this.event, monitorStateChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MonitorStateChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/Request.java b/src/main/java/org/etsi/osl/tmf/sac640/model/Request.java
deleted file mode 100644
index 7605896099d24ea34c9954867d7deb63a6a87f00..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/Request.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A response to a request
- */
-@Schema(description = "A response to a request")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class Request   {
-  @JsonProperty("body")
-  private String body = null;
-
-  @JsonProperty("method")
-  private String method = null;
-
-  @JsonProperty("to")
-  private String to = null;
-
-  @JsonProperty("header")
-  @Valid
-  private List<HeaderItem> header = new ArrayList<>();
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Request body(String body) {
-    this.body = body;
-    return this;
-  }
-
-  /**
-   * The body of the request. For example for an HTTP request might contain content of a form .
-   * @return body
-  **/
-  @Schema(description = "The body of the request. For example for an HTTP request might contain content of a form .")
-      @NotNull
-
-    public String getBody() {
-    return body;
-  }
-
-  public void setBody(String body) {
-    this.body = body;
-  }
-
-  public Request method(String method) {
-    this.method = method;
-    return this;
-  }
-
-  /**
-   * The protocol of the request, e.g. http
-   * @return method
-  **/
-  @Schema(description = "The protocol of the request, e.g. http")
-  
-    public String getMethod() {
-    return method;
-  }
-
-  public void setMethod(String method) {
-    this.method = method;
-  }
-
-  public Request to(String to) {
-    this.to = to;
-    return this;
-  }
-
-  /**
-   * The target of the request, e.g. a URL for an HTTP request
-   * @return to
-  **/
-  @Schema(description = "The target of the request, e.g. a URL for an HTTP request")
-  
-    public String getTo() {
-    return to;
-  }
-
-  public void setTo(String to) {
-    this.to = to;
-  }
-
-  public Request header(List<HeaderItem> header) {
-    this.header = header;
-    return this;
-  }
-
-  public Request addHeaderItem(HeaderItem headerItem) {
-    this.header.add(headerItem);
-    return this;
-  }
-
-  /**
-   * Items included in the header of the request. For example for an HTTP request might contain requested locale, basic authentication.
-   * @return header
-  **/
-  @Schema(description = "Items included in the header of the request. For example for an HTTP request might contain requested locale, basic authentication.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<HeaderItem> getHeader() {
-    return header;
-  }
-
-  public void setHeader(List<HeaderItem> header) {
-    this.header = header;
-  }
-
-  public Request baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Request schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Request type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Request request = (Request) o;
-    return Objects.equals(this.body, request.body) &&
-        Objects.equals(this.method, request.method) &&
-        Objects.equals(this.to, request.to) &&
-        Objects.equals(this.header, request.header) &&
-        Objects.equals(this.baseType, request.baseType) &&
-        Objects.equals(this.schemaLocation, request.schemaLocation) &&
-        Objects.equals(this.type, request.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(body, method, to, header, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Request {\n");
-    
-    sb.append("    body: ").append(toIndentedString(body)).append("\n");
-    sb.append("    method: ").append(toIndentedString(method)).append("\n");
-    sb.append("    to: ").append(toIndentedString(to)).append("\n");
-    sb.append("    header: ").append(toIndentedString(header)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sac640/model/Response.java b/src/main/java/org/etsi/osl/tmf/sac640/model/Response.java
deleted file mode 100644
index df16c517767c6190d293da757dea0e24d4236140..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sac640/model/Response.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sac640.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * A response to a request
- */
-@Schema(description = "A response to a request")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-04-29T12:42:32.118457300+03:00[Europe/Athens]")
-public class Response   {
-  @JsonProperty("body")
-  private String body = null;
-
-  @JsonProperty("statusCode")
-  private String statusCode = null;
-
-  @JsonProperty("header")
-  @Valid
-  private List<HeaderItem> header = new ArrayList<>();
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Response body(String body) {
-    this.body = body;
-    return this;
-  }
-
-  /**
-   * The body of the response. For example for an HTTP response might contain HTML for rendering.
-   * @return body
-  **/
-  @Schema(description = "The body of the response. For example for an HTTP response might contain HTML for rendering.")
-      @NotNull
-
-    public String getBody() {
-    return body;
-  }
-
-  public void setBody(String body) {
-    this.body = body;
-  }
-
-  public Response statusCode(String statusCode) {
-    this.statusCode = statusCode;
-    return this;
-  }
-
-  /**
-   * The status of the response. For example for an HTTP response would be codes such as 200, 400, etc.
-   * @return statusCode
-  **/
-  @Schema(description = "The status of the response. For example for an HTTP response would be codes such as 200, 400, etc.")
-  
-    public String getStatusCode() {
-    return statusCode;
-  }
-
-  public void setStatusCode(String statusCode) {
-    this.statusCode = statusCode;
-  }
-
-  public Response header(List<HeaderItem> header) {
-    this.header = header;
-    return this;
-  }
-
-  public Response addHeaderItem(HeaderItem headerItem) {
-    this.header.add(headerItem);
-    return this;
-  }
-
-  /**
-   * Items included in the header of the response. For example for an HTTP response might contain negotiated locale.
-   * @return header
-  **/
-  @Schema(description = "Items included in the header of the response. For example for an HTTP response might contain negotiated locale.")
-      @NotNull
-    @Valid
-  @Size(min=1)   public List<HeaderItem> getHeader() {
-    return header;
-  }
-
-  public void setHeader(List<HeaderItem> header) {
-    this.header = header;
-  }
-
-  public Response baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Response schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Response type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Response response = (Response) o;
-    return Objects.equals(this.body, response.body) &&
-        Objects.equals(this.statusCode, response.statusCode) &&
-        Objects.equals(this.header, response.header) &&
-        Objects.equals(this.baseType, response.baseType) &&
-        Objects.equals(this.schemaLocation, response.schemaLocation) &&
-        Objects.equals(this.type, response.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(body, statusCode, header, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Response {\n");
-    
-    sb.append("    body: ").append(toIndentedString(body)).append("\n");
-    sb.append("    statusCode: ").append(toIndentedString(statusCode)).append("\n");
-    sb.append("    header: ").append(toIndentedString(header)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/Error.java b/src/main/java/org/etsi/osl/tmf/scm633/model/Error.java
deleted file mode 100644
index 8e1a0c66593038f92d98f0981c5bbf8d3f93458d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscription.java
deleted file mode 100644
index 80807b87e1b66eb1573a9076d840ee4e8c727545..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscriptionInput.java
deleted file mode 100644
index f09423d3c08644ae7a70f70e565d2a3e92a063f4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJob.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJob.java
deleted file mode 100644
index d514e7d86137c92b40446937c2ad2e5256cda638..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJob.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to export resources to a file
- */
-@Schema(description = "Represents a task used to export resources to a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ExportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ExportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the export job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the export job")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ExportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the export job
-   * @return href
-  **/
-  @Schema(description = "Reference of the export job")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ExportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJob query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJob status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the export job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the export job (not started, running, succeeded, failed)")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public ExportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJob baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ExportJob schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ExportJob type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJob exportJob = (ExportJob) o;
-    return Objects.equals(this.id, exportJob.id) &&
-        Objects.equals(this.href, exportJob.href) &&
-        Objects.equals(this.completionDate, exportJob.completionDate) &&
-        Objects.equals(this.contentType, exportJob.contentType) &&
-        Objects.equals(this.creationDate, exportJob.creationDate) &&
-        Objects.equals(this.errorLog, exportJob.errorLog) &&
-        Objects.equals(this.path, exportJob.path) &&
-        Objects.equals(this.query, exportJob.query) &&
-        Objects.equals(this.status, exportJob.status) &&
-        Objects.equals(this.url, exportJob.url) &&
-        Objects.equals(this.baseType, exportJob.baseType) &&
-        Objects.equals(this.schemaLocation, exportJob.schemaLocation) &&
-        Objects.equals(this.type, exportJob.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, query, status, url, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJobCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJobCreate.java
deleted file mode 100644
index e5b0593ebcfd1978508db4b0a82d9dc6bceff7ea..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ExportJobCreate.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to export resources to a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to export resources to a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ExportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ExportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Data at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Data at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ExportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * The format of the exported data
-   * @return contentType
-  **/
-  @Schema(description = "The format of the exported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ExportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ExportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ExportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource acting as the source for streaming content to the file specified by the export job
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource acting as the source for streaming content to the file specified by the export job")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ExportJobCreate query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * Used to scope the exported data
-   * @return query
-  **/
-  @Schema(description = "Used to scope the exported data")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-  public ExportJobCreate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the export job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the export job (not started, running, succeeded, failed)")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public ExportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be exported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be exported")
-  @NotNull
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ExportJobCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ExportJobCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ExportJobCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ExportJobCreate exportJobCreate = (ExportJobCreate) o;
-    return Objects.equals(this.completionDate, exportJobCreate.completionDate) &&
-        Objects.equals(this.contentType, exportJobCreate.contentType) &&
-        Objects.equals(this.creationDate, exportJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, exportJobCreate.errorLog) &&
-        Objects.equals(this.path, exportJobCreate.path) &&
-        Objects.equals(this.query, exportJobCreate.query) &&
-        Objects.equals(this.status, exportJobCreate.status) &&
-        Objects.equals(this.url, exportJobCreate.url) &&
-        Objects.equals(this.baseType, exportJobCreate.baseType) &&
-        Objects.equals(this.schemaLocation, exportJobCreate.schemaLocation) &&
-        Objects.equals(this.type, exportJobCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, query, status, url, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ExportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJob.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJob.java
deleted file mode 100644
index 4456b08f256bd8b5e35ef5056996c94d09bcf44c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJob.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Represents a task used to import resources from a file
- */
-@Schema(description = "Represents a task used to import resources from a file")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ImportJob   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ImportJob id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Identifier of the import job
-   * @return id
-  **/
-  @Schema(description = "Identifier of the import job")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ImportJob href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Reference of the import job
-   * @return href
-  **/
-  @Schema(description = "Reference of the import job")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ImportJob completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJob contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJob creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJob errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJob path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJob status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the import job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the import job (not started, running, succeeded, failed)")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public ImportJob url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJob baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ImportJob schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ImportJob type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJob importJob = (ImportJob) o;
-    return Objects.equals(this.id, importJob.id) &&
-        Objects.equals(this.href, importJob.href) &&
-        Objects.equals(this.completionDate, importJob.completionDate) &&
-        Objects.equals(this.contentType, importJob.contentType) &&
-        Objects.equals(this.creationDate, importJob.creationDate) &&
-        Objects.equals(this.errorLog, importJob.errorLog) &&
-        Objects.equals(this.path, importJob.path) &&
-        Objects.equals(this.status, importJob.status) &&
-        Objects.equals(this.url, importJob.url) &&
-        Objects.equals(this.baseType, importJob.baseType) &&
-        Objects.equals(this.schemaLocation, importJob.schemaLocation) &&
-        Objects.equals(this.type, importJob.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href, completionDate, contentType, creationDate, errorLog, path, status, url, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJob {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJobCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJobCreate.java
deleted file mode 100644
index 1326f27d6a977024766344cab1af31cd07d56986..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ImportJobCreate.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Represents a task used to import resources from a file Skipped properties: id,href
- */
-@Schema(description = "Represents a task used to import resources from a file Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ImportJobCreate   {
-  @JsonProperty("completionDate")
-  private OffsetDateTime completionDate = null;
-
-  @JsonProperty("contentType")
-  private String contentType = null;
-
-  @JsonProperty("creationDate")
-  private OffsetDateTime creationDate = null;
-
-  @JsonProperty("errorLog")
-  private String errorLog = null;
-
-  @JsonProperty("path")
-  private String path = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("url")
-  private String url = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public ImportJobCreate completionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was completed
-   * @return completionDate
-  **/
-  @Schema(description = "Date at which the job was completed")
-
-  @Valid
-
-  public OffsetDateTime getCompletionDate() {
-    return completionDate;
-  }
-
-  public void setCompletionDate(OffsetDateTime completionDate) {
-    this.completionDate = completionDate;
-  }
-
-  public ImportJobCreate contentType(String contentType) {
-    this.contentType = contentType;
-    return this;
-  }
-
-  /**
-   * Indicates the format of the imported data
-   * @return contentType
-  **/
-  @Schema(description = "Indicates the format of the imported data")
-
-
-  public String getContentType() {
-    return contentType;
-  }
-
-  public void setContentType(String contentType) {
-    this.contentType = contentType;
-  }
-
-  public ImportJobCreate creationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-    return this;
-  }
-
-  /**
-   * Date at which the job was created
-   * @return creationDate
-  **/
-  @Schema(description = "Date at which the job was created")
-
-  @Valid
-
-  public OffsetDateTime getCreationDate() {
-    return creationDate;
-  }
-
-  public void setCreationDate(OffsetDateTime creationDate) {
-    this.creationDate = creationDate;
-  }
-
-  public ImportJobCreate errorLog(String errorLog) {
-    this.errorLog = errorLog;
-    return this;
-  }
-
-  /**
-   * Reason for failure if status is failed
-   * @return errorLog
-  **/
-  @Schema(description = "Reason for failure if status is failed")
-
-
-  public String getErrorLog() {
-    return errorLog;
-  }
-
-  public void setErrorLog(String errorLog) {
-    this.errorLog = errorLog;
-  }
-
-  public ImportJobCreate path(String path) {
-    this.path = path;
-    return this;
-  }
-
-  /**
-   * URL of the root resource where the content of the file specified by the import job must be applied
-   * @return path
-  **/
-  @Schema(description = "URL of the root resource where the content of the file specified by the import job must be applied")
-
-
-  public String getPath() {
-    return path;
-  }
-
-  public void setPath(String path) {
-    this.path = path;
-  }
-
-  public ImportJobCreate status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Status of the import job (not started, running, succeeded, failed)
-   * @return status
-  **/
-  @Schema(description = "Status of the import job (not started, running, succeeded, failed)")
-
-
-  public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public ImportJobCreate url(String url) {
-    this.url = url;
-    return this;
-  }
-
-  /**
-   * URL of the file containing the data to be imported
-   * @return url
-  **/
-  @Schema(description = "URL of the file containing the data to be imported")
-  @NotNull
-
-
-  public String getUrl() {
-    return url;
-  }
-
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
-  public ImportJobCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ImportJobCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ImportJobCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ImportJobCreate importJobCreate = (ImportJobCreate) o;
-    return Objects.equals(this.completionDate, importJobCreate.completionDate) &&
-        Objects.equals(this.contentType, importJobCreate.contentType) &&
-        Objects.equals(this.creationDate, importJobCreate.creationDate) &&
-        Objects.equals(this.errorLog, importJobCreate.errorLog) &&
-        Objects.equals(this.path, importJobCreate.path) &&
-        Objects.equals(this.status, importJobCreate.status) &&
-        Objects.equals(this.url, importJobCreate.url) &&
-        Objects.equals(this.baseType, importJobCreate.baseType) &&
-        Objects.equals(this.schemaLocation, importJobCreate.schemaLocation) &&
-        Objects.equals(this.type, importJobCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(completionDate, contentType, creationDate, errorLog, path, status, url, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ImportJobCreate {\n");
-    
-    sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-    sb.append("    contentType: ").append(toIndentedString(contentType)).append("\n");
-    sb.append("    creationDate: ").append(toIndentedString(creationDate)).append("\n");
-    sb.append("    errorLog: ").append(toIndentedString(errorLog)).append("\n");
-    sb.append("    path: ").append(toIndentedString(path)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    url: ").append(toIndentedString(url)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidate.java
deleted file mode 100644
index 73c2384920286df6d30cefd764a92ad9cd08161b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidate.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * ServiceCandidate is an entity that makes a service specification available to
- * a catalog. A ServiceCandidate and its associated service specification may be
- * published - made visible - in any number of service catalogs, or in none. One
- * service specification can be composed of other service specifications.
- */
-@Schema(description = "ServiceCandidate is an entity that makes a service specification available to a catalog. A ServiceCandidate and its associated service specification may be published - made visible - in any number of service catalogs, or in none. One service specification can be composed of other service specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Entity(name = "ServiceCandidate" )
-@Table( name = "ServiceCandidate" )
-
-public class ServiceCandidate extends BaseEntity {
-
-	
-	@ManyToMany( mappedBy ="serviceCandidateObj", cascade = {CascadeType.MERGE,  CascadeType.DETACH} )
-	@JsonIgnore
-	private Set<ServiceCategory> categoryObj = new HashSet<>();
-
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(name = "service_specid", referencedColumnName = "uuid")
-	@JsonIgnore
-	private ServiceSpecification serviceSpecificationObj = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-	
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if ( uuid != null ) {
-			return uuid;			
-		} else {
-			return id;
-		}
-	}
-	
-	
-	public ServiceCandidate() {
-		super();
-		this.type = "ServiceCandidate";
-		this.baseType = "BaseEntity";
-	}
-	
-	
-	
-
-	public String getVersion() {
-		if ( this.serviceSpecificationObj != null )
-		{
-			return this.serviceSpecificationObj.getVersion();
-		}
-		
-		return null;
-	}
-
-	public String getName() {
-		if ( this.serviceSpecificationObj != null )
-		{
-			return this.serviceSpecificationObj.getName();
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * The service specification implied by this candidate
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The service specification implied by this candidate")
-
-	@Transient
-	@JsonProperty("serviceSpecification")
-	@Valid
-	public ServiceSpecificationRef getServiceSpecificationRef() {
-		if ( this.serviceSpecificationObj != null )
-		{
-			ServiceSpecificationRef sref = new ServiceSpecificationRef();
-			
-			sref.setId(  this.serviceSpecificationObj.getUuid());
-			sref.setName(  this.serviceSpecificationObj.getName() );
-			sref.setVersion( this.serviceSpecificationObj.getVersion());
-			sref.setBaseType(ServiceSpecificationRef.class.getName());
-			return sref;			
-		}
-		
-		return null;
-	}
-
-	
-	/**
-	 * @return the serviceSpecificationObj
-	 */
-	public ServiceSpecification getServiceSpecificationObj() {
-		return serviceSpecificationObj;
-	}
-
-
-
-
-	/**
-	 * @param serviceSpecificationObj the serviceSpecificationObj to set
-	 */
-
-	@JsonProperty("serviceSpecification")
-	public void setServiceSpecificationObj(ServiceSpecification serviceSpecificationObj) {
-		this.serviceSpecificationObj = serviceSpecificationObj;
-	}
-
-
-
-
-	/**
-	 * The service specification implied by this candidate
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The category specification implied by this candidate")
-
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ServiceCategoryRef> getCategory() {
-
-		List<ServiceCategoryRef> category = new ArrayList<>();
-
-		for (ServiceCategory serviceCategory : categoryObj) {
-			ServiceCategoryRef scr = new ServiceCategoryRef();
-			scr.setId(serviceCategory.getId());
-			scr.setName(serviceCategory.getName());
-			scr.setBaseType(ServiceCategoryRef.class.getName());
-			category.add(scr);
-		}
-
-		return category;
-	}
-
-
-
-	
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCandidate serviceCandidate = (ServiceCandidate) o;
-		return Objects.equals(this.id, serviceCandidate.id) && Objects.equals(this.href, serviceCandidate.href)
-				&& Objects.equals(this.description, serviceCandidate.description)
-				&& Objects.equals(this.lastUpdate, serviceCandidate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceCandidate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceCandidate.name)
-				&& Objects.equals(this.version, serviceCandidate.version)
-				&& Objects.equals(this.getCategory(), serviceCandidate.getCategory())
-				&& Objects.equals(this.getServiceSpecificationRef() , serviceCandidate.getServiceSpecificationRef() )
-				&& Objects.equals(this.validFor, serviceCandidate.validFor)
-				&& Objects.equals(this.baseType, serviceCandidate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCandidate.schemaLocation)
-				&& Objects.equals(this.type, serviceCandidate.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, lastUpdate, lifecycleStatus, name, version, getCategory(),
-//				getServiceSpecificationRef() , validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCandidate {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(getCategory())).append("\n");
-		sb.append("    serviceSpecification: ").append(toIndentedString(getServiceSpecificationRef() )).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ServiceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ServiceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeEvent.java
deleted file mode 100644
index 13002bf30c537563b49111ae0e47b9e310db9a3b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateChangeEvent   {
-  @JsonProperty("serviceCandidate")
-  private ServiceCandidate serviceCandidate = null;
-
-  public ServiceCandidateChangeEvent serviceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCandidate
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCandidate getServiceCandidate() {
-    return serviceCandidate;
-  }
-
-  public void setServiceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateChangeEvent serviceCandidateChangeEvent = (ServiceCandidateChangeEvent) o;
-    return Objects.equals(this.serviceCandidate, serviceCandidateChangeEvent.serviceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateChangeEvent {\n");
-    
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeNotification.java
deleted file mode 100644
index 3664a01b57767a4def279942a62fa506b14b85a0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateChangeNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCandidateChangeEvent event = null;
-
-  public ServiceCandidateChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCandidateChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCandidateChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCandidateChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCandidateChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCandidateChangeNotification event(ServiceCandidateChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCandidateChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCandidateChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateChangeNotification serviceCandidateChangeNotification = (ServiceCandidateChangeNotification) o;
-    return Objects.equals(this.eventId, serviceCandidateChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCandidateChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCandidateChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCandidateChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCandidateChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCandidateChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreate.java
deleted file mode 100644
index d3e878f4729f9e6c275ae3ef8aaa6498b58dfd69..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreate.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ServiceCandidate is an entity that makes a service specification available to a catalog. A ServiceCandidate and its associated service specification may be published - made visible - in any number of service catalogs, or in none. One service specification can be composed of other service specifications. Skipped properties: id,href
- */
-@Schema(description = "ServiceCandidate is an entity that makes a service specification available to a catalog. A ServiceCandidate and its associated service specification may be published - made visible - in any number of service catalogs, or in none. One service specification can be composed of other service specifications. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateCreate extends ServiceCandidateUpdate  {
-  
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-  
-  /**
-   * Date and time of the last update of this REST resource
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update of this REST resource")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateCreate serviceCandidateCreate = (ServiceCandidateCreate) o;
-    return Objects.equals(this.description, serviceCandidateCreate.description) &&
-        Objects.equals(this.lastUpdate, serviceCandidateCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, serviceCandidateCreate.lifecycleStatus) &&
-        Objects.equals(this.name, serviceCandidateCreate.name) &&
-        Objects.equals(this.version, serviceCandidateCreate.version) &&
-        Objects.equals(this.category, serviceCandidateCreate.category) &&
-        Objects.equals(this.serviceSpecification, serviceCandidateCreate.serviceSpecification) &&
-        Objects.equals(this.validFor, serviceCandidateCreate.validFor) &&
-        Objects.equals(this.baseType, serviceCandidateCreate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCandidateCreate.schemaLocation) &&
-        Objects.equals(this.type, serviceCandidateCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, lastUpdate, lifecycleStatus, name, version, category, serviceSpecification, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateEvent.java
deleted file mode 100644
index 4e4cfbe88d6f2f7a191b71b6d117aa7b028fcb70..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateCreateEvent   {
-  @JsonProperty("serviceCandidate")
-  private ServiceCandidate serviceCandidate = null;
-
-  public ServiceCandidateCreateEvent serviceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCandidate
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCandidate getServiceCandidate() {
-    return serviceCandidate;
-  }
-
-  public void setServiceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateCreateEvent serviceCandidateCreateEvent = (ServiceCandidateCreateEvent) o;
-    return Objects.equals(this.serviceCandidate, serviceCandidateCreateEvent.serviceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateCreateEvent {\n");
-    
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateNotification.java
deleted file mode 100644
index 93656ac14957da58023489d372c17a9991fc89b2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateCreateNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateCreateNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCandidateCreateEvent event = null;
-
-  public ServiceCandidateCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCandidateCreateNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCandidateCreateNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCandidateCreateNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCandidateCreateNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCandidateCreateNotification event(ServiceCandidateCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCandidateCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCandidateCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateCreateNotification serviceCandidateCreateNotification = (ServiceCandidateCreateNotification) o;
-    return Objects.equals(this.eventId, serviceCandidateCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCandidateCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCandidateCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCandidateCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCandidateCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCandidateCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteEvent.java
deleted file mode 100644
index af13cb2e040063dd0b5b0adcb55a0ebd02a7134a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateDeleteEvent   {
-  @JsonProperty("serviceCandidate")
-  private ServiceCandidate serviceCandidate = null;
-
-  public ServiceCandidateDeleteEvent serviceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCandidate
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCandidate getServiceCandidate() {
-    return serviceCandidate;
-  }
-
-  public void setServiceCandidate(ServiceCandidate serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateDeleteEvent serviceCandidateDeleteEvent = (ServiceCandidateDeleteEvent) o;
-    return Objects.equals(this.serviceCandidate, serviceCandidateDeleteEvent.serviceCandidate);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCandidate);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateDeleteEvent {\n");
-    
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteNotification.java
deleted file mode 100644
index a6331bca1afb57f2427399011c995e3435b49e94..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateDeleteNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateDeleteNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCandidateDeleteEvent event = null;
-
-  public ServiceCandidateDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCandidateDeleteNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCandidateDeleteNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCandidateDeleteNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCandidateDeleteNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCandidateDeleteNotification event(ServiceCandidateDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCandidateDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCandidateDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCandidateDeleteNotification serviceCandidateDeleteNotification = (ServiceCandidateDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceCandidateDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCandidateDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCandidateDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCandidateDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCandidateDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCandidateDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCandidateDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateRef.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateRef.java
deleted file mode 100644
index f9bcb47b0b4651b3b1d8b742eebba2353d870dbb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateRef.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * ServiceCandidate reference. ServiceCandidate is an entity that makes a
- * ServiceSpecification available to a catalog.
- */
-@Schema(description = "ServiceCandidate reference. ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateRef extends BaseRootNamedEntity {
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ServiceCandidateRef() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ServiceCandidateRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Version of the service candidate
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Version of the service candidate")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceCandidateRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCandidateRef serviceCandidateRef = (ServiceCandidateRef) o;
-		return Objects.equals(this.id, serviceCandidateRef.id) && Objects.equals(this.href, serviceCandidateRef.href)
-				&& Objects.equals(this.name, serviceCandidateRef.name)
-				&& Objects.equals(this.version, serviceCandidateRef.version)
-				&& Objects.equals(this.baseType, serviceCandidateRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCandidateRef.schemaLocation)
-				&& Objects.equals(this.type, serviceCandidateRef.type)
-				&& Objects.equals(this.referredType, serviceCandidateRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, version, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCandidateRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateUpdate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateUpdate.java
deleted file mode 100644
index f89e201e0675a2560f57ccb4ace2a895318faf2f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCandidateUpdate.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ServiceCandidate is an entity that makes a service specification available to
- * a catalog. A ServiceCandidate and its associated service specification may be
- * published - made visible - in any number of service catalogs, or in none. One
- * service specification can be composed of other service specifications.
- * Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "ServiceCandidate is an entity that makes a service specification available to a catalog. A ServiceCandidate and its associated service specification may be published - made visible - in any number of service catalogs, or in none. One service specification can be composed of other service specifications. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCandidateUpdate {
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("category")
-	@Valid
-	protected List<ServiceCategoryRef> category = null;
-
-	@JsonProperty("serviceSpecification")
-	protected ServiceSpecificationRef serviceSpecification = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ServiceCandidateUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this REST resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this REST resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceCandidateUpdate lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of the service candidate.
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of the service candidate.")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ServiceCandidateUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceCandidateUpdate version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * the version of service candidate
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "the version of service candidate")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceCandidateUpdate category(List<ServiceCategoryRef> category) {
-		this.category = category;
-		return this;
-	}
-
-	public ServiceCandidateUpdate addCategoryItem(ServiceCategoryRef categoryItem) {
-		if (this.category == null) {
-			this.category = new ArrayList<ServiceCategoryRef>();
-		}
-		this.category.add(categoryItem);
-		return this;
-	}
-
-	/**
-	 * List of categories for this candidate
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of categories for this candidate")
-
-	@Valid
-
-	public List<ServiceCategoryRef> getCategory() {
-		return category;
-	}
-
-	public void setCategory(List<ServiceCategoryRef> category) {
-		this.category = category;
-	}
-
-	public ServiceCandidateUpdate serviceSpecification(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecification = serviceSpecification;
-		return this;
-	}
-
-	/**
-	 * The service specification implied by this candidate
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The service specification implied by this candidate")
-
-	@Valid
-
-	public ServiceSpecificationRef getServiceSpecification() {
-		return serviceSpecification;
-	}
-
-	public void setServiceSpecification(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecification = serviceSpecification;
-	}
-
-	public ServiceCandidateUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which this REST resource is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which this REST resource is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ServiceCandidateUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceCandidateUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceCandidateUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCandidateUpdate serviceCandidateUpdate = (ServiceCandidateUpdate) o;
-		return Objects.equals(this.description, serviceCandidateUpdate.description)
-				&& Objects.equals(this.lifecycleStatus, serviceCandidateUpdate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceCandidateUpdate.name)
-				&& Objects.equals(this.version, serviceCandidateUpdate.version)
-				&& Objects.equals(this.category, serviceCandidateUpdate.category)
-				&& Objects.equals(this.serviceSpecification, serviceCandidateUpdate.serviceSpecification)
-				&& Objects.equals(this.validFor, serviceCandidateUpdate.validFor)
-				&& Objects.equals(this.baseType, serviceCandidateUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCandidateUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceCandidateUpdate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(description, lifecycleStatus, name, version, category, serviceSpecification, validFor,
-				baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCandidateUpdate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalog.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalog.java
deleted file mode 100644
index a07874bdab51c13c26aa5e98afc10270190a0fed..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalog.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for service catalog management. A service catalog is a group
- * of service specifications made available through service candidates that an
- * organization provides to the consumers (internal consumers like its employees
- * or B2B customers or B2C customers). A service catalog typically includes
- * name, description and time period that is valid for. It will have a list of
- * ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a
- * ServiceSpecification available to a catalog. A ServiceCandidate and its
- * associated ServiceSpecification may be \&quot;published\&quot; - made visible
- * -in any number of ServiceCatalogs, or in none.
- */
-@Schema(description = "The root entity for service catalog management. A service catalog is a group of service specifications made available through service candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).  A service catalog typically includes name, description and time period that is valid for. It will have a list of ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog. A ServiceCandidate and its associated ServiceSpecification may be \"published\" - made visible -in any number of ServiceCatalogs, or in none.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceCatalog")
-@Table( name = "ServiceCatalog" )
-public class ServiceCatalog extends BaseEntity{
-
-		
-	
-		
-	@ManyToMany(cascade = {  CascadeType.DETACH } )
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ServiceCategory> categoryObj = new HashSet<>();
-	
-	
-
-	@Transient
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-
-	public ServiceCatalog() {
-		super();
-		this.type = "ServiceCatalog";
-		this.baseType = "BaseEntity";
-	}
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-	
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return uuid;
-	}
-
-//	/**
-//	 * @param id the id to set
-//	 */
-//	public void setId(String id) {		
-//		this.id = id;
-//	}
-
-	/**
-	 * List of service categories associated with this catalog
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of service categories associated with this catalog")
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ServiceCategoryRef> getCategoryRefs() {
-
-		List<ServiceCategoryRef> category = new ArrayList<>();
-		
-		for (ServiceCategory serviceCategory : categoryObj) {
-			ServiceCategoryRef scr = new ServiceCategoryRef();
-			scr.setId( serviceCategory.getId());
-			scr.setName( serviceCategory.getName());
-			scr.setBaseType( ServiceCategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	/**
-	 * @param crefs
-	 */
-	public void  setCategoryRefs( List<ServiceCategoryRef> crefs){
-		for (ServiceCategoryRef serviceCategoryRef : crefs) {
-			ServiceCategory e = new ServiceCategory();
-			e.setUuid( serviceCategoryRef.getId() );
-			e.setName(serviceCategoryRef.getName());
-			categoryObj.add(e );
-		}
-	}
-	
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ServiceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ServiceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-	
-
-//	public void setCategory(List<ServiceCategoryRef> category) {
-//		this.category = category;
-//	}
-
-	public ServiceCatalog relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceCatalog addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<RelatedParty>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * List of parties or party roles related to this category
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "List of parties or party roles related to this category")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCatalog serviceCatalog = (ServiceCatalog) o;
-		return Objects.equals(this.id, serviceCatalog.id) && Objects.equals(this.href, serviceCatalog.href)
-				&& Objects.equals(this.description, serviceCatalog.description)
-				&& Objects.equals(this.lastUpdate, serviceCatalog.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceCatalog.lifecycleStatus)
-				&& Objects.equals(this.name, serviceCatalog.name)
-				&& Objects.equals(this.version, serviceCatalog.version)
-				&& Objects.equals(this.getCategoryRefs(), serviceCatalog.getCategoryRefs())
-				&& Objects.equals(this.relatedParty, serviceCatalog.relatedParty)
-				&& Objects.equals(this.validFor, serviceCatalog.validFor)
-				&& Objects.equals(this.baseType, serviceCatalog.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCatalog.schemaLocation)
-				&& Objects.equals(this.type, serviceCatalog.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, lastUpdate, lifecycleStatus, name, version, this.getCategoryRefs(), relatedParty,
-//				validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCatalog {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(this.getCategoryRefs())).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	
-
-	public void addCategory(ServiceCategory servcat) {
-		if (!categoryObj.contains(servcat) ) {
-			categoryObj.add(servcat);
-		}
-		
-	}
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchEvent.java
deleted file mode 100644
index 5b24775f0f940fccff1a9411d1e3f8b8c91e6a29..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogBatchEvent   {
-  @JsonProperty("serviceCatalog")
-  private ServiceCatalog serviceCatalog = null;
-
-  public ServiceCatalogBatchEvent serviceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCatalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCatalog getServiceCatalog() {
-    return serviceCatalog;
-  }
-
-  public void setServiceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogBatchEvent serviceCatalogBatchEvent = (ServiceCatalogBatchEvent) o;
-    return Objects.equals(this.serviceCatalog, serviceCatalogBatchEvent.serviceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogBatchEvent {\n");
-    
-    sb.append("    serviceCatalog: ").append(toIndentedString(serviceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchNotification.java
deleted file mode 100644
index 876da07fe2303b3e887706600df6649a70d52a93..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogBatchNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogBatchNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCatalogBatchEvent event = null;
-
-  public ServiceCatalogBatchNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCatalogBatchNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCatalogBatchNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCatalogBatchNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCatalogBatchNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCatalogBatchNotification event(ServiceCatalogBatchEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCatalogBatchEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCatalogBatchEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogBatchNotification serviceCatalogBatchNotification = (ServiceCatalogBatchNotification) o;
-    return Objects.equals(this.eventId, serviceCatalogBatchNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCatalogBatchNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCatalogBatchNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCatalogBatchNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCatalogBatchNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCatalogBatchNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogBatchNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeEvent.java
deleted file mode 100644
index fc089109589bb17d9320e5b309f95aed28ac43cc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogChangeEvent   {
-  @JsonProperty("serviceCatalog")
-  private ServiceCatalog serviceCatalog = null;
-
-  public ServiceCatalogChangeEvent serviceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCatalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCatalog getServiceCatalog() {
-    return serviceCatalog;
-  }
-
-  public void setServiceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogChangeEvent serviceCatalogChangeEvent = (ServiceCatalogChangeEvent) o;
-    return Objects.equals(this.serviceCatalog, serviceCatalogChangeEvent.serviceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogChangeEvent {\n");
-    
-    sb.append("    serviceCatalog: ").append(toIndentedString(serviceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeNotification.java
deleted file mode 100644
index 7b84799e542ac5898ab19ad01363aeb11bb7aa53..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogChangeNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCatalogChangeEvent event = null;
-
-  public ServiceCatalogChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCatalogChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCatalogChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCatalogChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCatalogChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCatalogChangeNotification event(ServiceCatalogChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCatalogChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCatalogChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogChangeNotification serviceCatalogChangeNotification = (ServiceCatalogChangeNotification) o;
-    return Objects.equals(this.eventId, serviceCatalogChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCatalogChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCatalogChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCatalogChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCatalogChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCatalogChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreate.java
deleted file mode 100644
index f672c79868be29453d0d4b1fafd45996a608c346..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreate.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for service catalog management. A service catalog is a group of service specifications made available through service candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).  A service catalog typically includes name, description and time period that is valid for. It will have a list of ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog. A ServiceCandidate and its associated ServiceSpecification may be \&quot;published\&quot; - made visible -in any number of ServiceCatalogs, or in none. Skipped properties: id,href
- */
-@Schema(description = "The root entity for service catalog management. A service catalog is a group of service specifications made available through service candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).  A service catalog typically includes name, description and time period that is valid for. It will have a list of ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog. A ServiceCandidate and its associated ServiceSpecification may be \"published\" - made visible -in any number of ServiceCatalogs, or in none. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogCreate extends ServiceCatalogUpdate  {
-
-
-  @JsonProperty("lastUpdate")
-  private OffsetDateTime lastUpdate = null;
-
-
-
-
-  public ServiceCatalogCreate lastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-    return this;
-  }
-
-  /**
-   * Date and time of the last update
-   * @return lastUpdate
-  **/
-  @Schema(description = "Date and time of the last update")
-
-  @Valid
-
-  public OffsetDateTime getLastUpdate() {
-    return lastUpdate;
-  }
-
-  public void setLastUpdate(OffsetDateTime lastUpdate) {
-    this.lastUpdate = lastUpdate;
-  }
-
-  
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogCreate serviceCatalogCreate = (ServiceCatalogCreate) o;
-    return Objects.equals(this.description, serviceCatalogCreate.description) &&
-        Objects.equals(this.lastUpdate, serviceCatalogCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, serviceCatalogCreate.lifecycleStatus) &&
-        Objects.equals(this.name, serviceCatalogCreate.name) &&
-        Objects.equals(this.version, serviceCatalogCreate.version) &&
-        Objects.equals(this.category, serviceCatalogCreate.category) &&
-        Objects.equals(this.relatedParty, serviceCatalogCreate.relatedParty) &&
-        Objects.equals(this.validFor, serviceCatalogCreate.validFor) &&
-        Objects.equals(this.baseType, serviceCatalogCreate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCatalogCreate.schemaLocation) &&
-        Objects.equals(this.type, serviceCatalogCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, lastUpdate, lifecycleStatus, name, version, category, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateEvent.java
deleted file mode 100644
index d48cf87e9f100cb9cd4aff06d391332a6036d86d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogCreateEvent   {
-  @JsonProperty("serviceCatalog")
-  private ServiceCatalog serviceCatalog = null;
-
-  public ServiceCatalogCreateEvent serviceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCatalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCatalog getServiceCatalog() {
-    return serviceCatalog;
-  }
-
-  public void setServiceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogCreateEvent serviceCatalogCreateEvent = (ServiceCatalogCreateEvent) o;
-    return Objects.equals(this.serviceCatalog, serviceCatalogCreateEvent.serviceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogCreateEvent {\n");
-    
-    sb.append("    serviceCatalog: ").append(toIndentedString(serviceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateNotification.java
deleted file mode 100644
index 305b799e4932ef37a8a1cb582ed5da74e3783903..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogCreateNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogCreateNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCatalogCreateEvent event = null;
-
-  public ServiceCatalogCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCatalogCreateNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCatalogCreateNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCatalogCreateNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCatalogCreateNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCatalogCreateNotification event(ServiceCatalogCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCatalogCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCatalogCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogCreateNotification serviceCatalogCreateNotification = (ServiceCatalogCreateNotification) o;
-    return Objects.equals(this.eventId, serviceCatalogCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCatalogCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCatalogCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCatalogCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCatalogCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCatalogCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteEvent.java
deleted file mode 100644
index c6706547131ffc058a8a59affb1990c9226a6c3f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogDeleteEvent   {
-  @JsonProperty("serviceCatalog")
-  private ServiceCatalog serviceCatalog = null;
-
-  public ServiceCatalogDeleteEvent serviceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCatalog
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCatalog getServiceCatalog() {
-    return serviceCatalog;
-  }
-
-  public void setServiceCatalog(ServiceCatalog serviceCatalog) {
-    this.serviceCatalog = serviceCatalog;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogDeleteEvent serviceCatalogDeleteEvent = (ServiceCatalogDeleteEvent) o;
-    return Objects.equals(this.serviceCatalog, serviceCatalogDeleteEvent.serviceCatalog);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCatalog);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogDeleteEvent {\n");
-    
-    sb.append("    serviceCatalog: ").append(toIndentedString(serviceCatalog)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteNotification.java
deleted file mode 100644
index f337eb659ab888f0fbad9176fcaecda9ccec94db..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogDeleteNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogDeleteNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCatalogDeleteEvent event = null;
-
-  public ServiceCatalogDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCatalogDeleteNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCatalogDeleteNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCatalogDeleteNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCatalogDeleteNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCatalogDeleteNotification event(ServiceCatalogDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCatalogDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCatalogDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogDeleteNotification serviceCatalogDeleteNotification = (ServiceCatalogDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceCatalogDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCatalogDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCatalogDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCatalogDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCatalogDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCatalogDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogUpdate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogUpdate.java
deleted file mode 100644
index 4b03ddffef2e7439ad85362f50525375229c4e12..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCatalogUpdate.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The root entity for service catalog management. A service catalog is a group of service specifications made available through service candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).  A service catalog typically includes name, description and time period that is valid for. It will have a list of ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog. A ServiceCandidate and its associated ServiceSpecification may be \&quot;published\&quot; - made visible -in any number of ServiceCatalogs, or in none. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "The root entity for service catalog management. A service catalog is a group of service specifications made available through service candidates that an organization provides to the consumers (internal consumers like its employees or B2B customers or B2C customers).  A service catalog typically includes name, description and time period that is valid for. It will have a list of ServiceCandidate catalog items. A ServiceCandidate is an entity that makes a ServiceSpecification available to a catalog. A ServiceCandidate and its associated ServiceSpecification may be \"published\" - made visible -in any number of ServiceCatalogs, or in none. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCatalogUpdate   {
-  @JsonProperty("description")
-protected String description = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<ServiceCategoryRef> category = null;
-
-  @JsonProperty("relatedParty")
-  @Valid
-  protected List<RelatedParty> relatedParty = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public ServiceCatalogUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of this catalog
-   * @return description
-  **/
-  @Schema(description = "Description of this catalog")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceCatalogUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ServiceCatalogUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the service catalog
-   * @return name
-  **/
-  @Schema(description = "Name of the service catalog")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceCatalogUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * ServiceCatalog version
-   * @return version
-  **/
-  @Schema(description = "ServiceCatalog version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ServiceCatalogUpdate category(List<ServiceCategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public ServiceCatalogUpdate addCategoryItem(ServiceCategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<ServiceCategoryRef>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * List of service categories associated with this catalog
-   * @return category
-  **/
-  @Schema(description = "List of service categories associated with this catalog")
-
-  @Valid
-
-  public List<ServiceCategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<ServiceCategoryRef> category) {
-    this.category = category;
-  }
-
-  public ServiceCatalogUpdate relatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-    return this;
-  }
-
-  public ServiceCatalogUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-    if (this.relatedParty == null) {
-      this.relatedParty = new ArrayList<RelatedParty>();
-    }
-    this.relatedParty.add(relatedPartyItem);
-    return this;
-  }
-
-  /**
-   * List of parties or party roles related to this category
-   * @return relatedParty
-  **/
-  @Schema(description = "List of parties or party roles related to this category")
-
-  @Valid
-
-  public List<RelatedParty> getRelatedParty() {
-    return relatedParty;
-  }
-
-  public void setRelatedParty(List<RelatedParty> relatedParty) {
-    this.relatedParty = relatedParty;
-  }
-
-  public ServiceCatalogUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the service catalog is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the service catalog is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceCatalogUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ServiceCatalogUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceCatalogUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCatalogUpdate serviceCatalogUpdate = (ServiceCatalogUpdate) o;
-    return Objects.equals(this.description, serviceCatalogUpdate.description) &&
-        Objects.equals(this.lifecycleStatus, serviceCatalogUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, serviceCatalogUpdate.name) &&
-        Objects.equals(this.version, serviceCatalogUpdate.version) &&
-        Objects.equals(this.category, serviceCatalogUpdate.category) &&
-        Objects.equals(this.relatedParty, serviceCatalogUpdate.relatedParty) &&
-        Objects.equals(this.validFor, serviceCatalogUpdate.validFor) &&
-        Objects.equals(this.baseType, serviceCatalogUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCatalogUpdate.schemaLocation) &&
-        Objects.equals(this.type, serviceCatalogUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, lifecycleStatus, name, version, category, relatedParty, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCatalogUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategory.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategory.java
deleted file mode 100644
index c47aff63d4b44efc89f4177291e819f1e553e905..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategory.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-import jakarta.validation.Valid;
-
-/**
- * The (service) category resource is used to group service candidates in
- * logical containers. Categories can contain other categories.
- */
-@Schema(description = "The (service) category resource is used to group service candidates in logical containers. Categories can contain other categories.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceCategory")
-@Table( name = "ServiceCategory" )
-public class ServiceCategory extends BaseEntity {
-
-
-	@JsonProperty("isRoot")
-	private Boolean isRoot = null;
-
-
-	@JsonProperty("parentId")
-	private String parentId = null;
-
-
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.DETACH })
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ServiceCategory> categoryObj = new HashSet<>();
-	
-	
-
-	@ManyToMany(cascade = {  CascadeType.MERGE, CascadeType.REMOVE } )
-	@JoinTable()	
-	@JsonIgnore
-	private Set<ServiceCandidate> serviceCandidateObj = new HashSet<>();
-	
-	@JsonProperty("id")
-	protected String id = null;
-	
-	
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-//	@Transient
-//	@JsonProperty("serviceCandidate")
-//	@Valid
-//	private List<ServiceCandidateRef> serviceCandidate = null;
-
-
-	public ServiceCategory() {
-		super();
-		this.baseType = "BaseEntity";
-		this.type = "ServiceCategory";
-	}
-
-	
-
-
-	/**
-	 * If true, this Boolean indicates that the category is a root of categories
-	 * 
-	 * @return isRoot
-	 **/
-	@Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-	public Boolean isIsRoot() {
-		return isRoot;
-	}
-
-	public void setIsRoot(Boolean isRoot) {
-		if ( isRoot == null ) {
-			this.isRoot = true;
-		} else {
-			this.isRoot = isRoot;
-		}
-	}
-
-
-
-	/**
-	 * Unique identifier of the parent category
-	 * 
-	 * @return parentId
-	 **/
-	@Schema(description = "Unique identifier of the parent category")
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-
-
-
-
-
-	/**
-	 * List of child categories in the tree for in this category
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "List of child categories in the tree for in this category")
-	@Transient
-	@JsonProperty("category")
-	@Valid
-	public List<ServiceCategoryRef> getCategoryRefs() {
-
-		List<ServiceCategoryRef> category = new ArrayList<>();
-		
-		for (ServiceCategory serviceCategory : categoryObj) {
-			ServiceCategoryRef scr = new ServiceCategoryRef();
-			scr.setId( serviceCategory.getId());
-			scr.setName( serviceCategory.getName());
-			scr.setBaseType( ServiceCategoryRef.class.getName() );
-			category.add(scr);
-			
-		}
-		
-		return category;
-	}
-	
-	
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	@JsonProperty("category")
-	public void setCategoryObj(List<ServiceCategoryRef> alist) {
-		this.categoryObj.clear();
-		for (ServiceCategoryRef serviceCategoryRef : alist) {
-			ServiceCategory sc = new ServiceCategory();
-			sc.setUuid( serviceCategoryRef.getId());
-			sc.setName(serviceCategoryRef.getName());
-			sc.setBaseType(serviceCategoryRef.getBaseType());
-			this.categoryObj.add(sc);
-		}
-	}
-	
-
-	/**
-	 * @return the categoryObj
-	 */
-	public Set<ServiceCategory> getCategoryObj() {
-		return categoryObj;
-	}
-
-	/**
-	 * @param categoryObj the categoryObj to set
-	 */
-	public void setCategoryObj(Set<ServiceCategory> categoryObj) {
-		this.categoryObj = categoryObj;
-	}
-
-	
-
-	/**
-	 * List of service candidates associated with this category
-	 * 
-	 * @return serviceCandidate
-	 **/
-	@Schema(description = "List of service candidates associated with this category")
-
-	@Valid
-	@JsonProperty("serviceCandidate")
-	public List<ServiceCandidateRef> getServiceCandidateRefs() {
-		
-		List<ServiceCandidateRef> scref = new ArrayList<>();
-		
-		for (ServiceCandidate sc : serviceCandidateObj) {
-			ServiceCandidateRef scr = new ServiceCandidateRef();
-			scr.setId( sc.getId());
-			scr.setName( sc.getName());
-			scr.setVersion( sc.getVersion());
-			scr.setBaseType( ServiceCategoryRef.class.getName() );
-			scref.add(scr);
-		}
-		
-		return scref;
-	}
-
-	
-
-	/**
-	 * @return the serviceCandidateObj
-	 */
-	public Set<ServiceCandidate> getServiceCandidateObj() {
-		return serviceCandidateObj;
-	}
-
-
-
-
-	/**
-	 * @param serviceCandidateObj the serviceCandidateObj to set
-	 */
-	@JsonProperty("serviceCandidate")
-	public void setServiceCandidateObj(Set<ServiceCandidate> serviceCandidateObj) {
-		this.serviceCandidateObj = serviceCandidateObj;
-	}
-
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCategory serviceCategory = (ServiceCategory) o;
-		return Objects.equals(this.id, serviceCategory.id) && Objects.equals(this.href, serviceCategory.href)
-				&& Objects.equals(this.description, serviceCategory.description)
-				&& Objects.equals(this.isRoot, serviceCategory.isRoot)
-				&& Objects.equals(this.lastUpdate, serviceCategory.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceCategory.lifecycleStatus)
-				&& Objects.equals(this.name, serviceCategory.name)
-				&& Objects.equals(this.parentId, serviceCategory.parentId)
-				&& Objects.equals(this.version, serviceCategory.version)
-				&& Objects.equals(this.getCategoryRefs(), serviceCategory.getCategoryRefs())
-				&& Objects.equals(this.getServiceCandidateRefs(), serviceCategory.getServiceCandidateRefs())
-				&& Objects.equals(this.validFor, serviceCategory.validFor)
-				&& Objects.equals(this.baseType, serviceCategory.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCategory.schemaLocation)
-				&& Objects.equals(this.type, serviceCategory.type);
-	}
-//
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, description, isRoot, lastUpdate, lifecycleStatus, name, parentId, version,
-////				getCategoryObj(), getServiceCandidateObj(), 
-//				validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCategory {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(getCategoryRefs())).append("\n");
-		sb.append("    serviceCandidate: ").append(toIndentedString(getServiceCandidateRefs())).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeEvent.java
deleted file mode 100644
index 5f8037f13fa339afbe4fdb3d1557a906d713f1fc..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryChangeEvent   {
-  @JsonProperty("serviceCategory")
-  private ServiceCategory serviceCategory = null;
-
-  public ServiceCategoryChangeEvent serviceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCategory
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCategory getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryChangeEvent serviceCategoryChangeEvent = (ServiceCategoryChangeEvent) o;
-    return Objects.equals(this.serviceCategory, serviceCategoryChangeEvent.serviceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryChangeEvent {\n");
-    
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeNotification.java
deleted file mode 100644
index 4c67d118d6cd355c216d80557ec7b6de4008ffbb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryChangeNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCategoryChangeEvent event = null;
-
-  public ServiceCategoryChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCategoryChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCategoryChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCategoryChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCategoryChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCategoryChangeNotification event(ServiceCategoryChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCategoryChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCategoryChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryChangeNotification serviceCategoryChangeNotification = (ServiceCategoryChangeNotification) o;
-    return Objects.equals(this.eventId, serviceCategoryChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCategoryChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCategoryChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCategoryChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCategoryChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCategoryChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreate.java
deleted file mode 100644
index 263f1ae38f8d33ca0584af3c335d168ce3e54663..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreate.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The (service) category resource is used to group service candidates in
- * logical containers. Categories can contain other categories. Skipped
- * properties: id,href
- */
-@Schema(description = "The (service) category resource is used to group service candidates in logical containers. Categories can contain other categories. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryCreate extends ServiceCategoryUpdate {
-	
-
-	@JsonProperty("lastUpdate")
-	private OffsetDateTime lastUpdate = null;
-
-	
-
-	/**
-	 * Date and time of the last update
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update")
-
-	@Valid
-
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCategoryCreate serviceCategoryCreate = (ServiceCategoryCreate) o;
-		return Objects.equals(this.description, serviceCategoryCreate.description)
-				&& Objects.equals(this.isRoot, serviceCategoryCreate.isRoot)
-				&& Objects.equals(this.lastUpdate, serviceCategoryCreate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceCategoryCreate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceCategoryCreate.name)
-				&& Objects.equals(this.parentId, serviceCategoryCreate.parentId)
-				&& Objects.equals(this.version, serviceCategoryCreate.version)
-				&& Objects.equals(this.category, serviceCategoryCreate.category)
-				&& Objects.equals(this.serviceCandidate, serviceCategoryCreate.serviceCandidate)
-				&& Objects.equals(this.validFor, serviceCategoryCreate.validFor)
-				&& Objects.equals(this.baseType, serviceCategoryCreate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCategoryCreate.schemaLocation)
-				&& Objects.equals(this.type, serviceCategoryCreate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(description, isRoot, lastUpdate, lifecycleStatus, name, parentId, version, category,
-				serviceCandidate, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCategoryCreate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateEvent.java
deleted file mode 100644
index 4504d5ca39159876947a74d93a47e61f5b910ec7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryCreateEvent   {
-  @JsonProperty("serviceCategory")
-  private ServiceCategory serviceCategory = null;
-
-  public ServiceCategoryCreateEvent serviceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCategory
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCategory getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryCreateEvent serviceCategoryCreateEvent = (ServiceCategoryCreateEvent) o;
-    return Objects.equals(this.serviceCategory, serviceCategoryCreateEvent.serviceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryCreateEvent {\n");
-    
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateNotification.java
deleted file mode 100644
index bbfc7c08ce6774f75447635f345e6d17e5b6ef35..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryCreateNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryCreateNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCategoryCreateEvent event = null;
-
-  public ServiceCategoryCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCategoryCreateNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCategoryCreateNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCategoryCreateNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCategoryCreateNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCategoryCreateNotification event(ServiceCategoryCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCategoryCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCategoryCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryCreateNotification serviceCategoryCreateNotification = (ServiceCategoryCreateNotification) o;
-    return Objects.equals(this.eventId, serviceCategoryCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCategoryCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCategoryCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCategoryCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCategoryCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCategoryCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteEvent.java
deleted file mode 100644
index c08f183e4deaf59e00c99cc8f0d45f0fbd88f8d9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryDeleteEvent   {
-  @JsonProperty("serviceCategory")
-  private ServiceCategory serviceCategory = null;
-
-  public ServiceCategoryDeleteEvent serviceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceCategory
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceCategory getServiceCategory() {
-    return serviceCategory;
-  }
-
-  public void setServiceCategory(ServiceCategory serviceCategory) {
-    this.serviceCategory = serviceCategory;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryDeleteEvent serviceCategoryDeleteEvent = (ServiceCategoryDeleteEvent) o;
-    return Objects.equals(this.serviceCategory, serviceCategoryDeleteEvent.serviceCategory);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceCategory);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryDeleteEvent {\n");
-    
-    sb.append("    serviceCategory: ").append(toIndentedString(serviceCategory)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteNotification.java
deleted file mode 100644
index 3388698c4ebe522ea251020c466ed127a31e270a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryDeleteNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryDeleteNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceCategoryDeleteEvent event = null;
-
-  public ServiceCategoryDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceCategoryDeleteNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceCategoryDeleteNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceCategoryDeleteNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceCategoryDeleteNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceCategoryDeleteNotification event(ServiceCategoryDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCategoryDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCategoryDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryDeleteNotification serviceCategoryDeleteNotification = (ServiceCategoryDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceCategoryDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCategoryDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCategoryDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCategoryDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCategoryDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCategoryDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryRef.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryRef.java
deleted file mode 100644
index a641f0f90b79c3d9ef81d41e2a3f033080a98d74..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryRef.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * The (service) category resource is used to group service candidates in
- * logical containers. Categories can contain other categories.
- */
-@Schema(description = "The (service) category resource is used to group service candidates in logical containers. Categories can contain other categories.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@JsonIgnoreProperties( {"uuid"} )
-public class ServiceCategoryRef extends BaseRootNamedEntity {
-
-	
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	public ServiceCategoryRef() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ServiceCategoryRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-	
-	@JsonProperty("id")
-	protected String id = null;
-	
-	
-	
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceCategoryRef serviceCategoryRef = (ServiceCategoryRef) o;
-		return Objects.equals(this.id, serviceCategoryRef.id) && Objects.equals(this.href, serviceCategoryRef.href)
-				&& Objects.equals(this.name, serviceCategoryRef.name)
-				&& Objects.equals(this.baseType, serviceCategoryRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceCategoryRef.schemaLocation)
-				&& Objects.equals(this.type, serviceCategoryRef.type)
-				&& Objects.equals(this.referredType, serviceCategoryRef.referredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceCategoryRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryUpdate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryUpdate.java
deleted file mode 100644
index ca8597e3559ad3454687a6c31439f453f8f08d6b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceCategoryUpdate.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The (service) category resource is used to group service candidates in logical containers. Categories can contain other categories. Skipped properties: id,href,lastUpdate
- */
-@Schema(description = "The (service) category resource is used to group service candidates in logical containers. Categories can contain other categories. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceCategoryUpdate   {
-  @JsonProperty("description")
-  protected String description = null;
-
-  @JsonProperty("isRoot")
-  protected Boolean isRoot = null;
-
-  @JsonProperty("lifecycleStatus")
-  protected String lifecycleStatus = null;
-
-  @JsonProperty("name")
-  protected String name = null;
-
-  @JsonProperty("parentId")
-  protected String parentId = null;
-
-  @JsonProperty("version")
-  protected String version = null;
-
-  @JsonProperty("category")
-  @Valid
-  protected List<ServiceCategoryRef> category = null;
-
-  @JsonProperty("serviceCandidate")
-  @Valid
-  protected List<ServiceCandidateRef> serviceCandidate = null;
-
-  @JsonProperty("validFor")
-  protected TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  protected String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  protected String schemaLocation = null;
-
-  @JsonProperty("@type")
-  protected String type = null;
-
-  public ServiceCategoryUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * Description of the category
-   * @return description
-  **/
-  @Schema(description = "Description of the category")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceCategoryUpdate isRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-    return this;
-  }
-
-  /**
-   * If true, this Boolean indicates that the category is a root of categories
-   * @return isRoot
-  **/
-  @Schema(description = "If true, this Boolean indicates that the category is a root of categories")
-
-
-  public Boolean isIsRoot() {
-    return isRoot;
-  }
-
-  public void setIsRoot(Boolean isRoot) {
-    this.isRoot = isRoot;
-  }
-
-  public ServiceCategoryUpdate lifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-    return this;
-  }
-
-  /**
-   * Used to indicate the current lifecycle status
-   * @return lifecycleStatus
-  **/
-  @Schema(description = "Used to indicate the current lifecycle status")
-
-
-  public String getLifecycleStatus() {
-    return lifecycleStatus;
-  }
-
-  public void setLifecycleStatus(String lifecycleStatus) {
-    this.lifecycleStatus = lifecycleStatus;
-  }
-
-  public ServiceCategoryUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the category
-   * @return name
-  **/
-  @Schema(description = "Name of the category")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceCategoryUpdate parentId(String parentId) {
-    this.parentId = parentId;
-    return this;
-  }
-
-  /**
-   * Unique identifier of the parent category
-   * @return parentId
-  **/
-  @Schema(description = "Unique identifier of the parent category")
-
-
-  public String getParentId() {
-    return parentId;
-  }
-
-  public void setParentId(String parentId) {
-    this.parentId = parentId;
-  }
-
-  public ServiceCategoryUpdate version(String version) {
-    this.version = version;
-    return this;
-  }
-
-  /**
-   * ServiceCategory version
-   * @return version
-  **/
-  @Schema(description = "ServiceCategory version")
-
-
-  public String getVersion() {
-    return version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public ServiceCategoryUpdate category(List<ServiceCategoryRef> category) {
-    this.category = category;
-    return this;
-  }
-
-  public ServiceCategoryUpdate addCategoryItem(ServiceCategoryRef categoryItem) {
-    if (this.category == null) {
-      this.category = new ArrayList<ServiceCategoryRef>();
-    }
-    this.category.add(categoryItem);
-    return this;
-  }
-
-  /**
-   * List of child categories in the tree for in this category
-   * @return category
-  **/
-  @Schema(description = "List of child categories in the tree for in this category")
-
-  @Valid
-
-  public List<ServiceCategoryRef> getCategory() {
-    return category;
-  }
-
-  public void setCategory(List<ServiceCategoryRef> category) {
-    this.category = category;
-  }
-
-  public ServiceCategoryUpdate serviceCandidate(List<ServiceCandidateRef> serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-    return this;
-  }
-
-  public ServiceCategoryUpdate addServiceCandidateItem(ServiceCandidateRef serviceCandidateItem) {
-    if (this.serviceCandidate == null) {
-      this.serviceCandidate = new ArrayList<ServiceCandidateRef>();
-    }
-    this.serviceCandidate.add(serviceCandidateItem);
-    return this;
-  }
-
-  /**
-   * List of service candidates associated with this category
-   * @return serviceCandidate
-  **/
-  @Schema(description = "List of service candidates associated with this category")
-
-  @Valid
-
-  public List<ServiceCandidateRef> getServiceCandidate() {
-    return serviceCandidate;
-  }
-
-  public void setServiceCandidate(List<ServiceCandidateRef> serviceCandidate) {
-    this.serviceCandidate = serviceCandidate;
-  }
-
-  public ServiceCategoryUpdate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * The period for which the category is valid
-   * @return validFor
-  **/
-  @Schema(description = "The period for which the category is valid")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceCategoryUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public ServiceCategoryUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceCategoryUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCategoryUpdate serviceCategoryUpdate = (ServiceCategoryUpdate) o;
-    return Objects.equals(this.description, serviceCategoryUpdate.description) &&
-        Objects.equals(this.isRoot, serviceCategoryUpdate.isRoot) &&
-        Objects.equals(this.lifecycleStatus, serviceCategoryUpdate.lifecycleStatus) &&
-        Objects.equals(this.name, serviceCategoryUpdate.name) &&
-        Objects.equals(this.parentId, serviceCategoryUpdate.parentId) &&
-        Objects.equals(this.version, serviceCategoryUpdate.version) &&
-        Objects.equals(this.category, serviceCategoryUpdate.category) &&
-        Objects.equals(this.serviceCandidate, serviceCategoryUpdate.serviceCandidate) &&
-        Objects.equals(this.validFor, serviceCategoryUpdate.validFor) &&
-        Objects.equals(this.baseType, serviceCategoryUpdate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCategoryUpdate.schemaLocation) &&
-        Objects.equals(this.type, serviceCategoryUpdate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isRoot, lifecycleStatus, name, parentId, version, category, serviceCandidate, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCategoryUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isRoot: ").append(toIndentedString(isRoot)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    parentId: ").append(toIndentedString(parentId)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    serviceCandidate: ").append(toIndentedString(serviceCandidate)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceLevelSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceLevelSpecificationRef.java
deleted file mode 100644
index 1cb1bcc4d6781e52755b58dd94563ea753d411c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceLevelSpecificationRef.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-
-/**
- * A Service Level Specification represents a pre-defined or negotiated set of
- * Service Level Objectives. In addition, certain consequences are associated
- * with not meeting the Service Level Objectives. Service Level Agreements are
- * expressed in terms of Service Level Specifications.
- */
-@Schema(description = "A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceLevelSpecificationRef")
-public class ServiceLevelSpecificationRef extends BaseRootNamedEntity {
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ServiceLevelSpecificationRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	public ServiceLevelSpecificationRef() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ServiceLevelSpecificationRef(ServiceLevelSpecificationRef r) {
-		this();
-		name = r.name;
-		id = r.id;
-	}
-
-	public ServiceLevelSpecificationRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceLevelSpecificationRef serviceLevelSpecificationRef = (ServiceLevelSpecificationRef) o;
-		return Objects.equals(this.id, serviceLevelSpecificationRef.id)
-				&& Objects.equals(this.href, serviceLevelSpecificationRef.href)
-				&& Objects.equals(this.name, serviceLevelSpecificationRef.name)
-				&& Objects.equals(this.baseType, serviceLevelSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceLevelSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, serviceLevelSpecificationRef.type)
-				&& Objects.equals(this.referredType, serviceLevelSpecificationRef.referredType);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id, href, name, baseType, schemaLocation, type, referredType);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceLevelSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharRelationship.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharRelationship.java
deleted file mode 100644
index 2208da5a9ce39e3b0d987227a4d557d9829223c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharRelationship.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.validation.Valid;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity
- * relationship between/among serviceSpecCharacteristics.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among serviceSpecCharacteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Entity(name = "ServiceSpecCharRelationship")
-public class ServiceSpecCharRelationship {
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-	
-	
-	@JsonProperty("id")
-	protected String id = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-	
-	@JsonProperty("@baseType")
-	protected String baseType = "BaseEntity";
-
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-	
-
-	@JsonProperty("@type")
-	protected String type = null;
-	
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	
-	public ServiceSpecCharRelationship() {
-	}
-
-	public ServiceSpecCharRelationship(ServiceSpecCharRelationship src ){
-		name = src.name;
-		relationshipType = src.relationshipType;
-		role = src.role;
-		validFor = new TimePeriod( src.validFor );
-		id = src.id;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the baseType
-	 */
-	public String getBaseType() {
-		return baseType;
-	}
-
-	/**
-	 * @param baseType the baseType to set
-	 */
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	/**
-	 * @return the schemaLocation
-	 */
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	/**
-	 * @param schemaLocation the schemaLocation to set
-	 */
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	/**
-	 * @return the type
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public ServiceSpecCharRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of relationship such as aggregation, migration, substitution,
-	 * dependency, exclusivity
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of relationship such as aggregation, migration, substitution, dependency, exclusivity")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ServiceSpecCharRelationship role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * The association role for this service specification
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "The association role for this service specification")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public ServiceSpecCharRelationship validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the serviceSpecCharRelationship is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the serviceSpecCharRelationship is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecCharRelationship serviceSpecCharRelationship = (ServiceSpecCharRelationship) o;
-		return Objects.equals(this.id, serviceSpecCharRelationship.id)
-				&& Objects.equals(this.name, serviceSpecCharRelationship.name)
-				&& Objects.equals(this.relationshipType, serviceSpecCharRelationship.relationshipType)
-				&& Objects.equals(this.role, serviceSpecCharRelationship.role)
-				&& Objects.equals(this.validFor, serviceSpecCharRelationship.validFor)
-				&& Objects.equals(this.baseType, serviceSpecCharRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecCharRelationship.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecCharRelationship.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, name, relationshipType, role, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecCharRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristic.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristic.java
deleted file mode 100644
index 237cf53654de24ce83ff12229854ad9ef0f6b3aa..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristic.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-
-/**
- * This class represents the key features of this service specification. For
- * example, bandwidth is a characteristic of many different types of services;
- * if bandwidth is a relevant characteristic (e.g., from the point-of-view of a
- * Customer obtaining this Service via a Product) then bandwidth would be a
- * ServiceSpecCharacteristic for that particular Service.
- */
-@Schema(description = "This class represents the key features of this service specification. For example, bandwidth is a characteristic of many different types of services; if bandwidth is a relevant characteristic (e.g., from the point-of-view of a Customer obtaining this Service via a Product) then bandwidth would be a ServiceSpecCharacteristic for that particular Service.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceSpecCharacteristic")
-public class ServiceSpecCharacteristic extends BaseRootNamedEntity {
-	@JsonProperty("configurable")
-	private Boolean configurable = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("extensible")
-	private Boolean extensible = null;
-
-	@JsonProperty("isUnique")
-	private Boolean isUnique = null;
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("serviceSpecCharRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecCharRelationship> serviceSpecCharRelationship = new HashSet<>();
-
-	@JsonProperty("serviceSpecCharacteristicValue")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecCharacteristicValue> serviceSpecCharacteristicValue = new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@valueSchemaLocation")
-	private String valueSchemaLocation = null;
-	
-
-	@JsonProperty("id")
-	protected String id = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-	
-	public ServiceSpecCharacteristic configurable(Boolean configurable) {
-		this.configurable = configurable;
-		return this;
-	}
-
-	public ServiceSpecCharacteristic() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ServiceSpecCharacteristic(ServiceSpecCharacteristic src) {
-		this();
-		configurable = src.configurable;
-		description = src.description;
-		extensible = src.extensible;
-		isUnique = src.isUnique;
-		maxCardinality = src.maxCardinality;
-		minCardinality = src.minCardinality;
-		name = src.name;
-		regex = src.regex;
-		valueType = src.valueType;
-		validFor = new TimePeriod( src.validFor ) ;
-		
-		for (ServiceSpecCharRelationship r : src.serviceSpecCharRelationship) {
-			this.addServiceSpecCharRelationshipItem( new ServiceSpecCharRelationship( r ));
-		}
-		
-		for (ServiceSpecCharacteristicValue r : src.serviceSpecCharacteristicValue) {
-			this.addServiceSpecCharacteristicValueItem( new ServiceSpecCharacteristicValue(r) );
-		}
-
-	}
-
-	/**
-	 * If true, the Boolean indicates that the serviceSpecCharacteristic is
-	 * configurable
-	 * 
-	 * @return configurable
-	 **/
-	@Schema(description = "If true, the Boolean indicates that the serviceSpecCharacteristic is configurable")
-
-	public Boolean isConfigurable() {
-		return configurable;
-	}
-
-	public void setConfigurable(Boolean configurable) {
-		this.configurable = configurable;
-	}
-
-	public ServiceSpecCharacteristic description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative that explains in detail what the serviceSpecCharacteristic is
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative that explains in detail what the serviceSpecCharacteristic is")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceSpecCharacteristic extensible(Boolean extensible) {
-		this.extensible = extensible;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies that the values for the characteristic can be
-	 * extended by adding new values when instantiating a characteristic for an
-	 * Entity.
-	 * 
-	 * @return extensible
-	 **/
-	@Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for an Entity.")
-
-	public Boolean isExtensible() {
-		return extensible;
-	}
-
-	public void setExtensible(Boolean extensible) {
-		this.extensible = extensible;
-	}
-
-	public ServiceSpecCharacteristic isUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies if a value is unique for the specification.
-	 * Possible values are; \"unique while value is in effect\" and \"unique
-	 * whether value is in effect or not\"
-	 * 
-	 * @return isUnique
-	 **/
-	@Schema(description = "An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"")
-
-	public Boolean isIsUnique() {
-		return isUnique;
-	}
-
-	public void setIsUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-	}
-
-	public ServiceSpecCharacteristic maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where five
-	 * is the value for the maxCardinality.
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public ServiceSpecCharacteristic minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where zero
-	 * is the value for the minCardinality.
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-	public ServiceSpecCharacteristic regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A rule or principle represented in regular expression used to derive the
-	 * value of a characteristic value.
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value.")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ServiceSpecCharacteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric,
-	 * text and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ServiceSpecCharacteristic serviceSpecCharRelationship(
-			Set<ServiceSpecCharRelationship> serviceSpecCharRelationship) {
-		this.serviceSpecCharRelationship = serviceSpecCharRelationship;
-		return this;
-	}
-
-	public ServiceSpecCharacteristic addServiceSpecCharRelationshipItem(
-			ServiceSpecCharRelationship serviceSpecCharRelationshipItem) {
-		if (this.serviceSpecCharRelationship == null) {
-			this.serviceSpecCharRelationship = new HashSet<ServiceSpecCharRelationship>();
-		}
-		this.serviceSpecCharRelationship.add(serviceSpecCharRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service spec char relationships (ServiceSpecCharRelationship
-	 * [*]). An aggregation, migration, substitution, dependency or exclusivity
-	 * relationship between/among Specification Characteristics.
-	 * 
-	 * @return serviceSpecCharRelationship
-	 **/
-	@Schema(description = "A list of service spec char relationships (ServiceSpecCharRelationship [*]). An aggregation, migration, substitution, dependency or exclusivity relationship between/among Specification Characteristics.")
-
-	@Valid
-
-	public Set<ServiceSpecCharRelationship> getServiceSpecCharRelationship() {
-		return serviceSpecCharRelationship;
-	}
-
-	public void setServiceSpecCharRelationship(Set<ServiceSpecCharRelationship> serviceSpecCharRelationship) {
-		this.serviceSpecCharRelationship = serviceSpecCharRelationship;
-	}
-
-	public ServiceSpecCharacteristic serviceSpecCharacteristicValue(
-			Set<ServiceSpecCharacteristicValue> serviceSpecCharacteristicValue) {
-		this.serviceSpecCharacteristicValue = serviceSpecCharacteristicValue;
-		return this;
-	}
-
-	public ServiceSpecCharacteristic addServiceSpecCharacteristicValueItem(
-			ServiceSpecCharacteristicValue serviceSpecCharacteristicValueItem) {
-		if (this.serviceSpecCharacteristicValue == null) {
-			this.serviceSpecCharacteristicValue = new HashSet<ServiceSpecCharacteristicValue>();
-		}
-		this.serviceSpecCharacteristicValue.add(serviceSpecCharacteristicValueItem);
-		return this;
-	}
-
-	/**
-	 * A list of service spec characteristic values
-	 * (ServiceSpecCharacteristicValue [*]). A ServiceSpecCharacteristicValue
-	 * object is used to define a set of attributes, each of which can be
-	 * assigned to a corresponding set of attributes in a
-	 * ServiceSpecCharacteristic object. The values of the attributes in the
-	 * ServiceSpecCharacteristicValue object describe the values of the
-	 * attributes that a corresponding ServiceSpecCharacteristic object can take
-	 * on.
-	 * 
-	 * @return serviceSpecCharacteristicValue
-	 **/
-	@Schema(description = "A list of service spec characteristic values (ServiceSpecCharacteristicValue [*]). A ServiceSpecCharacteristicValue object is used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a ServiceSpecCharacteristic object. The values of the attributes in the ServiceSpecCharacteristicValue object describe the values of the attributes that a corresponding ServiceSpecCharacteristic object can take on.")
-
-	@Valid
-
-	public Set<ServiceSpecCharacteristicValue> getServiceSpecCharacteristicValue() {
-		return serviceSpecCharacteristicValue;
-	}
-
-	public void setServiceSpecCharacteristicValue(Set<ServiceSpecCharacteristicValue> serviceSpecCharacteristicValue) {
-		this.serviceSpecCharacteristicValue = serviceSpecCharacteristicValue;
-	}
-
-	public ServiceSpecCharacteristic validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the serviceSpecCharacteristic is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the serviceSpecCharacteristic is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ServiceSpecCharacteristic valueSchemaLocation(String valueSchemaLocation) {
-		this.valueSchemaLocation = valueSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * This (optional) field provides a link to the schema describing the value
-	 * type.
-	 * 
-	 * @return valueSchemaLocation
-	 **/
-	@Schema(description = "This (optional) field provides a link to the schema describing the value type.")
-
-	public String getValueSchemaLocation() {
-		return valueSchemaLocation;
-	}
-
-	public void setValueSchemaLocation(String valueSchemaLocation) {
-		this.valueSchemaLocation = valueSchemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecCharacteristic serviceSpecCharacteristic = (ServiceSpecCharacteristic) o;
-		return Objects.equals(this.configurable, serviceSpecCharacteristic.configurable)
-				&& Objects.equals(this.description, serviceSpecCharacteristic.description)
-				&& Objects.equals(this.extensible, serviceSpecCharacteristic.extensible)
-				&& Objects.equals(this.isUnique, serviceSpecCharacteristic.isUnique)
-				&& Objects.equals(this.maxCardinality, serviceSpecCharacteristic.maxCardinality)
-				&& Objects.equals(this.minCardinality, serviceSpecCharacteristic.minCardinality)
-				&& Objects.equals(this.name, serviceSpecCharacteristic.name)
-				&& Objects.equals(this.regex, serviceSpecCharacteristic.regex)
-				&& Objects.equals(this.valueType, serviceSpecCharacteristic.valueType)
-				&& Objects.equals(this.serviceSpecCharRelationship, serviceSpecCharacteristic.serviceSpecCharRelationship)
-				&& Objects.equals(this.serviceSpecCharacteristicValue,
-						serviceSpecCharacteristic.serviceSpecCharacteristicValue)
-				&& Objects.equals(this.validFor, serviceSpecCharacteristic.validFor)
-				&& Objects.equals(this.baseType, serviceSpecCharacteristic.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecCharacteristic.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecCharacteristic.type)
-				&& Objects.equals(this.valueSchemaLocation, serviceSpecCharacteristic.valueSchemaLocation);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, configurable, description, extensible, isUnique, maxCardinality, minCardinality, name,
-//				regex, valueType, serviceSpecCharRelationship, serviceSpecCharacteristicValue, validFor, baseType,
-//				schemaLocation, type, valueSchemaLocation);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecCharacteristic {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-		sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    serviceSpecCharRelationship: ").append(toIndentedString(serviceSpecCharRelationship))
-				.append("\n");
-		sb.append("    serviceSpecCharacteristicValue: ").append(toIndentedString(serviceSpecCharacteristicValue))
-				.append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    valueSchemaLocation: ").append(toIndentedString(valueSchemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(ServiceSpecCharacteristic src) {
-		this.name = src.getName();
-		this.description = src.getDescription();
-		this.maxCardinality = src.getMaxCardinality();
-		this.minCardinality = src.getMinCardinality();
-		this.regex = src.getRegex();
-		this.isUnique =src.isUnique;
-		this.configurable =src.isConfigurable();
-		this.extensible =src.isExtensible();
-		this.valueType =src.valueType;
-
-		this.updateServiceSpecCharacteristicValues(src.getServiceSpecCharacteristicValue());
-		this.updateServiceSpecCharRelationships(src.getServiceSpecCharRelationship());
-
-		
-	}
-
-
-
-	private void updateServiceSpecCharacteristicValues(
-			@Valid Set<ServiceSpecCharacteristicValue> srcSet) {
-
-		if ( srcSet == null ) {
-			return;
-		}
-		
-		Map<Integer, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (ServiceSpecCharacteristicValue r : srcSet) {
-
-			boolean valueExists = false;
-			for (ServiceSpecCharacteristicValue thisCharVal : this.serviceSpecCharacteristicValue) {
-				if ( thisCharVal.hashCode() == r.hashCode() ) {
-					valueExists = true;
-					idAddedUpdated.put(thisCharVal.hashCode(), true);
-					break;
-				}
-			}
-			
-			if (!valueExists) {
-				ServiceSpecCharacteristicValue nr = new ServiceSpecCharacteristicValue( r );
-				this.addServiceSpecCharacteristicValueItem( nr );
-				idAddedUpdated.put( nr.hashCode(), true);
-			}
-			
-		}
-		
-		/**
-		 * remove those that don't exist anymore
-		 */
-		
-		List<ServiceSpecCharacteristicValue> toRemove = new ArrayList<>();
-		for (ServiceSpecCharacteristicValue ss : this.serviceSpecCharacteristicValue) {
-			if ( idAddedUpdated.get( ss.hashCode() ) == null ) {
-				toRemove.add(ss);
-			}
-		}
-		
-		for (ServiceSpecCharacteristicValue r : toRemove) {
-			this.serviceSpecCharacteristicValue.remove(r);
-		}
-		
-		
-	}
-	
-	private void updateServiceSpecCharRelationships(
-			@Valid Set<ServiceSpecCharRelationship> srcSet) {
-		
-		
-		Map< String, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (ServiceSpecCharRelationship r : srcSet) {
-
-			boolean valueExists = false;
-			for (ServiceSpecCharRelationship thisCharVal : this.serviceSpecCharRelationship) {
-				if ( (thisCharVal.getId()!=null) && (thisCharVal.getId().equals(r.getId() ) )) {
-					valueExists = true;
-					idAddedUpdated.put( thisCharVal.getId() , true);
-					break;
-				}
-			}
-			
-			if (!valueExists) {
-				this.serviceSpecCharRelationship.add( new ServiceSpecCharRelationship( r ));
-				idAddedUpdated.put( r.getId(), true);
-			}
-			
-		}
-		
-		/**
-		 * remove those that don't exist anymore
-		 */
-		
-		List<ServiceSpecCharRelationship> toRemove = new ArrayList<>();
-		for (ServiceSpecCharRelationship ss : this.serviceSpecCharRelationship) {
-			if ( idAddedUpdated.get( ss.getId() ) == null ) {
-				toRemove.add(ss);
-			}
-		}
-		
-		for (ServiceSpecCharRelationship r : toRemove) {
-			this.serviceSpecCharRelationship.remove(r);
-		}
-		
-		
-	}
-	
-	@JsonIgnore
-	public String getDefaultValue( ) {
-		for (ServiceSpecCharacteristicValue val : this.getServiceSpecCharacteristicValue()) {
-			if (val.isIsDefault()) {
-				return val.getValue().getValue();
-				
-			}
-		}			
-	return null;
-	
-	
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristicValue.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristicValue.java
deleted file mode 100644
index 6c6b81ea922fa2c619f7bcd08925232834b0df91..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecCharacteristicValue.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A ServiceSpecCharacteristicValue object is used to define a set of
- * attributes, each of which can be assigned to a corresponding set of
- * attributes in a ServiceSpecCharacteristic object. The values of the
- * attributes in the ServiceSpecCharacteristicValue object describe the values
- * of the attributes that a corresponding ServiceSpecCharacteristic object can
- * take on.
- */
-@Schema(description = "A ServiceSpecCharacteristicValue object is used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a ServiceSpecCharacteristic object. The values of the attributes in the ServiceSpecCharacteristicValue object describe the values of the attributes that a corresponding ServiceSpecCharacteristic object can take on.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceSpecCharacteristicValue")
-public class ServiceSpecCharacteristicValue extends BaseRootEntity {
-	@JsonProperty("isDefault")
-	private Boolean isDefault = null;
-
-	@JsonProperty("rangeInterval")
-	private String rangeInterval = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("unitOfMeasure")
-	private String unitOfMeasure = null;
-
-	@JsonProperty("valueFrom")
-	private Integer valueFrom = null;
-
-	@JsonProperty("valueTo")
-	private Integer valueTo = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("value")
-	private Any value = null;
-
-	public ServiceSpecCharacteristicValue() {
-	}
-	
-	public ServiceSpecCharacteristicValue(ServiceSpecCharacteristicValue r) {
-		this();
-		isDefault = r.isDefault;
-		rangeInterval = r.rangeInterval;
-		regex = r.regex;
-		unitOfMeasure = r.unitOfMeasure;
-		valueFrom = r.valueFrom;
-		valueTo = r.valueTo;
-		valueType = r.valueType;
-		validFor = new TimePeriod( r.validFor );
-		value = new Any( r.value ) ;
-//		type = r.type;
-		baseType = r.baseType;
-		
-		
-	}
-
-	public ServiceSpecCharacteristicValue isDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-		return this;
-	}
-
-	/**
-	 * Indicates if the value is the default value for a characteristic
-	 * 
-	 * @return isDefault
-	 **/
-	@Schema(description = "Indicates if the value is the default value for a characteristic")
-
-	public Boolean isIsDefault() {
-		return isDefault;
-	}
-
-	public void setIsDefault(Boolean isDefault) {
-		this.isDefault = isDefault;
-	}
-
-	public ServiceSpecCharacteristicValue rangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies the inclusion or exclusion of the valueFrom and
-	 * valueTo attributes. If applicable, possible values are \"open\", \"closed\",
-	 * \"closedBottom\" and \"closedTop\".
-	 * 
-	 * @return rangeInterval
-	 **/
-	@Schema(description = "An indicator that specifies the inclusion or exclusion of the valueFrom and valueTo attributes. If applicable, possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-
-	public String getRangeInterval() {
-		return rangeInterval;
-	}
-
-	public void setRangeInterval(String rangeInterval) {
-		this.rangeInterval = rangeInterval;
-	}
-
-	public ServiceSpecCharacteristicValue regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A regular expression constraint for given value
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A regular expression constraint for given value")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public ServiceSpecCharacteristicValue unitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * A length, surface, volume, dry measure, liquid measure, money, weight, time,
-	 * and the like. In general, a determinate quantity or magnitude of the kind
-	 * designated, taken as a standard of comparison for others of the same kind, in
-	 * assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "A length, surface, volume, dry measure, liquid measure, money, weight, time, and the like. In general, a determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.")
-
-	public String getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	public ServiceSpecCharacteristicValue valueFrom(Integer valueFrom) {
-		this.valueFrom = valueFrom;
-		return this;
-	}
-
-	/**
-	 * The low range value that a characteristic can take on
-	 * 
-	 * @return valueFrom
-	 **/
-	@Schema(description = "The low range value that a characteristic can take on")
-
-	public Integer getValueFrom() {
-		return valueFrom;
-	}
-
-	public void setValueFrom(Integer valueFrom) {
-		this.valueFrom = valueFrom;
-	}
-
-	public ServiceSpecCharacteristicValue valueTo(Integer valueTo) {
-		this.valueTo = valueTo;
-		return this;
-	}
-
-	/**
-	 * The upper range value that a characteristic can take on
-	 * 
-	 * @return valueTo
-	 **/
-	@Schema(description = "The upper range value that a characteristic can take on")
-
-	public Integer getValueTo() {
-		return valueTo;
-	}
-
-	public void setValueTo(Integer valueTo) {
-		this.valueTo = valueTo;
-	}
-
-	public ServiceSpecCharacteristicValue valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text,
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text, and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public ServiceSpecCharacteristicValue validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period of time for which a value is applicable
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period of time for which a value is applicable")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ServiceSpecCharacteristicValue value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * A discrete value that the characteristic can take on, or the actual value of
-	 * the characteristic
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "A discrete value that the characteristic can take on, or the actual value of the characteristic")
-
-	@Valid
-
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecCharacteristicValue serviceSpecCharacteristicValue = (ServiceSpecCharacteristicValue) o;
-		return Objects.equals(this.isDefault, serviceSpecCharacteristicValue.isDefault)
-				&& Objects.equals(this.rangeInterval, serviceSpecCharacteristicValue.rangeInterval)
-				&& Objects.equals(this.regex, serviceSpecCharacteristicValue.regex)
-				&& Objects.equals(this.unitOfMeasure, serviceSpecCharacteristicValue.unitOfMeasure)
-				&& Objects.equals(this.valueFrom, serviceSpecCharacteristicValue.valueFrom)
-				&& Objects.equals(this.valueTo, serviceSpecCharacteristicValue.valueTo)
-				&& Objects.equals(this.valueType, serviceSpecCharacteristicValue.valueType)
-				&& Objects.equals(this.validFor, serviceSpecCharacteristicValue.validFor)
-				&& Objects.equals(this.value.getValue(), serviceSpecCharacteristicValue.value.getValue())
-				&& Objects.equals(this.value.getAlias(), serviceSpecCharacteristicValue.value.getAlias())
-				&& Objects.equals(this.baseType, serviceSpecCharacteristicValue.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecCharacteristicValue.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecCharacteristicValue.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, isDefault, rangeInterval, regex, unitOfMeasure, valueFrom, valueTo, valueType, validFor,
-//				value, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecCharacteristicValue {\n");
-
-		sb.append("    isDefault: ").append(toIndentedString(isDefault)).append("\n");
-		sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-		sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecRelationship.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecRelationship.java
deleted file mode 100644
index 8de43e8090c8f2e10cda36ebed0d41337a302eb6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecRelationship.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.Valid;
-
-/**
- * A migration, substitution, dependency or exclusivity relationship
- * between/among service specifications.
- */
-@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among service specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Entity(name = "ServiceSpecRelationship")
-public class ServiceSpecRelationship extends BaseRootNamedEntity {
-	
-
-	
-	
-	@JsonProperty("id")
-	protected String id = null;
-
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public ServiceSpecRelationship() {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();
-	}
-
-	public ServiceSpecRelationship(ServiceSpecRelationship src) {
-		this();
-		name = src.name;
-		relationshipType = src.relationshipType;
-		role = src.role;
-		validFor = new TimePeriod( src.validFor );
-		this.id = src.getId();
-		
-	}
-
-	public ServiceSpecRelationship id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	
-	/**
-	 * Unique identifier of the target serviceSpecification
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the target serviceSpecification")
-
-	public ServiceSpecRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of relationship such as migration, substitution, dependency, exclusivity
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of relationship such as migration, substitution, dependency, exclusivity")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public ServiceSpecRelationship role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * The association role for this service specification
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "The association role for this service specification")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public ServiceSpecRelationship validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the serviceSpecRelationship is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the serviceSpecRelationship is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecRelationship serviceSpecRelationship = (ServiceSpecRelationship) o;
-		return Objects.equals(this.id, serviceSpecRelationship.id)
-				&& Objects.equals(this.name, serviceSpecRelationship.name)
-				&& Objects.equals(this.relationshipType, serviceSpecRelationship.relationshipType)
-				&& Objects.equals(this.role, serviceSpecRelationship.role)
-				&& Objects.equals(this.validFor, serviceSpecRelationship.validFor)
-				&& Objects.equals(this.baseType, serviceSpecRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecRelationship.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecRelationship.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(id,  name, relationshipType, role, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecification.java
deleted file mode 100644
index adf9b59fd0971d4871c3659d56c35378ec6a29f6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecification.java
+++ /dev/null
@@ -1,572 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.sd.model.ServiceDescriptor;
-import org.etsi.osl.tmf.common.model.AttachmentRef;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * ServiceSpecification is a class that offers characteristics to describe a
- * type of service. Functionally, it acts as a template by which Services may be
- * instantiated. By sharing the same specification, these services would
- * therefore share the same set of characteristics.
- */
-/**
- * @author ctranoris
- *
- */
-@Schema(description = "ServiceSpecification is a class that offers characteristics to describe a type of service. Functionally, it acts as a template by which Services may be instantiated. By sharing the same  specification, these services would therefore share the same set of characteristics.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-@Entity(name = "ServiceSpecification")
-public class ServiceSpecification extends BaseEntity {
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AttachmentRef> attachment = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("resourceSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceSpecificationRef> resourceSpecification = new HashSet<>();
-
-	@JsonProperty("serviceLevelSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceLevelSpecificationRef> serviceLevelSpecification = new HashSet<>();
-
-	@JsonProperty("serviceSpecCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecCharacteristic> serviceSpecCharacteristic = new HashSet<>();
-
-	@JsonProperty("serviceSpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecRelationship> serviceSpecRelationship = new HashSet<>();
-
-	@JsonProperty("targetServiceSchema")
-	private TargetServiceSchema targetServiceSchema = null;
-
-	@JsonProperty("id")
-	protected String id = null;
-	
-	@OneToOne( cascade = {CascadeType.MERGE, CascadeType.DETACH} )
-    @JoinColumn(name = "service_descrid", referencedColumnName = "uuid")
-	@JsonIgnore
-	private ServiceDescriptor serviceDescriptor;
-	
-	
-	
-	@JsonIgnore
-	@Column( name = "candidate_specid" )
-	private String serviceCandidateObjId;
-
-	
-	/**
-	 * @return the serviceDescriptor
-	 */
-	public ServiceDescriptor getServiceDescriptor() {
-		return serviceDescriptor;
-	}
-
-	/**
-	 * @param serviceDescriptor the serviceDescriptor to set
-	 */
-	public void setServiceDescriptor(ServiceDescriptor serviceDescriptor) {
-		this.serviceDescriptor = serviceDescriptor;
-	}
-
-	/**
-	 * @return the serviceCandidateObjId
-	 */
-	public String getServiceCandidateObjId() {
-		return serviceCandidateObjId;
-	}
-
-	/**
-	 * @param serviceCandidateObjId the serviceCandidateObjId to set
-	 */
-	public void setServiceCandidateObjId(String serviceCandidateObjId) {
-		this.serviceCandidateObjId = serviceCandidateObjId;
-	}
-
-	
-
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if ( uuid != null ) {
-			id = uuid;			
-		} 
-		return id;
-	}
-
-	public ServiceSpecification() {
-		super();
-		this.baseType = "BaseEntity";
-		this.type = "CustomerFacingServiceSpecification";
-	}
-
-	public ServiceSpecification(ServiceSpecification src) {
-		this();
-		name = src.name;
-		description = src.description;
-		isBundle = src.isBundle;
-		lastUpdate = src.lastUpdate;
-		lifecycleStatus = src.lifecycleStatus;
-		version = src.version;
-		validFor = new TimePeriod(src.validFor);
-
-		if ( src.attachment != null ) {
-			for (AttachmentRef attachmentRef : src.attachment) {
-				this.addAttachmentItem( new AttachmentRef( attachmentRef ));
-			}
-			
-		}
-		if ( src.relatedParty != null ) {
-			for (RelatedParty r : src.relatedParty) {
-				this.addRelatedPartyItem( new RelatedParty( r) );
-			}			
-		}
-
-		if ( src.resourceSpecification != null ) {
-			for (ResourceSpecificationRef r : src.resourceSpecification) {
-				this.addResourceSpecificationItem( new ResourceSpecificationRef(r) );
-			}			
-		}
-		if ( src.serviceLevelSpecification != null ) {
-			for (ServiceLevelSpecificationRef r : src.serviceLevelSpecification) {
-				this.addServiceLevelSpecificationItem( new ServiceLevelSpecificationRef(r) );
-			}			
-		}
-
-		if ( src.serviceSpecCharacteristic != null ) {
-			for (ServiceSpecCharacteristic r : src.serviceSpecCharacteristic) {			
-				this.addServiceSpecCharacteristicItem( new ServiceSpecCharacteristic(r) );
-			}			
-		}
-
-		if ( src.serviceSpecRelationship != null ) {
-			for (ServiceSpecRelationship r : src.serviceSpecRelationship) {
-				this.addServiceSpecRelationshipItem( new ServiceSpecRelationship(r));
-			}			
-		}
-
-	}
-
-	public ServiceSpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether a ServiceSpecification represents a single
-	 * ServiceSpecification (false), or a bundle of ServiceSpecification (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether a ServiceSpecification represents a single ServiceSpecification (false), or a bundle of ServiceSpecification (true).")
-
-	public Boolean isIsBundle() {
-		if ( isBundle == null) {
-			isBundle = false;
-		}
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ServiceSpecification attachment(Set<AttachmentRef> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ServiceSpecification addAttachmentItem(AttachmentRef attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<AttachmentRef>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * A list of attachments (Attachment [*]). Complements the description of the
-	 * specification through video, pictures...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "A list of attachments (Attachment [*]). Complements the description of the specification through video, pictures...")
-
-	@Valid
-
-	public Set<AttachmentRef> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRef> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ServiceSpecification relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceSpecification addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<RelatedParty>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of related party references (RelatedParty [*]). A related party
-	 * defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of related party references (RelatedParty [*]). A related party defines party or party role linked to a specific entity.")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceSpecification resourceSpecification(Set<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	public ServiceSpecification addResourceSpecificationItem(ResourceSpecificationRef resourceSpecificationItem) {
-		if (this.resourceSpecification == null) {
-			this.resourceSpecification = new HashSet<ResourceSpecificationRef>();
-		}
-		this.resourceSpecification.add(resourceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of resource specification references (ResourceSpecificationRef [*]).
-	 * The ResourceSpecification is required for a service specification with type
-	 * ResourceFacingServiceSpecification (RFSS).
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "A list of resource specification references (ResourceSpecificationRef [*]). The ResourceSpecification is required for a service specification with type ResourceFacingServiceSpecification (RFSS).")
-
-	@Valid
-
-	public Set<ResourceSpecificationRef> getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(Set<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	public ServiceSpecification serviceLevelSpecification(Set<ServiceLevelSpecificationRef> serviceLevelSpecification) {
-		this.serviceLevelSpecification = serviceLevelSpecification;
-		return this;
-	}
-
-	public ServiceSpecification addServiceLevelSpecificationItem(
-			ServiceLevelSpecificationRef serviceLevelSpecificationItem) {
-		if (this.serviceLevelSpecification == null) {
-			this.serviceLevelSpecification = new HashSet<ServiceLevelSpecificationRef>();
-		}
-		this.serviceLevelSpecification.add(serviceLevelSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of service level specifications related to this service specification,
-	 * and which will need to be satisifiable for corresponding service instances;
-	 * e.g. Gold, Platinum
-	 * 
-	 * @return serviceLevelSpecification
-	 **/
-	@Schema(description = "A list of service level specifications related to this service specification, and which will need to be satisifiable for corresponding service instances; e.g. Gold, Platinum")
-
-	@Valid
-
-	public Set<ServiceLevelSpecificationRef> getServiceLevelSpecification() {
-		return serviceLevelSpecification;
-	}
-
-	public void setServiceLevelSpecification(Set<ServiceLevelSpecificationRef> serviceLevelSpecification) {
-		this.serviceLevelSpecification = serviceLevelSpecification;
-	}
-
-	public ServiceSpecification serviceSpecCharacteristic(Set<ServiceSpecCharacteristic> serviceSpecCharacteristic) {
-		this.serviceSpecCharacteristic = serviceSpecCharacteristic;
-		return this;
-	}
-
-	public ServiceSpecification addServiceSpecCharacteristicItem(
-			ServiceSpecCharacteristic serviceSpecCharacteristicItem) {
-		if (this.serviceSpecCharacteristic == null) {
-			this.serviceSpecCharacteristic = new HashSet<ServiceSpecCharacteristic>();
-		}
-		this.serviceSpecCharacteristic.add(serviceSpecCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A list of service spec characteristics (ServiceSpecCharacteristic [*]). This
-	 * class represents the key features of this service specification.
-	 * 
-	 * @return serviceSpecCharacteristic
-	 **/
-	@Schema(description = "A list of service spec characteristics (ServiceSpecCharacteristic [*]). This class represents the key features of this service specification.")
-
-	@Valid
-
-	public Set<ServiceSpecCharacteristic> getServiceSpecCharacteristic() {
-		return serviceSpecCharacteristic;
-	}
-
-	public void setServiceSpecCharacteristic(Set<ServiceSpecCharacteristic> serviceSpecCharacteristic) {
-		this.serviceSpecCharacteristic = serviceSpecCharacteristic;
-	}
-
-	public ServiceSpecification serviceSpecRelationship(Set<ServiceSpecRelationship> serviceSpecRelationship) {
-		this.serviceSpecRelationship = serviceSpecRelationship;
-		return this;
-	}
-
-	public ServiceSpecification addServiceSpecRelationshipItem(ServiceSpecRelationship serviceSpecRelationshipItem) {
-		if (this.serviceSpecRelationship == null) {
-			this.serviceSpecRelationship = new HashSet<ServiceSpecRelationship>();
-		}
-		this.serviceSpecRelationship.add(serviceSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service specifications related to this specification, e.g.
-	 * migration, substitution, dependency or exclusivity relationship
-	 * 
-	 * @return serviceSpecRelationship
-	 **/
-	@Schema(description = "A list of service specifications related to this specification, e.g. migration, substitution, dependency or exclusivity relationship")
-
-	@Valid
-
-	public Set<ServiceSpecRelationship> getServiceSpecRelationship() {
-		return serviceSpecRelationship;
-	}
-
-	public void setServiceSpecRelationship(Set<ServiceSpecRelationship> serviceSpecRelationship) {
-		this.serviceSpecRelationship = serviceSpecRelationship;
-	}
-
-	public ServiceSpecification targetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-		return this;
-	}
-
-	/**
-	 * A target service schema reference (TargetServiceSchemaRef). The reference
-	 * object to the schema and type of target service which is described by service
-	 * specification.
-	 * 
-	 * @return targetServiceSchema
-	 **/
-	@Schema(description = "A target service schema reference (TargetServiceSchemaRef). The reference object to the schema and type of target service which is described by service specification.")
-
-	@Valid
-
-	public TargetServiceSchema getTargetServiceSchema() {
-		return targetServiceSchema;
-	}
-
-	public void setTargetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-	}
-
-	
-
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecification serviceSpecification = (ServiceSpecification) o;
-		return Objects.equals(this.id, serviceSpecification.id) && Objects.equals(this.uuid, serviceSpecification.uuid)
-				&& Objects.equals(this.href, serviceSpecification.href)
-				&& Objects.equals(this.description, serviceSpecification.description)
-				&& Objects.equals(this.isBundle, serviceSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, serviceSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, serviceSpecification.name)
-				&& Objects.equals(this.version, serviceSpecification.version)
-				&& Objects.equals(this.attachment, serviceSpecification.attachment)
-				&& Objects.equals(this.relatedParty, serviceSpecification.relatedParty)
-				&& Objects.equals(this.resourceSpecification, serviceSpecification.resourceSpecification)
-				&& Objects.equals(this.serviceLevelSpecification, serviceSpecification.serviceLevelSpecification)
-				&& Objects.equals(this.serviceSpecCharacteristic, serviceSpecification.serviceSpecCharacteristic)
-				&& Objects.equals(this.serviceSpecRelationship, serviceSpecification.serviceSpecRelationship)
-				&& Objects.equals(this.targetServiceSchema, serviceSpecification.targetServiceSchema)
-				&& Objects.equals(this.validFor, serviceSpecification.validFor)
-				&& Objects.equals(this.baseType, serviceSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecification.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecification.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, id, href, description, isBundle, lastUpdate, lifecycleStatus, name, version,
-//				attachment, relatedParty, resourceSpecification, serviceLevelSpecification, serviceSpecCharacteristic,
-//				serviceSpecRelationship, targetServiceSchema, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecification {\n");
-
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    serviceLevelSpecification: ").append(toIndentedString(serviceLevelSpecification)).append("\n");
-		sb.append("    serviceSpecCharacteristic: ").append(toIndentedString(serviceSpecCharacteristic)).append("\n");
-		sb.append("    serviceSpecRelationship: ").append(toIndentedString(serviceSpecRelationship)).append("\n");
-		sb.append("    targetServiceSchema: ").append(toIndentedString(targetServiceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public ServiceSpecCharacteristic findSpecCharacteristicByName(String an) {
-		for (ServiceSpecCharacteristic ssci : this.getServiceSpecCharacteristic()) {
-			if (ssci.getName().equals(an)) {
-				return ssci;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * we fix here the ids of the ServiceSpecCharRelationships. remind also that we
-	 * have a role="tag"
-	 */
-	public void fixSpecCharRelationhsipIDs() {
-		for (ServiceSpecCharacteristic schar : serviceSpecCharacteristic) {
-			for (ServiceSpecCharRelationship charRel : schar.getServiceSpecCharRelationship()) {
-				if (charRel.getId() == null) {
-					// search other specCharacteristics inside the serviceSpec to get the id (if
-					// they have same name). Then ID will be the same as the id of the
-					// serviceSpecCharacteristic
-					for (ServiceSpecCharacteristic searchChar : serviceSpecCharacteristic) {
-						if (searchChar.getName().equals(charRel.getName())) {
-							charRel.setId(searchChar.getUuid());
-							break;
-						}
-					}
-
-				}
-				// if still is null se this id:
-				if (charRel.getId() == null) {
-					charRel.setId(this.getName() + "-" + charRel.getName());
-				}
-			}
-
-		}
-
-	}
-
-	public ServiceSpecCharacteristic getServiceSpecCharacteristicByName(String aName) {
-
-		for (ServiceSpecCharacteristic c : this.getServiceSpecCharacteristic() ) {
-			if ( c.getName().equals( aName )) {
-				return c;
-			}
-			
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeEvent.java
deleted file mode 100644
index 16811f801f44202b613b3f05935d70e946dfbd72..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationChangeEvent   {
-  @JsonProperty("serviceSpecification")
-  private ServiceSpecification serviceSpecification = null;
-
-  public ServiceSpecificationChangeEvent serviceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceSpecification
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceSpecification getServiceSpecification() {
-    return serviceSpecification;
-  }
-
-  public void setServiceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationChangeEvent serviceSpecificationChangeEvent = (ServiceSpecificationChangeEvent) o;
-    return Objects.equals(this.serviceSpecification, serviceSpecificationChangeEvent.serviceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationChangeEvent {\n");
-    
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeNotification.java
deleted file mode 100644
index f5ac24e00747acce4e9f7b0ed4900616b64c4897..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationChangeNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationChangeNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceSpecificationChangeEvent event = null;
-
-  public ServiceSpecificationChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceSpecificationChangeNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceSpecificationChangeNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceSpecificationChangeNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceSpecificationChangeNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceSpecificationChangeNotification event(ServiceSpecificationChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceSpecificationChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceSpecificationChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationChangeNotification serviceSpecificationChangeNotification = (ServiceSpecificationChangeNotification) o;
-    return Objects.equals(this.eventId, serviceSpecificationChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceSpecificationChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceSpecificationChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceSpecificationChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceSpecificationChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceSpecificationChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreate.java
deleted file mode 100644
index e7ade58f87bf9298f1e5efa0e5cd7cb445f36a43..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreate.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ServiceSpecification is a class that offers characteristics to describe a
- * type of service. Functionally, it acts as a template by which Services may be
- * instantiated. By sharing the same specification, these services would
- * therefore share the same set of characteristics. Skipped properties: id,href
- */
-@Schema(description = "ServiceSpecification is a class that offers characteristics to describe a type of service. Functionally, it acts as a template by which Services may be instantiated. By sharing the same  specification, these services would therefore share the same set of characteristics. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationCreate extends ServiceSpecificationUpdate {
-
-	@JsonProperty("lastUpdate")
-	private OffsetDateTime lastUpdate = null;
-
-	public ServiceSpecificationCreate lastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-		return this;
-	}
-
-	/**
-	 * Date and time of the last update of the service specification
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update of the service specification")
-
-	@Valid
-
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecificationCreate serviceSpecificationCreate = (ServiceSpecificationCreate) o;
-		return Objects.equals(this.description, serviceSpecificationCreate.description)
-				&& Objects.equals(this.isBundle, serviceSpecificationCreate.isBundle)
-				&& Objects.equals(this.lastUpdate, serviceSpecificationCreate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceSpecificationCreate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceSpecificationCreate.name)
-				&& Objects.equals(this.version, serviceSpecificationCreate.version)
-				&& Objects.equals(this.attachment, serviceSpecificationCreate.attachment)
-				&& Objects.equals(this.relatedParty, serviceSpecificationCreate.relatedParty)
-				&& Objects.equals(this.resourceSpecification, serviceSpecificationCreate.resourceSpecification)
-				&& Objects.equals(this.serviceLevelSpecification, serviceSpecificationCreate.serviceLevelSpecification)
-				&& Objects.equals(this.serviceSpecCharacteristic, serviceSpecificationCreate.serviceSpecCharacteristic)
-				&& Objects.equals(this.serviceSpecRelationship, serviceSpecificationCreate.serviceSpecRelationship)
-				&& Objects.equals(this.targetServiceSchema, serviceSpecificationCreate.targetServiceSchema)
-				&& Objects.equals(this.validFor, serviceSpecificationCreate.validFor)
-				&& Objects.equals(this.baseType, serviceSpecificationCreate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecificationCreate.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecificationCreate.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment, relatedParty,
-//				resourceSpecification, serviceLevelSpecification, serviceSpecCharacteristic, serviceSpecRelationship,
-//				targetServiceSchema, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecificationCreate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    serviceLevelSpecification: ").append(toIndentedString(serviceLevelSpecification)).append("\n");
-		sb.append("    serviceSpecCharacteristic: ").append(toIndentedString(serviceSpecCharacteristic)).append("\n");
-		sb.append("    serviceSpecRelationship: ").append(toIndentedString(serviceSpecRelationship)).append("\n");
-		sb.append("    targetServiceSchema: ").append(toIndentedString(targetServiceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateEvent.java
deleted file mode 100644
index 2c70c9f6d50097b8d780a3d5c5f781fcd26ae457..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationCreateEvent   {
-  @JsonProperty("serviceSpecification")
-  private ServiceSpecification serviceSpecification = null;
-
-  public ServiceSpecificationCreateEvent serviceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceSpecification
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceSpecification getServiceSpecification() {
-    return serviceSpecification;
-  }
-
-  public void setServiceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationCreateEvent serviceSpecificationCreateEvent = (ServiceSpecificationCreateEvent) o;
-    return Objects.equals(this.serviceSpecification, serviceSpecificationCreateEvent.serviceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationCreateEvent {\n");
-    
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateNotification.java
deleted file mode 100644
index bc0877667df0c5fa57951ef01afcf8cddfedbb68..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationCreateNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationCreateNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceSpecificationCreateEvent event = null;
-
-  public ServiceSpecificationCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceSpecificationCreateNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceSpecificationCreateNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceSpecificationCreateNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceSpecificationCreateNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceSpecificationCreateNotification event(ServiceSpecificationCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceSpecificationCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceSpecificationCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationCreateNotification serviceSpecificationCreateNotification = (ServiceSpecificationCreateNotification) o;
-    return Objects.equals(this.eventId, serviceSpecificationCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceSpecificationCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceSpecificationCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceSpecificationCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceSpecificationCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceSpecificationCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteEvent.java
deleted file mode 100644
index 0122c347f9001841a7e71efba15474298e371895..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationDeleteEvent   {
-  @JsonProperty("serviceSpecification")
-  private ServiceSpecification serviceSpecification = null;
-
-  public ServiceSpecificationDeleteEvent serviceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceSpecification
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceSpecification getServiceSpecification() {
-    return serviceSpecification;
-  }
-
-  public void setServiceSpecification(ServiceSpecification serviceSpecification) {
-    this.serviceSpecification = serviceSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationDeleteEvent serviceSpecificationDeleteEvent = (ServiceSpecificationDeleteEvent) o;
-    return Objects.equals(this.serviceSpecification, serviceSpecificationDeleteEvent.serviceSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationDeleteEvent {\n");
-    
-    sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteNotification.java
deleted file mode 100644
index 2b74cf94ae4eb2740e5a3cf9c0b7d615440416ef..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationDeleteNotification.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationDeleteNotification   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("resourcePath")
-  private String resourcePath = null;
-
-  @JsonProperty("event")
-  private ServiceSpecificationDeleteEvent event = null;
-
-  public ServiceSpecificationDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification")
-
-
-  public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceSpecificationDeleteNotification eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence")
-
-  @Valid
-
-  public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceSpecificationDeleteNotification eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification")
-
-
-  public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceSpecificationDeleteNotification fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification")
-
-
-  public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceSpecificationDeleteNotification resourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-    return this;
-  }
-
-  /**
-   * The path identifying the resource object concerned by this notification
-   * @return resourcePath
-  **/
-  @Schema(description = "The path identifying the resource object concerned by this notification")
-
-
-  public String getResourcePath() {
-    return resourcePath;
-  }
-
-  public void setResourcePath(String resourcePath) {
-    this.resourcePath = resourcePath;
-  }
-
-  public ServiceSpecificationDeleteNotification event(ServiceSpecificationDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceSpecificationDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceSpecificationDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceSpecificationDeleteNotification serviceSpecificationDeleteNotification = (ServiceSpecificationDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceSpecificationDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceSpecificationDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceSpecificationDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceSpecificationDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceSpecificationDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceSpecificationDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceSpecificationDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationUpdate.java
deleted file mode 100644
index 2e1f8b49415e06eace303d5ca89b35fe569cd9c3..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/ServiceSpecificationUpdate.java
+++ /dev/null
@@ -1,582 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRef;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * ServiceSpecification is a class that offers characteristics to describe a
- * type of service. Functionally, it acts as a template by which Services may be
- * instantiated. By sharing the same specification, these services would
- * therefore share the same set of characteristics. Skipped properties:
- * id,href,lastUpdate
- */
-@Schema(description = "ServiceSpecification is a class that offers characteristics to describe a type of service. Functionally, it acts as a template by which Services may be instantiated. By sharing the same  specification, these services would therefore share the same set of characteristics. Skipped properties: id,href,lastUpdate")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-public class ServiceSpecificationUpdate {
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("isBundle")
-	protected Boolean isBundle = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	protected List<AttachmentRef> attachment = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("resourceSpecification")
-	@Valid
-	protected List<ResourceSpecificationRef> resourceSpecification = null;
-
-	@JsonProperty("serviceLevelSpecification")
-	@Valid
-	protected List<ServiceLevelSpecificationRef> serviceLevelSpecification = null;
-
-	@JsonProperty("serviceSpecCharacteristic")
-	@Valid
-	protected List<ServiceSpecCharacteristic> serviceSpecCharacteristic = null;
-
-	@JsonProperty("serviceSpecRelationship")
-	@Valid
-	protected List<ServiceSpecRelationship> serviceSpecRelationship = null;
-
-	@JsonProperty("targetServiceSchema")
-	protected TargetServiceSchema targetServiceSchema = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ServiceSpecificationUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative that explains in detail what the service specification is
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative that explains in detail what the service specification is")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceSpecificationUpdate isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether a ServiceSpecification represents a single
-	 * ServiceSpecification (false), or a bundle of ServiceSpecification (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether a ServiceSpecification represents a single ServiceSpecification (false), or a bundle of ServiceSpecification (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ServiceSpecificationUpdate lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of the service specification
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of the service specification")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ServiceSpecificationUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the service specification
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the service specification")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceSpecificationUpdate version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Service specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Service specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceSpecificationUpdate attachment(List<AttachmentRef> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addAttachmentItem(AttachmentRef attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new ArrayList<AttachmentRef>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * A list of attachments (Attachment [*]). Complements the description of the
-	 * specification through video, pictures...
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "A list of attachments (Attachment [*]). Complements the description of the specification through video, pictures...")
-
-	@Valid
-
-	public List<AttachmentRef> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(List<AttachmentRef> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ServiceSpecificationUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<RelatedParty>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of related party references (RelatedParty [*]). A related party
-	 * defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of related party references (RelatedParty [*]). A related party defines party or party role linked to a specific entity.")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceSpecificationUpdate resourceSpecification(List<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addResourceSpecificationItem(ResourceSpecificationRef resourceSpecificationItem) {
-		if (this.resourceSpecification == null) {
-			this.resourceSpecification = new ArrayList<ResourceSpecificationRef>();
-		}
-		this.resourceSpecification.add(resourceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of resource specification references (ResourceSpecificationRef [*]).
-	 * The ResourceSpecification is required for a service specification with type
-	 * ResourceFacingServiceSpecification (RFSS).
-	 * 
-	 * @return resourceSpecification
-	 **/
-	@Schema(description = "A list of resource specification references (ResourceSpecificationRef [*]). The ResourceSpecification is required for a service specification with type ResourceFacingServiceSpecification (RFSS).")
-
-	@Valid
-
-	public List<ResourceSpecificationRef> getResourceSpecification() {
-		return resourceSpecification;
-	}
-
-	public void setResourceSpecification(List<ResourceSpecificationRef> resourceSpecification) {
-		this.resourceSpecification = resourceSpecification;
-	}
-
-	public ServiceSpecificationUpdate serviceLevelSpecification(
-			List<ServiceLevelSpecificationRef> serviceLevelSpecification) {
-		this.serviceLevelSpecification = serviceLevelSpecification;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addServiceLevelSpecificationItem(
-			ServiceLevelSpecificationRef serviceLevelSpecificationItem) {
-		if (this.serviceLevelSpecification == null) {
-			this.serviceLevelSpecification = new ArrayList<ServiceLevelSpecificationRef>();
-		}
-		this.serviceLevelSpecification.add(serviceLevelSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A list of service level specifications related to this service specification,
-	 * and which will need to be satisifiable for corresponding service instances;
-	 * e.g. Gold, Platinum
-	 * 
-	 * @return serviceLevelSpecification
-	 **/
-	@Schema(description = "A list of service level specifications related to this service specification, and which will need to be satisifiable for corresponding service instances; e.g. Gold, Platinum")
-
-	@Valid
-
-	public List<ServiceLevelSpecificationRef> getServiceLevelSpecification() {
-		return serviceLevelSpecification;
-	}
-
-	public void setServiceLevelSpecification(List<ServiceLevelSpecificationRef> serviceLevelSpecification) {
-		this.serviceLevelSpecification = serviceLevelSpecification;
-	}
-
-	public ServiceSpecificationUpdate serviceSpecCharacteristic(
-			List<ServiceSpecCharacteristic> serviceSpecCharacteristic) {
-		this.serviceSpecCharacteristic = serviceSpecCharacteristic;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addServiceSpecCharacteristicItem(
-			ServiceSpecCharacteristic serviceSpecCharacteristicItem) {
-		if (this.serviceSpecCharacteristic == null) {
-			this.serviceSpecCharacteristic = new ArrayList<ServiceSpecCharacteristic>();
-		}
-		this.serviceSpecCharacteristic.add(serviceSpecCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A list of service spec characteristics (ServiceSpecCharacteristic [*]). This
-	 * class represents the key features of this service specification.
-	 * 
-	 * @return serviceSpecCharacteristic
-	 **/
-	@Schema(description = "A list of service spec characteristics (ServiceSpecCharacteristic [*]). This class represents the key features of this service specification.")
-
-	@Valid
-
-	public List<ServiceSpecCharacteristic> getServiceSpecCharacteristic() {
-		return serviceSpecCharacteristic;
-	}
-
-	public void setServiceSpecCharacteristic(List<ServiceSpecCharacteristic> serviceSpecCharacteristic) {
-		this.serviceSpecCharacteristic = serviceSpecCharacteristic;
-	}
-
-	public ServiceSpecificationUpdate serviceSpecRelationship(List<ServiceSpecRelationship> serviceSpecRelationship) {
-		this.serviceSpecRelationship = serviceSpecRelationship;
-		return this;
-	}
-
-	public ServiceSpecificationUpdate addServiceSpecRelationshipItem(
-			ServiceSpecRelationship serviceSpecRelationshipItem) {
-		if (this.serviceSpecRelationship == null) {
-			this.serviceSpecRelationship = new ArrayList<ServiceSpecRelationship>();
-		}
-		this.serviceSpecRelationship.add(serviceSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service specifications related to this specification, e.g.
-	 * migration, substitution, dependency or exclusivity relationship
-	 * 
-	 * @return serviceSpecRelationship
-	 **/
-	@Schema(description = "A list of service specifications related to this specification, e.g. migration, substitution, dependency or exclusivity relationship")
-
-	@Valid
-
-	public List<ServiceSpecRelationship> getServiceSpecRelationship() {
-		return serviceSpecRelationship;
-	}
-
-	public void setServiceSpecRelationship(List<ServiceSpecRelationship> serviceSpecRelationship) {
-		this.serviceSpecRelationship = serviceSpecRelationship;
-	}
-
-	public ServiceSpecificationUpdate targetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-		return this;
-	}
-
-	/**
-	 * A target service schema reference (TargetServiceSchemaRef). The reference
-	 * object to the schema and type of target service which is described by service
-	 * specification.
-	 * 
-	 * @return targetServiceSchema
-	 **/
-	@Schema(description = "A target service schema reference (TargetServiceSchemaRef). The reference object to the schema and type of target service which is described by service specification.")
-
-	@Valid
-
-	public TargetServiceSchema getTargetServiceSchema() {
-		return targetServiceSchema;
-	}
-
-	public void setTargetServiceSchema(TargetServiceSchema targetServiceSchema) {
-		this.targetServiceSchema = targetServiceSchema;
-	}
-
-	public ServiceSpecificationUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * The period for which the service specification is valid
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "The period for which the service specification is valid")
-
-	@Valid
-
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ServiceSpecificationUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceSpecificationUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceSpecificationUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceSpecificationUpdate serviceSpecificationUpdate = (ServiceSpecificationUpdate) o;
-		return Objects.equals(this.description, serviceSpecificationUpdate.description)
-				&& Objects.equals(this.isBundle, serviceSpecificationUpdate.isBundle)
-				&& Objects.equals(this.lifecycleStatus, serviceSpecificationUpdate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceSpecificationUpdate.name)
-				&& Objects.equals(this.version, serviceSpecificationUpdate.version)
-				&& Objects.equals(this.attachment, serviceSpecificationUpdate.attachment)
-				&& Objects.equals(this.relatedParty, serviceSpecificationUpdate.relatedParty)
-				&& Objects.equals(this.resourceSpecification, serviceSpecificationUpdate.resourceSpecification)
-				&& Objects.equals(this.serviceLevelSpecification, serviceSpecificationUpdate.serviceLevelSpecification)
-				&& Objects.equals(this.serviceSpecCharacteristic, serviceSpecificationUpdate.serviceSpecCharacteristic)
-				&& Objects.equals(this.serviceSpecRelationship, serviceSpecificationUpdate.serviceSpecRelationship)
-				&& Objects.equals(this.targetServiceSchema, serviceSpecificationUpdate.targetServiceSchema)
-				&& Objects.equals(this.validFor, serviceSpecificationUpdate.validFor)
-				&& Objects.equals(this.baseType, serviceSpecificationUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceSpecificationUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceSpecificationUpdate.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(description, isBundle, lifecycleStatus, name, version, attachment, relatedParty,
-//				resourceSpecification, serviceLevelSpecification, serviceSpecCharacteristic, serviceSpecRelationship,
-//				targetServiceSchema, validFor, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceSpecificationUpdate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    resourceSpecification: ").append(toIndentedString(resourceSpecification)).append("\n");
-		sb.append("    serviceLevelSpecification: ").append(toIndentedString(serviceLevelSpecification)).append("\n");
-		sb.append("    serviceSpecCharacteristic: ").append(toIndentedString(serviceSpecCharacteristic)).append("\n");
-		sb.append("    serviceSpecRelationship: ").append(toIndentedString(serviceSpecRelationship)).append("\n");
-		sb.append("    targetServiceSchema: ").append(toIndentedString(targetServiceSchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-	
-
-	public void addServiceSpecRelationshipWith(ServiceSpecification responsesSpec1) {
-
-		ServiceSpecRelationship r1 = new ServiceSpecRelationship();
-		r1.setId(responsesSpec1.getId());
-		r1.setName(responsesSpec1.getName());
-		r1.setRole("serviceSpecRelationship");
-		r1.setRelationshipType("aggregation");
-		this.addServiceSpecRelationshipItem(r1);
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/model/TargetServiceSchema.java b/src/main/java/org/etsi/osl/tmf/scm633/model/TargetServiceSchema.java
deleted file mode 100644
index 1b9d1759d05c0612077a70bfeb4c8dfc1dbc6914..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/scm633/model/TargetServiceSchema.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.scm633.model;
-
-import java.util.Objects;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-
-/**
- * The reference object to the schema and type of target service which is described by service specification
- */
-@Schema(description = "The reference object to the schema and type of target service which is described by service specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-04-29T19:18:54.771Z")
-
-@Embeddable
-public class TargetServiceSchema extends BaseRootEntity  {
- 
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetServiceSchema targetServiceSchema = (TargetServiceSchema) o;
-    return Objects.equals(this.baseType, targetServiceSchema.baseType) &&
-        Objects.equals(this.schemaLocation, targetServiceSchema.schemaLocation) &&
-        Objects.equals(this.type, targetServiceSchema.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetServiceSchema {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/EServiceStartMode.java b/src/main/java/org/etsi/osl/tmf/sim638/model/EServiceStartMode.java
deleted file mode 100644
index aadb8af8a2658ad933dea05c707e5cdd75cd7039..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/EServiceStartMode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2020 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-public enum EServiceStartMode {
-	UNKNOWN("UNKNOWN"),
-	AUTOMATICALLY_MANAGED("AUTOMATICALLY_MANAGED"),
-	AUTOMATICALLY_BY_DEVICE("AUTOMATICALLY_BY_DEVICE"),
-	MANUALLY_BY_SERVICE_PROVIDER("MANUALLY_BY_SERVICE_PROVIDER"),
-	MANUALLY_BY_CUSTOMER("MANUALLY_BY_CUSTOMER"),
-	ANY("ANY");
-	
-	
-	private String value;
-	
-	EServiceStartMode(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return this.getValue();
-    }
-
-    public static EServiceStartMode getEnum(String value) {
-        for(EServiceStartMode v : values())
-            if(v.getValue().equalsIgnoreCase(value)) return v;
-        throw new IllegalArgumentException();
-    }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/Error.java b/src/main/java/org/etsi/osl/tmf/sim638/model/Error.java
deleted file mode 100644
index 6c40724c7e22230704656e11248a5c7ee74e7f6e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscription.java
deleted file mode 100644
index a1d80141f487c38e85cb5409f058288708e93384..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscriptionInput.java
deleted file mode 100644
index ce1bb2f6de1ee03586b243441cc83c95af949f42..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java b/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java
deleted file mode 100644
index bc6d42c858636be88838aa5332867073c2048c36..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/Service.java
+++ /dev/null
@@ -1,784 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.service.Characteristic;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.common.model.service.Place;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRelationship;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.common.model.service.ServiceStateType;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-
-/**
- * Service is a base class for defining the Service hierarchy. All Services are
- * characterized as either being possibly visible and usable by a Customer or
- * not. This gives rise to the two subclasses of Service: CustomerFacingService
- * and ResourceFacingService.
- */
-@Schema(description = "Service is a base class for defining the Service hierarchy. All Services are characterized as either being possibly visible and usable by a Customer or not. This gives rise to the two subclasses of Service: CustomerFacingService and ResourceFacingService.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-@Entity
-public class Service extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("category")
-	private String category = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String descriptionL = null;
-
-	private OffsetDateTime endDate = null;
-
-	@JsonProperty("hasStarted")
-	private Boolean hasStarted = null;
-
-	@JsonProperty("isServiceEnabled")
-	private Boolean isServiceEnabled = null;
-
-	@JsonProperty("isStateful")
-	private Boolean isStateful = null;
-
-	@JsonProperty("serviceDate")
-	private String serviceDate = null;
-
-	@JsonProperty("serviceType")
-	private String serviceType = null;
-
-	private OffsetDateTime startDate = null;
-
-	@JsonProperty("startMode")
-	private String startMode = null;
-
-	@JsonProperty("note")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Note> note = new HashSet<>();
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Place> place = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("serviceCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> serviceCharacteristic = new HashSet<>();
-
-	@JsonProperty("serviceOrder")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceOrderRef> serviceOrder = new HashSet<>();
-
-	@JsonProperty("serviceRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceRelationship> serviceRelationship = new HashSet<>();
-
-	@JsonProperty("serviceSpecification")
-	@OneToOne(cascade = CascadeType.ALL)
-	private ServiceSpecificationRef serviceSpecificationRef = null;
-
-	@JsonProperty("state")
-	private ServiceStateType state = ServiceStateType.FEASIBILITYCHECKED;
-
-	@JsonProperty("supportingResource")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> supportingResource = new HashSet<>();
-
-	@JsonProperty("supportingService")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceRef> supportingService = new HashSet<>();
-	
-	
-	
-	
-
-	public Service() {
-		super();
-		this.baseType = "BaseRootNamedEntity";
-		this.type = "CustomerFacingServiceSpecification"; // by default is a CFS... if we attach a resource then it is a RFS
-	}
-
-	
-	/**
-	 * Unique identifier of the service
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the service")
-
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	/**
-	 * Is it a customer facing or resource facing service
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Is it a customer facing or resource facing service")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public Service description(String description) {
-		this.descriptionL = description;
-		return this;
-	}
-
-	/**
-	 * Free-text description of the service
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Free-text description of the service")
-
-	public String getDescription() {
-		return descriptionL;
-	}
-
-	public void setDescription(String description) {
-		this.descriptionL = description;
-	}
-
-	public Service endDate(OffsetDateTime endDate) {
-		this.endDate = endDate;
-		return this;
-	}
-
-	/**
-	 * Date when the service ends
-	 * 
-	 * @return endDate
-	 **/
-	@Schema(description = "Date when the service ends")
-
-	@Valid
-
-	public OffsetDateTime getEndDate() {
-		return endDate;
-	}
-	
-
-	@JsonProperty("endDate")
-	public String getEndDateStr() {
-		if ( this.endDate != null ) {
-			return this.endDate.toString();			
-		} else {
-			return null;
-		}
-	}
-
-	public void setEndDate(OffsetDateTime endDate) {
-		this.endDate = endDate;
-	}
-
-	public void setEndDate(String endDate) {
-		if ( endDate!=null ) {
-			this.endDate = OffsetDateTime.parse( endDate );			
-		}
-	}
-	
-	public Service hasStarted(Boolean hasStarted) {
-		this.hasStarted = hasStarted;
-		return this;
-	}
-
-	/**
-	 * If TRUE, this Service has already been started
-	 * 
-	 * @return hasStarted
-	 **/
-	@Schema(description = "If TRUE, this Service has already been started")
-
-	public Boolean isHasStarted() {
-		return hasStarted;
-	}
-
-	public void setHasStarted(Boolean hasStarted) {
-		this.hasStarted = hasStarted;
-	}
-
-	public Service isServiceEnabled(Boolean isServiceEnabled) {
-		this.isServiceEnabled = isServiceEnabled;
-		return this;
-	}
-
-	/**
-	 * If FALSE, this particular Service has NOT been enabled for use
-	 * 
-	 * @return isServiceEnabled
-	 **/
-	@Schema(description = "If FALSE, this particular Service has NOT been enabled for use")
-
-	public Boolean isIsServiceEnabled() {
-		return isServiceEnabled;
-	}
-
-	public void setIsServiceEnabled(Boolean isServiceEnabled) {
-		this.isServiceEnabled = isServiceEnabled;
-	}
-
-	public Service isStateful(Boolean isStateful) {
-		this.isStateful = isStateful;
-		return this;
-	}
-
-	/**
-	 * If TRUE, this Service can be changed without affecting any other services
-	 * 
-	 * @return isStateful
-	 **/
-	@Schema(description = "If TRUE, this Service can be changed without affecting any other services")
-
-	public Boolean isIsStateful() {
-		return isStateful;
-	}
-
-	public void setIsStateful(Boolean isStateful) {
-		this.isStateful = isStateful;
-	}
-
-	public Service serviceDate(String serviceDate) {
-		this.serviceDate = serviceDate;
-		return this;
-	}
-
-	/**
-	 * Date when the service was created (whatever its status).
-	 * 
-	 * @return serviceDate
-	 **/
-	@Schema(description = "Date when the service was created (whatever its status).")
-
-	public String getServiceDate() {
-		return serviceDate;
-	}
-
-	public void setServiceDate(String serviceDate) {
-		this.serviceDate = serviceDate;
-	}
-
-	public Service serviceType(String serviceType) {
-		this.serviceType = serviceType;
-		return this;
-	}
-
-	/**
-	 * Business type of the service
-	 * 
-	 * @return serviceType
-	 **/
-	@Schema(description = "Business type of the service")
-
-	public String getServiceType() {
-		return serviceType;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-
-	public Service startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-
-	/**
-	 * Date when the service starts
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the service starts")
-
-	@Valid
-
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-	
-
-	@JsonProperty("startDate")
-	public String getStartDateStr() {
-		if ( this.startDate != null ) {
-			return this.startDate.toString();			
-		} else {
-			return null;
-		}
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-	
-	public void setStartDate(String startDate) {
-		if ( startDate!=null ) {
-			this.startDate = OffsetDateTime.parse( startDate );
-		}
-	}
-
-	public Service startMode(String startMode) {
-		this.startMode = startMode;
-		return this;
-	}
-
-	/**
-	 * This attribute is an enumerated integer that indicates how the Service is
-	 * started, such as: 0: Unknown; 1: Automatically by the managed environment; 2:
-	 * Automatically by the owning device; 3: Manually by the Provider of the
-	 * Service; 4: Manually by a Customer of the Provider; 5: Any of the above
-	 * 
-	 * @return startMode
-	 **/
-	@Schema(description = "This attribute is an enumerated integer that indicates how the Service is started, such as: 0: Unknown; 1: Automatically by the managed environment; 2: Automatically by the owning device; 3: Manually by the Provider of the Service; 4: Manually by a Customer of the Provider; 5: Any of the above")
-
-	public String getStartMode() {
-		return startMode;
-	}
-
-	public void setStartMode(String startMode) {
-		this.startMode = startMode;
-	}
-
-	public Service note(Set<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public Service addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note =  new HashSet<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * A list of notes made on this service
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "A list of notes made on this service")
-
-	@Valid
-
-	public Set<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(Set<Note> note) {
-		this.note = note;
-	}
-
-	public Service place(Set<Place> place) {
-		this.place = place;
-		return this;
-	}
-
-	public Service addPlaceItem(Place placeItem) {
-		if (this.place == null) {
-			this.place =  new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * A list of places related to this service, e.g. where the service is
-	 * installed, a delivery address for equipment, etc.
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "A list of places related to this service, e.g. where the service is installed, a delivery address for equipment, etc.")
-
-	@Valid
-
-	public Set<Place> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<Place> place) {
-		this.place = place;
-	}
-
-	public Service relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public Service addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty =  new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of related party references (RelatedParty [1..*]). A related party
-	 * defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of related party references (RelatedParty [1..*]). A related party defines party or party role linked to a specific entity.")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public Service serviceCharacteristic( Set<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-		return this;
-	}
-
-	public Service addServiceCharacteristicItem(Characteristic serviceCharacteristicItem) {
-		if (this.serviceCharacteristic == null) {
-			this.serviceCharacteristic =  new HashSet<>();
-		}
-		this.serviceCharacteristic.add(serviceCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A list of characteristics that characterize this service
-	 * (ServiceCharacteristic [*])
-	 * 
-	 * @return serviceCharacteristic
-	 **/
-	@Schema(description = "A list of characteristics that characterize this service (ServiceCharacteristic [*]) ")
-
-	@Valid
-
-	public Set<Characteristic> getServiceCharacteristic() {
-		return serviceCharacteristic;
-	}
-
-	public void setServiceCharacteristic(Set<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-	}
-
-	public Service serviceOrder( Set<ServiceOrderRef> serviceOrder) {
-		this.serviceOrder = serviceOrder;
-		return this;
-	}
-
-	public Service addServiceOrderItem(ServiceOrderRef serviceOrderItem) {
-		if (this.serviceOrder == null) {
-			this.serviceOrder =  new HashSet<>();
-		}
-		this.serviceOrder.add(serviceOrderItem);
-		return this;
-	}
-
-	/**
-	 * A list of service orders related to this service
-	 * 
-	 * @return serviceOrder
-	 **/
-	@Schema(description = "A list of service orders related to this service")
-
-	@Valid
-
-	public Set<ServiceOrderRef> getServiceOrder() {
-		return serviceOrder;
-	}
-
-	public void setServiceOrder( Set<ServiceOrderRef> serviceOrder) {
-		this.serviceOrder = serviceOrder;
-	}
-
-	public Service serviceRelationship( Set<ServiceRelationship> serviceRelationship) {
-		this.serviceRelationship = serviceRelationship;
-		return this;
-	}
-
-	public Service addServiceRelationshipItem(ServiceRelationship serviceRelationshipItem) {
-		if (this.serviceRelationship == null) {
-			this.serviceRelationship = new HashSet<>();
-		}
-		this.serviceRelationship.add(serviceRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service relationships (ServiceRelationship [*]). Describes links
-	 * with other service(s) in the inventory (useful for describing relies-on,
-	 * relies-from between CFS for example).
-	 * 
-	 * @return serviceRelationship
-	 **/
-	@Schema(description = "A list of service relationships (ServiceRelationship [*]). Describes links with other service(s) in the inventory (useful for describing relies-on, relies-from between CFS for example).")
-
-	@Valid
-
-	public Set<ServiceRelationship> getServiceRelationship() {
-		return serviceRelationship;
-	}
-
-	public void setServiceRelationship( Set<ServiceRelationship> serviceRelationship) {
-		this.serviceRelationship = serviceRelationship;
-	}
-
-	public Service serviceSpecificationRef(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecificationRef = serviceSpecification;
-		return this;
-	}
-
-	/**
-	 * The specification from which this service was instantiated
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The specification from which this service was instantiated")
-
-	@Valid
-
-	public ServiceSpecificationRef getServiceSpecificationRef() {
-		return serviceSpecificationRef;
-	}
-
-	public void setServiceSpecificationRef(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecificationRef = serviceSpecification;
-	}
-
-	public Service state(ServiceStateType state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The life cycle state of the service, such as: feasibilityChecked, designed,
-	 * reserved, active, inactive, terminated
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The life cycle state of the service, such as: feasibilityChecked, designed, reserved, active, inactive, terminated")
-
-	@Valid
-
-	public ServiceStateType getState() {
-		return state;
-	}
-
-	public void setState(ServiceStateType state) {
-		this.state = state;
-	}
-
-	public Service supportingResource( Set<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-		return this;
-	}
-
-	public Service addSupportingResourceItem(ResourceRef supportingResourceItem) {
-		if (this.supportingResource == null) {
-			this.supportingResource =  new HashSet<>();
-		}
-		this.supportingResource.add(supportingResourceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting resources (SupportingResource [*]).Note: only Service of
-	 * type RFS can be associated with Resources.
-	 * 
-	 * @return supportingResource
-	 **/
-	@Schema(description = "A list of supporting resources (SupportingResource [*]).Note: only Service of type RFS can be associated with Resources.")
-
-	@Valid
-
-	public Set<ResourceRef> getSupportingResource() {
-		return supportingResource;
-	}
-
-	public void setSupportingResource( Set<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-	}
-
-	public Service supportingService( Set<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-		return this;
-	}
-
-	public Service addSupportingServiceItem(ServiceRef supportingServiceItem) {
-		if (this.supportingService == null) {
-			this.supportingService =  new HashSet<>();
-		}
-		this.supportingService.add(supportingServiceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting services (SupportingService [*]). A collection of
-	 * services that support this service (bundling, link CFS to RFS).
-	 * 
-	 * @return supportingService
-	 **/
-	@Schema(description = "A list of supporting services (SupportingService [*]). A collection of services that support this service (bundling, link CFS to RFS).")
-
-	@Valid
-
-	public Set<ServiceRef> getSupportingService() {
-		return supportingService;
-	}
-
-	public void setSupportingService( Set<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Service service = (Service) o;
-		return Objects.equals(this.id, service.id) && Objects.equals(this.href, service.href)
-				&& Objects.equals(this.category, service.category)
-				&& Objects.equals(this.descriptionL, service.descriptionL)
-				&& Objects.equals(this.endDate, service.endDate) && Objects.equals(this.hasStarted, service.hasStarted)
-				&& Objects.equals(this.isServiceEnabled, service.isServiceEnabled)
-				&& Objects.equals(this.isStateful, service.isStateful) && Objects.equals(this.name, service.name)
-				&& Objects.equals(this.serviceDate, service.serviceDate)
-				&& Objects.equals(this.serviceType, service.serviceType)
-				&& Objects.equals(this.startDate, service.startDate)
-				&& Objects.equals(this.startMode, service.startMode) && Objects.equals(this.note, service.note)
-				&& Objects.equals(this.place, service.place) && Objects.equals(this.relatedParty, service.relatedParty)
-				&& Objects.equals(this.serviceCharacteristic, service.serviceCharacteristic)
-				&& Objects.equals(this.serviceOrder, service.serviceOrder)
-				&& Objects.equals(this.serviceRelationship, service.serviceRelationship)
-				&& Objects.equals(this.serviceSpecificationRef, service.serviceSpecificationRef)
-				&& Objects.equals(this.state, service.state)
-				&& Objects.equals(this.supportingResource, service.supportingResource)
-				&& Objects.equals(this.supportingService, service.supportingService)
-				&& Objects.equals(this.baseType, service.baseType)
-				&& Objects.equals(this.schemaLocation, service.schemaLocation)
-				&& Objects.equals(this.type, service.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, category, description, endDate, hasStarted, isServiceEnabled, isStateful, name,
-//				serviceDate, serviceType, startDate, startMode, note, place, relatedParty, serviceCharacteristic,
-//				serviceOrder, serviceRelationship, serviceSpecification, state, supportingResource, supportingService,
-//				baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Service {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(descriptionL)).append("\n");
-		sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-		sb.append("    hasStarted: ").append(toIndentedString(hasStarted)).append("\n");
-		sb.append("    isServiceEnabled: ").append(toIndentedString(isServiceEnabled)).append("\n");
-		sb.append("    isStateful: ").append(toIndentedString(isStateful)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    serviceDate: ").append(toIndentedString(serviceDate)).append("\n");
-		sb.append("    serviceType: ").append(toIndentedString(serviceType)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    startMode: ").append(toIndentedString(startMode)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    serviceCharacteristic: ").append(toIndentedString(serviceCharacteristic)).append("\n");
-		sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-		sb.append("    serviceRelationship: ").append(toIndentedString(serviceRelationship)).append("\n");
-		sb.append("    serviceSpecificationRef: ").append(toIndentedString(serviceSpecificationRef)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    supportingResource: ").append(toIndentedString(supportingResource)).append("\n");
-		sb.append("    supportingService: ").append(toIndentedString(supportingService)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-
-	public Characteristic getServiceCharacteristicByName(String name) {
-		for (Characteristic c : this.serviceCharacteristic) {
-			if ( c.getName().equals(name)) {
-				return c;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueAction.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueAction.java
deleted file mode 100644
index f5ee01a51b3fcd3c2a8706f55a822a2635ce3216..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-public enum ServiceActionQueueAction {
-
-	NONE,
-	CREATE,
-	MODIFY,
-	DEACTIVATE,
-	TERMINATE,
-	EVALUATE_STATE_CHANGE_TOACTIVE,
-	EVALUATE_STATE_CHANGE_TOINACTIVE,
-	EVALUATE_CHARACTERISTIC_CHANGED,
-	EVALUATE_CHARACTERISTIC_CHANGED_MANODAY2
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueItem.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueItem.java
deleted file mode 100644
index 2ce33fa9eea00d45491173895f240d8865c31111..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceActionQueueItem.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-
-
-package org.etsi.osl.tmf.sim638.model;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
-import jakarta.persistence.Lob;
-
-/**
- * @author ctranoris
- * 
- * These are items inserted in the ServiceActionQueue
- *
- */
-@Entity(name = "ServiceActionQueueItem")
-@Inheritance( strategy = InheritanceType.TABLE_PER_CLASS )
-@Schema(description = "These are items inserted in the ServiceActionQueue ")
-@Validated
-public class ServiceActionQueueItem {
-
-
-	@Id
-	@GeneratedValue(generator = "uuid")
-	@GenericGenerator(name = "uuid", strategy = "uuid2")
-	protected String uuid = null;
-	
-
-	@JsonProperty("serviceRefId")
-	private String serviceRefId = null;
-	
-
-	private OffsetDateTime insertedDate = null;
-
-	@JsonProperty("action")
-	ServiceActionQueueAction action = ServiceActionQueueAction.NONE; 
-	
-	/**
-	 * keeps the original service object in JSON. Useful to revert changes or identify different characteristics
-	 */
-
-	@Lob
-	@Column(name = "LORIGINAL_SERVICE", columnDefinition = "LONGTEXT")
-	private String originalServiceInJSONL;
-	
-	public ServiceActionQueueItem() {
-		insertedDate = OffsetDateTime.now(ZoneOffset.UTC);
-	}
-
-	/**
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * @param uuid the uuid to set
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * @return the serviceRefId
-	 */
-	public String getServiceRefId() {
-		return serviceRefId;
-	}
-
-	/**
-	 * @param serviceRefId the serviceRefId to set
-	 */
-	public void setServiceRefId(String serviceRefId) {
-		this.serviceRefId = serviceRefId;
-	}
-
-	/**
-	 * @return the insertedDate
-	 */
-	public OffsetDateTime getInsertedDate() {
-		return insertedDate;
-	}
-
-	/**
-	 * @param insertedDate the insertedDate to set
-	 */
-	public void setInsertedDate(OffsetDateTime insertedDate) {
-		this.insertedDate = insertedDate;
-	}
-	
-	public void setInsertedDate(String insDate) {
-		if ( insDate!=null ) {
-			this.insertedDate = OffsetDateTime.parse( insDate );			
-		}
-	}
-	
-	
-	@JsonProperty("insertedDate")
-	public String getInsertedDateStr() {
-		if ( this.insertedDate != null ) {
-			return this.insertedDate.toString();			
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return the action
-	 */
-	public ServiceActionQueueAction getAction() {
-		return action;
-	}
-
-	/**
-	 * @param action the action to set
-	 */
-	public void setAction(ServiceActionQueueAction action) {
-		this.action = action;
-	}
-	
-	
-	/**
-	 * keeps the original service object in JSON. Useful to revert changes or identify different characteristics
-	 */
-
-	public String getOriginalServiceInJSON() {
-		return originalServiceInJSONL;
-	}
-	/**
-	 * keeps the original service object in JSON. Useful to revert changes or identify different characteristics
-	 */
-
-	public void setOriginalServiceInJSON(String originalServiceInJSON) {
-		this.originalServiceInJSONL = originalServiceInJSON;
-	}
-	
-	
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeEvent.java
deleted file mode 100644
index 0a41577b0372d2e345b3348b26d7daa821c20a9d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceAttributeValueChangeEvent   {
-  @JsonProperty("service")
-  private Service service = null;
-
-  public ServiceAttributeValueChangeEvent service(Service service) {
-    this.service = service;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return service
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Service getService() {
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = service;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceAttributeValueChangeEvent serviceAttributeValueChangeEvent = (ServiceAttributeValueChangeEvent) o;
-    return Objects.equals(this.service, serviceAttributeValueChangeEvent.service);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(service);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceAttributeValueChangeEvent {\n");
-    
-    sb.append("    service: ").append(toIndentedString(service)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeNotification.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeNotification.java
deleted file mode 100644
index 05ef0c43e2e022a7950f25da85d6900257f14390..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceAttributeValueChangeNotification.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceAttributeValueChangeNotification extends Notification  {
-  
-  @JsonProperty("event")
-  private ServiceAttributeValueChangeEvent event = null;
-
-  public ServiceAttributeValueChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  
-  public ServiceAttributeValueChangeNotification event(ServiceAttributeValueChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceAttributeValueChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceAttributeValueChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceAttributeValueChangeNotification serviceAttributeValueChangeNotification = (ServiceAttributeValueChangeNotification) o;
-    return Objects.equals(this.eventId, serviceAttributeValueChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceAttributeValueChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceAttributeValueChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceAttributeValueChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceAttributeValueChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceAttributeValueChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceAttributeValueChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchEvent.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchEvent.java
deleted file mode 100644
index 036d22f861fd5f00b402b84088186130e7f654de..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceBatchEvent   {
-  @JsonProperty("service")
-  private Service service = null;
-
-  public ServiceBatchEvent service(Service service) {
-    this.service = service;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return service
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Service getService() {
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = service;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceBatchEvent serviceBatchEvent = (ServiceBatchEvent) o;
-    return Objects.equals(this.service, serviceBatchEvent.service);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(service);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceBatchEvent {\n");
-    
-    sb.append("    service: ").append(toIndentedString(service)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchNotification.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchNotification.java
deleted file mode 100644
index e49a3b4fbf27d7886fb1518f41bc7336e2ad0782..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceBatchNotification.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceBatchNotification extends Notification  {
- 
-  @JsonProperty("event")
-  private ServiceBatchEvent event = null;
-
-  public ServiceBatchNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-
-  public ServiceBatchNotification event(ServiceBatchEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceBatchEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceBatchEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceBatchNotification serviceBatchNotification = (ServiceBatchNotification) o;
-    return Objects.equals(this.eventId, serviceBatchNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceBatchNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceBatchNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceBatchNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceBatchNotification.resourcePath) &&
-        Objects.equals(this.event, serviceBatchNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceBatchNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreate.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreate.java
deleted file mode 100644
index a0280e3f1d64ec7c9a7e84d94c9370fe124fd5ca..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreate.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Service is a base class for defining the Service hierarchy. All Services are characterized as either being possibly visible and usable by a Customer or not. This gives rise to the two subclasses of Service: CustomerFacingService and ResourceFacingService. Skipped properties: id,href
- */
-@Schema(description = "Service is a base class for defining the Service hierarchy. All Services are characterized as either being possibly visible and usable by a Customer or not. This gives rise to the two subclasses of Service: CustomerFacingService and ResourceFacingService. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceCreate extends ServiceUpdate  {
- 
-
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCreate serviceCreate = (ServiceCreate) o;
-    return Objects.equals(this.category, serviceCreate.category) &&
-        Objects.equals(this.description, serviceCreate.description) &&
-        Objects.equals(this.endDate, serviceCreate.endDate) &&
-        Objects.equals(this.hasStarted, serviceCreate.hasStarted) &&
-        Objects.equals(this.isServiceEnabled, serviceCreate.isServiceEnabled) &&
-        Objects.equals(this.isStateful, serviceCreate.isStateful) &&
-        Objects.equals(this.name, serviceCreate.name) &&
-        Objects.equals(this.serviceDate, serviceCreate.serviceDate) &&
-        Objects.equals(this.serviceType, serviceCreate.serviceType) &&
-        Objects.equals(this.startDate, serviceCreate.startDate) &&
-        Objects.equals(this.startMode, serviceCreate.startMode) &&
-        Objects.equals(this.note, serviceCreate.note) &&
-        Objects.equals(this.place, serviceCreate.place) &&
-        Objects.equals(this.relatedParty, serviceCreate.relatedParty) &&
-        Objects.equals(this.serviceCharacteristic, serviceCreate.serviceCharacteristic) &&
-        Objects.equals(this.serviceOrder, serviceCreate.serviceOrder) &&
-        Objects.equals(this.serviceRelationship, serviceCreate.serviceRelationship) &&
-        Objects.equals(this.serviceSpecificationRef, serviceCreate.serviceSpecificationRef) &&
-        Objects.equals(this.state, serviceCreate.state) &&
-        Objects.equals(this.supportingResource, serviceCreate.supportingResource) &&
-        Objects.equals(this.supportingService, serviceCreate.supportingService) &&
-        Objects.equals(this.baseType, serviceCreate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceCreate.schemaLocation) &&
-        Objects.equals(this.type, serviceCreate.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(category, description, endDate, hasStarted, isServiceEnabled, isStateful, name, serviceDate, serviceType, startDate, startMode, note, place, relatedParty, serviceCharacteristic, serviceOrder, serviceRelationship, serviceSpecification, state, supportingResource, supportingService, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreate {\n");
-    
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-    sb.append("    hasStarted: ").append(toIndentedString(hasStarted)).append("\n");
-    sb.append("    isServiceEnabled: ").append(toIndentedString(isServiceEnabled)).append("\n");
-    sb.append("    isStateful: ").append(toIndentedString(isStateful)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    serviceDate: ").append(toIndentedString(serviceDate)).append("\n");
-    sb.append("    serviceType: ").append(toIndentedString(serviceType)).append("\n");
-    sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-    sb.append("    startMode: ").append(toIndentedString(startMode)).append("\n");
-    sb.append("    note: ").append(toIndentedString(note)).append("\n");
-    sb.append("    place: ").append(toIndentedString(place)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    serviceCharacteristic: ").append(toIndentedString(serviceCharacteristic)).append("\n");
-    sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-    sb.append("    serviceRelationship: ").append(toIndentedString(serviceRelationship)).append("\n");
-    sb.append("    serviceSpecificationRef: ").append(toIndentedString(serviceSpecificationRef)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    supportingResource: ").append(toIndentedString(supportingResource)).append("\n");
-    sb.append("    supportingService: ").append(toIndentedString(supportingService)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateEvent.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateEvent.java
deleted file mode 100644
index 08c4e3e06a6f2a58bf973d30195b43d14643e7d5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceCreateEvent   {
-  @JsonProperty("service")
-  private Service service = null;
-
-  public ServiceCreateEvent service(Service service) {
-    this.service = service;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return service
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Service getService() {
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = service;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCreateEvent serviceCreateEvent = (ServiceCreateEvent) o;
-    return Objects.equals(this.service, serviceCreateEvent.service);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(service);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreateEvent {\n");
-    
-    sb.append("    service: ").append(toIndentedString(service)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateNotification.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateNotification.java
deleted file mode 100644
index c5f42a4a58ddee7abbb1beb7b5aeaccc7c000472..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceCreateNotification.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceCreateNotification extends Notification  {
-  
-
-  @JsonProperty("event")
-  private ServiceCreateEvent event = null;
-
-  public ServiceCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ServiceCreateNotification event(ServiceCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceCreateNotification serviceCreateNotification = (ServiceCreateNotification) o;
-    return Objects.equals(this.eventId, serviceCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteEvent.java
deleted file mode 100644
index a901f1158fd9eb29e0c47bcdd70d97e61395a33d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceDeleteEvent   {
-  @JsonProperty("service")
-  private Service service = null;
-
-  public ServiceDeleteEvent service(Service service) {
-    this.service = service;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return service
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Service getService() {
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = service;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceDeleteEvent serviceDeleteEvent = (ServiceDeleteEvent) o;
-    return Objects.equals(this.service, serviceDeleteEvent.service);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(service);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceDeleteEvent {\n");
-    
-    sb.append("    service: ").append(toIndentedString(service)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteNotification.java
deleted file mode 100644
index 8d2c3eacd71d49a2b050e5798db7372500bef73e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceDeleteNotification.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceDeleteNotification extends Notification {
-
-  @JsonProperty("event")
-  private ServiceDeleteEvent event = null;
-
-  public ServiceDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-  public ServiceDeleteNotification event(ServiceDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceDeleteNotification serviceDeleteNotification = (ServiceDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceOrderRef.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceOrderRef.java
deleted file mode 100644
index 647d55ab83208f80a599ead3e6c1d90395bc740e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceOrderRef.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Service Order reference. Useful to understand the which was the Service order
- * through which the service was instantiated in the service inventory
- */
-@Schema(description = "Service Order reference. Useful to understand the which was the Service order through which the service was instantiated in the service inventory")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-@Entity(name = "ServiceOrderRef")
-@JsonIgnoreProperties({ "uuid" })
-public class ServiceOrderRef extends BaseRootEntity {
-	
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("serviceOrderItemId")
-	private String serviceOrderItemId = null;
-
-	@JsonProperty("@referredType")
-	private String referredType = null;
-
-	public ServiceOrderRef id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the Service Order
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the Service Order")
-	@NotNull
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-
-
-	public ServiceOrderRef serviceOrderItemId(String serviceOrderItemId) {
-		this.serviceOrderItemId = serviceOrderItemId;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the Service Order Item within a service order, not
-	 * populated if this is a reference to a service order
-	 * 
-	 * @return serviceOrderItemId
-	 **/
-	@Schema(description = "Unique identifier of the Service Order Item within a service order, not populated if this is a reference to a service order")
-
-	public String getServiceOrderItemId() {
-		return serviceOrderItemId;
-	}
-
-	public void setServiceOrderItemId(String serviceOrderItemId) {
-		this.serviceOrderItemId = serviceOrderItemId;
-	}
-
-
-
-
-
-	public ServiceOrderRef referredType(String referredType) {
-		this.referredType = referredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return referredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getReferredType() {
-		return referredType;
-	}
-
-	public void setReferredType(String referredType) {
-		this.referredType = referredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceOrderRef serviceOrderRef = (ServiceOrderRef) o;
-		return Objects.equals(this.id, serviceOrderRef.id) && Objects.equals(this.href, serviceOrderRef.href)
-				&& Objects.equals(this.serviceOrderItemId, serviceOrderRef.serviceOrderItemId)
-				&& Objects.equals(this.baseType, serviceOrderRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceOrderRef.schemaLocation)
-				&& Objects.equals(this.type, serviceOrderRef.type)
-				&& Objects.equals(this.referredType, serviceOrderRef.referredType);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, serviceOrderItemId, baseType, schemaLocation, type, referredType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrderRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    serviceOrderItemId: ").append(toIndentedString(serviceOrderItemId)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeEvent.java
deleted file mode 100644
index 14c9b30c71d1a6c48988d863c817a4d8f487d7b5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceStateChangeEvent   {
-  @JsonProperty("service")
-  private Service service = null;
-
-  public ServiceStateChangeEvent service(Service service) {
-    this.service = service;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return service
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public Service getService() {
-    return service;
-  }
-
-  public void setService(Service service) {
-    this.service = service;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceStateChangeEvent serviceStateChangeEvent = (ServiceStateChangeEvent) o;
-    return Objects.equals(this.service, serviceStateChangeEvent.service);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(service);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceStateChangeEvent {\n");
-    
-    sb.append("    service: ").append(toIndentedString(service)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeNotification.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeNotification.java
deleted file mode 100644
index 7b8a4c78930dee9ca19dedf10ca5bc63a8424de2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceStateChangeNotification.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceStateChangeNotification extends Notification   {
- 
-
-  @JsonProperty("event")
-  private ServiceStateChangeEvent event = null;
-
-  public ServiceStateChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ServiceStateChangeNotification event(ServiceStateChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceStateChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceStateChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceStateChangeNotification serviceStateChangeNotification = (ServiceStateChangeNotification) o;
-    return Objects.equals(this.eventId, serviceStateChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceStateChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceStateChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceStateChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceStateChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceStateChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceStateChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceUpdate.java b/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceUpdate.java
deleted file mode 100644
index e7a9aac28b9976c2ef13ee9ef1192a9814c2f217..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sim638/model/ServiceUpdate.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sim638.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Characteristic;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.common.model.service.Place;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRelationship;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.common.model.service.ServiceStateType;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Service is a base class for defining the Service hierarchy. All Services are
- * characterized as either being possibly visible and usable by a Customer or
- * not. This gives rise to the two subclasses of Service: CustomerFacingService
- * and ResourceFacingService. Skipped properties: id,href,serviceRelationship
- */
-@Schema(description = "Service is a base class for defining the Service hierarchy. All Services are characterized as either being possibly visible and usable by a Customer or not. This gives rise to the two subclasses of Service: CustomerFacingService and ResourceFacingService. Skipped properties: id,href,serviceRelationship")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:12:41.682+03:00")
-
-public class ServiceUpdate {
-	@JsonProperty("category")
-	protected String category = null;
-
-	@JsonProperty("description")
-	protected String description = null;
-
-	protected OffsetDateTime endDate = null;
-
-	@JsonProperty("hasStarted")
-	protected Boolean hasStarted = null;
-
-	@JsonProperty("isServiceEnabled")
-	protected Boolean isServiceEnabled = null;
-
-	@JsonProperty("isStateful")
-	protected Boolean isStateful = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("serviceDate")
-	protected String serviceDate = null;
-
-	@JsonProperty("serviceType")
-	protected String serviceType = null;
-
-	protected OffsetDateTime startDate = null;
-
-	@JsonProperty("startMode")
-	protected String startMode = null;
-
-	@JsonProperty("note")
-	@Valid
-	protected List<Note> note = null;
-
-	@JsonProperty("place")
-	@Valid
-	protected List<Place> place = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("serviceCharacteristic")
-	@Valid
-	protected List<Characteristic> serviceCharacteristic = null;
-
-	@JsonProperty("serviceOrder")
-	@Valid
-	protected List<ServiceOrderRef> serviceOrder = null;
-
-	@JsonProperty("serviceSpecification")
-	protected ServiceSpecificationRef serviceSpecificationRef = null;
-
-	@JsonProperty("state")
-	protected ServiceStateType state = null;
-
-	@JsonProperty("supportingResource")
-	@Valid
-	protected List<ResourceRef> supportingResource = null;
-
-	@JsonProperty("supportingService")
-	@Valid
-	protected List<ServiceRef> supportingService = null;
-	
-
-	@JsonProperty("serviceRelationship")
-	@Valid
-	protected List<ServiceRelationship> serviceRelationship = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ServiceUpdate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Is it a customer facing or resource facing service
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Is it a customer facing or resource facing service")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ServiceUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Free-text description of the service
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Free-text description of the service")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceUpdate endDate(OffsetDateTime endDate) {
-		this.endDate = endDate;
-		return this;
-	}
-
-	@JsonProperty("endDate")
-	public String getEndDateStr() {
-		if (this.endDate != null) {
-			return this.endDate.toString();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Date when the service ends
-	 * 
-	 * @return endDate
-	 **/
-	@Schema(description = "Date when the service ends")
-
-	@Valid
-
-	public OffsetDateTime getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(OffsetDateTime endDate) {
-		this.endDate = endDate;
-	}
-
-	public void setEndDate(String anendDate) {
-		if (anendDate != null) {
-			this.endDate = OffsetDateTime.parse(anendDate);
-
-		}
-
-	}
-
-	public ServiceUpdate hasStarted(Boolean hasStarted) {
-		this.hasStarted = hasStarted;
-		return this;
-	}
-
-	/**
-	 * If TRUE, this Service has already been started
-	 * 
-	 * @return hasStarted
-	 **/
-	@Schema(description = "If TRUE, this Service has already been started")
-
-	public Boolean isHasStarted() {
-		return hasStarted;
-	}
-
-	public void setHasStarted(Boolean hasStarted) {
-		this.hasStarted = hasStarted;
-	}
-
-	public ServiceUpdate isServiceEnabled(Boolean isServiceEnabled) {
-		this.isServiceEnabled = isServiceEnabled;
-		return this;
-	}
-
-	/**
-	 * If FALSE, this particular Service has NOT been enabled for use
-	 * 
-	 * @return isServiceEnabled
-	 **/
-	@Schema(description = "If FALSE, this particular Service has NOT been enabled for use")
-
-	public Boolean isIsServiceEnabled() {
-		return isServiceEnabled;
-	}
-
-	public void setIsServiceEnabled(Boolean isServiceEnabled) {
-		this.isServiceEnabled = isServiceEnabled;
-	}
-
-	public ServiceUpdate isStateful(Boolean isStateful) {
-		this.isStateful = isStateful;
-		return this;
-	}
-
-	/**
-	 * If TRUE, this Service can be changed without affecting any other services
-	 * 
-	 * @return isStateful
-	 **/
-	@Schema(description = "If TRUE, this Service can be changed without affecting any other services")
-
-	public Boolean isIsStateful() {
-		return isStateful;
-	}
-
-	public void setIsStateful(Boolean isStateful) {
-		this.isStateful = isStateful;
-	}
-
-	public ServiceUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the service
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the service")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceUpdate serviceDate(String serviceDate) {
-		this.serviceDate = serviceDate;
-		return this;
-	}
-
-	/**
-	 * Date when the service was created (whatever its status).
-	 * 
-	 * @return serviceDate
-	 **/
-	@Schema(description = "Date when the service was created (whatever its status).")
-
-	public String getServiceDate() {
-		return serviceDate;
-	}
-
-	public void setServiceDate(String serviceDate) {
-		this.serviceDate = serviceDate;
-	}
-
-	public ServiceUpdate serviceType(String serviceType) {
-		this.serviceType = serviceType;
-		return this;
-	}
-
-	/**
-	 * Business type of the service
-	 * 
-	 * @return serviceType
-	 **/
-	@Schema(description = "Business type of the service")
-
-	public String getServiceType() {
-		return serviceType;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-
-	public ServiceUpdate startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-
-	/**
-	 * Date when the service starts
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the service starts")
-
-	@Valid
-
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-
-	@JsonProperty("startDate")
-	public String getStartDateStr() {
-		if (this.startDate != null) {
-			return this.startDate.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-
-	public void setStartDate(String astartDate) {
-		if (astartDate != null) {
-			this.startDate = OffsetDateTime.parse(astartDate);
-
-		}
-
-	}
-
-	public ServiceUpdate startMode(String startMode) {
-		this.startMode = startMode;
-		return this;
-	}
-
-	/**
-	 * This attribute is an enumerated integer that indicates how the Service is
-	 * started, such as: 0: Unknown; 1: Automatically by the managed environment; 2:
-	 * Automatically by the owning device; 3: Manually by the Provider of the
-	 * Service; 4: Manually by a Customer of the Provider; 5: Any of the above
-	 * 
-	 * @return startMode
-	 **/
-	@Schema(description = "This attribute is an enumerated integer that indicates how the Service is started, such as: 0: Unknown; 1: Automatically by the managed environment; 2: Automatically by the owning device; 3: Manually by the Provider of the Service; 4: Manually by a Customer of the Provider; 5: Any of the above")
-
-	public String getStartMode() {
-		return startMode;
-	}
-
-	public void setStartMode(String startMode) {
-		this.startMode = startMode;
-	}
-
-	public ServiceUpdate note(List<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ServiceUpdate addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new ArrayList<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * A list of notes made on this service
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "A list of notes made on this service")
-
-	@Valid
-
-	public List<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(List<Note> note) {
-		this.note = note;
-	}
-
-	public ServiceUpdate place(List<Place> place) {
-		this.place = place;
-		return this;
-	}
-
-	public ServiceUpdate addPlaceItem(Place placeItem) {
-		if (this.place == null) {
-			this.place = new ArrayList<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * A list of places related to this service, e.g. where the service is
-	 * installed, a delivery address for equipment, etc.
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "A list of places related to this service, e.g. where the service is installed, a delivery address for equipment, etc.")
-
-	@Valid
-
-	public List<Place> getPlace() {
-		return place;
-	}
-
-	public void setPlace(List<Place> place) {
-		this.place = place;
-	}
-
-	public ServiceUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of related party references (RelatedParty [1..*]). A related party
-	 * defines party or party role linked to a specific entity.
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of related party references (RelatedParty [1..*]). A related party defines party or party role linked to a specific entity.")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceUpdate serviceCharacteristic(List<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-		return this;
-	}
-
-	public ServiceUpdate addServiceCharacteristicItem(Characteristic serviceCharacteristicItem) {
-		if (this.serviceCharacteristic == null) {
-			this.serviceCharacteristic = new ArrayList<>();
-		}
-		this.serviceCharacteristic.add(serviceCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A list of characteristics that characterize this service
-	 * (ServiceCharacteristic [*])
-	 * 
-	 * @return serviceCharacteristic
-	 **/
-	@Schema(description = "A list of characteristics that characterize this service (ServiceCharacteristic [*]) ")
-
-	@Valid
-
-	public List<Characteristic> getServiceCharacteristic() {
-		return serviceCharacteristic;
-	}
-
-	public void setServiceCharacteristic(List<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-	}
-
-	public ServiceUpdate serviceOrder(List<ServiceOrderRef> serviceOrder) {
-		this.serviceOrder = serviceOrder;
-		return this;
-	}
-
-	public ServiceUpdate addServiceOrderItem(ServiceOrderRef serviceOrderItem) {
-		if (this.serviceOrder == null) {
-			this.serviceOrder = new ArrayList<>();
-		}
-		this.serviceOrder.add(serviceOrderItem);
-		return this;
-	}
-
-	/**
-	 * A list of service orders related to this service
-	 * 
-	 * @return serviceOrder
-	 **/
-	@Schema(description = "A list of service orders related to this service")
-
-	@Valid
-
-	public List<ServiceOrderRef> getServiceOrder() {
-		return serviceOrder;
-	}
-
-	public void setServiceOrder(List<ServiceOrderRef> serviceOrder) {
-		this.serviceOrder = serviceOrder;
-	}
-
-	public ServiceUpdate serviceSpecificationRef(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecificationRef = serviceSpecification;
-		return this;
-	}
-
-	/**
-	 * The specification from which this service was instantiated
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The specification from which this service was instantiated")
-
-	@Valid
-
-	public ServiceSpecificationRef getServiceSpecificationRef() {
-		return serviceSpecificationRef;
-	}
-
-	public void setServiceSpecificationRef(ServiceSpecificationRef serviceSpecification) {
-		this.serviceSpecificationRef = serviceSpecification;
-	}
-
-	public ServiceUpdate state(ServiceStateType state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The life cycle state of the service, such as: feasibilityChecked, designed,
-	 * reserved, active, inactive, terminated
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The life cycle state of the service, such as: feasibilityChecked, designed, reserved, active, inactive, terminated")
-
-	@Valid
-
-	public ServiceStateType getState() {
-		return state;
-	}
-
-	public void setState(ServiceStateType state) {
-		this.state = state;
-	}
-
-	public ServiceUpdate supportingResource(List<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-		return this;
-	}
-
-	public ServiceUpdate addSupportingResourceItem(ResourceRef supportingResourceItem) {
-		if (this.supportingResource == null) {
-			this.supportingResource = new ArrayList<>();
-		}
-		this.supportingResource.add(supportingResourceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting resources (SupportingResource [*]).Note: only Service of
-	 * type RFS can be associated with Resources.
-	 * 
-	 * @return supportingResource
-	 **/
-	@Schema(description = "A list of supporting resources (SupportingResource [*]).Note: only Service of type RFS can be associated with Resources.")
-
-	@Valid
-
-	public List<ResourceRef> getSupportingResource() {
-		return supportingResource;
-	}
-
-	public void setSupportingResource(List<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-	}
-
-	public ServiceUpdate supportingService(List<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-		return this;
-	}
-
-	public ServiceUpdate addSupportingServiceItem(ServiceRef supportingServiceItem) {
-		if (this.supportingService == null) {
-			this.supportingService = new ArrayList<>();
-		}
-		this.supportingService.add(supportingServiceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting services (SupportingService [*]). A collection of
-	 * services that support this service (bundling, link CFS to RFS).
-	 * 
-	 * @return supportingService
-	 **/
-	@Schema(description = "A list of supporting services (SupportingService [*]). A collection of services that support this service (bundling, link CFS to RFS).")
-
-	@Valid
-
-	public List<ServiceRef> getSupportingService() {
-		return supportingService;
-	}
-
-	public void setSupportingService(List<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-	}
-
-	public ServiceUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-
-
-	public ServiceRelationship addServiceRelationshipItem(ServiceRelationship serviceRelationshipItem) {
-		if (this.serviceRelationship == null) {
-			this.serviceRelationship = new ArrayList<>();
-		}
-		this.serviceRelationship.add(serviceRelationshipItem);
-		return serviceRelationshipItem;
-	}
-
-	/**
-	 * A list of service relationships (ServiceRelationship [*]). Describes links
-	 * with other service(s) in the inventory (useful for describing relies-on,
-	 * relies-from between CFS for example).
-	 * 
-	 * @return serviceRelationship
-	 **/
-	@Schema(description = "A list of service relationships (ServiceRelationship [*]). Describes links with other service(s) in the inventory (useful for describing relies-on, relies-from between CFS for example).")
-
-	@Valid
-
-	public List<ServiceRelationship> getServiceRelationship() {
-		return serviceRelationship;
-	}
-
-	public void setServiceRelationship(List<ServiceRelationship> serviceRelationship) {
-		this.serviceRelationship = serviceRelationship;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceUpdate serviceUpdate = (ServiceUpdate) o;
-		return Objects.equals(this.category, serviceUpdate.category)
-				&& Objects.equals(this.description, serviceUpdate.description)
-				&& Objects.equals(this.endDate, serviceUpdate.endDate)
-				&& Objects.equals(this.hasStarted, serviceUpdate.hasStarted)
-				&& Objects.equals(this.isServiceEnabled, serviceUpdate.isServiceEnabled)
-				&& Objects.equals(this.isStateful, serviceUpdate.isStateful)
-				&& Objects.equals(this.name, serviceUpdate.name)
-				&& Objects.equals(this.serviceDate, serviceUpdate.serviceDate)
-				&& Objects.equals(this.serviceType, serviceUpdate.serviceType)
-				&& Objects.equals(this.startDate, serviceUpdate.startDate)
-				&& Objects.equals(this.startMode, serviceUpdate.startMode)
-				&& Objects.equals(this.note, serviceUpdate.note) && Objects.equals(this.place, serviceUpdate.place)
-				&& Objects.equals(this.relatedParty, serviceUpdate.relatedParty)
-				&& Objects.equals(this.serviceCharacteristic, serviceUpdate.serviceCharacteristic)
-				&& Objects.equals(this.serviceOrder, serviceUpdate.serviceOrder)
-				&& Objects.equals(this.serviceSpecificationRef, serviceUpdate.serviceSpecificationRef)
-				&& Objects.equals(this.state, serviceUpdate.state)
-				&& Objects.equals(this.supportingResource, serviceUpdate.supportingResource)
-				&& Objects.equals(this.supportingService, serviceUpdate.supportingService)
-				&& Objects.equals(this.baseType, serviceUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceUpdate.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(category, description, endDate, hasStarted, isServiceEnabled, isStateful, name, serviceDate, serviceType, startDate, startMode, note, place, relatedParty, serviceCharacteristic, serviceOrder, serviceSpecification, state, supportingResource, supportingService, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceUpdate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endDate: ").append(toIndentedString(endDate)).append("\n");
-		sb.append("    hasStarted: ").append(toIndentedString(hasStarted)).append("\n");
-		sb.append("    isServiceEnabled: ").append(toIndentedString(isServiceEnabled)).append("\n");
-		sb.append("    isStateful: ").append(toIndentedString(isStateful)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    serviceDate: ").append(toIndentedString(serviceDate)).append("\n");
-		sb.append("    serviceType: ").append(toIndentedString(serviceType)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    startMode: ").append(toIndentedString(startMode)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    serviceCharacteristic: ").append(toIndentedString(serviceCharacteristic)).append("\n");
-		sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-		sb.append("    serviceSpecification: ").append(toIndentedString(serviceSpecificationRef)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    supportingResource: ").append(toIndentedString(supportingResource)).append("\n");
-		sb.append("    supportingService: ").append(toIndentedString(supportingService)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/AppointmentRef.java b/src/main/java/org/etsi/osl/tmf/so641/model/AppointmentRef.java
deleted file mode 100644
index 8893f1207a11606e6cbf96bd4a74a2231fce2bad..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/AppointmentRef.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Refers an appointment, such as a Customer presentation or internal meeting or site visit
- */
-@Schema(description = "Refers an appointment, such as a Customer presentation or internal meeting or site visit")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "AppointmentRef")
-public class AppointmentRef extends BaseRootEntity  {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  /**
-   * The identifier of the referred appointment
-   * @return id
-  **/
-  @Schema(description = "The identifier of the referred appointment")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public AppointmentRef description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explanatory text regarding the appointment made with a party
-   * @return description
-  **/
-  @Schema(description = "An explanatory text regarding the appointment made with a party")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-
-  /**
-   * The actual type of the target instance when needed for disambiguation
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AppointmentRef appointmentRef = (AppointmentRef) o;
-    return Objects.equals(this.id, appointmentRef.id) &&
-        Objects.equals(this.href, appointmentRef.href) &&
-        Objects.equals(this.description, appointmentRef.description) &&
-        Objects.equals(this.baseType, appointmentRef.baseType) &&
-        Objects.equals(this.schemaLocation, appointmentRef.schemaLocation) &&
-        Objects.equals(this.type, appointmentRef.type) &&
-        Objects.equals(this.referredType, appointmentRef.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AppointmentRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/Error.java b/src/main/java/org/etsi/osl/tmf/so641/model/Error.java
deleted file mode 100644
index 466ec4f64164a28129fb1614e81471ad2379e793..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/Error.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-  @NotNull
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-  @NotNull
-
-
-  public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-
-
-  public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscription.java
deleted file mode 100644
index 7d8f62e5f8917c3924987f7b2427baa17cdc1601..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscription.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscriptionInput.java
deleted file mode 100644
index 5cde564cb00c7a30817328b8944eb7620dfba30a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrder.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrder.java
deleted file mode 100644
index 9e1d28ecc5d417f5733ab94abe9a3751712c4ede..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrder.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.UserPartRoleType;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * ServiceOrder
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "ServiceOrder")
-@JsonIgnoreProperties("orderRequester")
-public class ServiceOrder extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("category")
-	private String category = null;
-
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-
-	@JsonProperty("externalId")
-	private String externalId = null;
-
-	@JsonProperty("notificationContact")
-	private String notificationContact = null;
-
-	private OffsetDateTime orderDate = null;
-
-	@JsonProperty("priority")
-	private String priority = null;
-
-	private OffsetDateTime completionDate = null;
-	
-	private OffsetDateTime expectedCompletionDate = null;
-	
-	private OffsetDateTime requestedCompletionDate = null;
-
-	private OffsetDateTime requestedStartDate = null;
-
-	private OffsetDateTime startDate = null;
-
-	@JsonProperty("note")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Note> note =  new HashSet<>();
-
-	@JsonProperty("orderItem")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceOrderItem> orderItem =  new HashSet<>();
-
-	@JsonProperty("orderRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceOrderRelationship> orderRelationship =  new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty =  new HashSet<>();
-
-	@JsonProperty("state")
-	private ServiceOrderStateType state = ServiceOrderStateType.INITIAL;
-
-	public ServiceOrder () {
-		super();
-		this.baseType = "BaseRootEntity";
-		this.type = "ServiceOrder";
-	}
-
-	/**
-	 * ID created on repository side
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "ID created on repository side")
-
-	public String getId() {
-		if ( ( id != null) && (uuid == null) ) { //this check is good for external partners when no uuid exists
-			return id;
-		}
-		return uuid;
-	}
-
-
-	/**
-	 * Used to categorize the order, useful for the OM system, such as: Broadband,
-	 * TVOption
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Used to categorize the order, useful for the OM system, such as: Broadband, TVOption")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ServiceOrder completionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-		return this;
-	}
-
-	/**
-	 * Effective delivery date amended by the provider
-	 * 
-	 * @return completionDate
-	 **/
-	@Schema(description = "Effective delivery date amended by the provider")
-
-	@Valid
-	@JsonProperty("completionDate")
-	public String getCompletionDateString() {
-		if ( this.completionDate == null) {
-			return null;
-		}
-		return this.completionDate.toString();
-	}
-	
-	public OffsetDateTime getCompletionDate() {
-		return completionDate;
-	}
-
-	public void setCompletionDate(OffsetDateTime completionDate) {
-		this.completionDate = completionDate;
-	}
-
-	public ServiceOrder description(String description) {
-		this.description = description;
-		return this;
-	}
-	
-	public void setCompletionDate(String completionDate) {
-		if (completionDate!=null) {
-			this.completionDate = OffsetDateTime.parse( completionDate );			
-		}
-	}
-
-
-	/**
-	 * A free-text description of the service order
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A free-text description of the service order")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceOrder expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Expected delivery date amended by the provider
-	 * 
-	 * @return expectedCompletionDate
-	 **/
-	@Schema(description = "Expected delivery date amended by the provider")
-
-	@Valid
-
-	@JsonProperty("expectedCompletionDate")
-	public String getExpectedCompletionDateString() {
-
-		if ( this.expectedCompletionDate == null) {
-			return null;
-		}
-		return this.expectedCompletionDate.toString();
-	}
-	
-	public OffsetDateTime getExpectedCompletionDate() {
-		return expectedCompletionDate;
-	}
-
-	public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-	}
-	
-	public void setExpectedCompletionDate(String expectedCompletionDate) {
-		if (expectedCompletionDate!=null) {
-			this.expectedCompletionDate = OffsetDateTime.parse( expectedCompletionDate );
-			
-		}
-	}
-	
-
-	public ServiceOrder externalId(String externalId) {
-		this.externalId = externalId;
-		return this;
-	}
-	
-	
-
-	/**
-	 * ID given by the consumer to facilitate searches
-	 * 
-	 * @return externalId
-	 **/
-	@Schema(description = "ID given by the consumer to facilitate searches")
-
-	public String getExternalId() {
-		return externalId;
-	}
-
-	public void setExternalId(String externalId) {
-		this.externalId = externalId;
-	}
-
-	public ServiceOrder notificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-		return this;
-	}
-
-	/**
-	 * Contact attached to the order to send back information regarding this order
-	 * 
-	 * @return notificationContact
-	 **/
-	@Schema(description = "Contact attached to the order to send back information regarding this order")
-
-	public String getNotificationContact() {
-		return notificationContact;
-	}
-
-	public void setNotificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-	}
-
-	public ServiceOrder orderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-		return this;
-	}
-
-	/**
-	 * Get orderDate
-	 * 
-	 * @return orderDate
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	@JsonProperty("orderDate")
-	public String getOrderDateString() {
-		if ( this.orderDate == null) {
-			return null;
-		}
-		return this.orderDate.toString();
-	}
-	
-	public OffsetDateTime getOrderDate() {
-		return orderDate;
-	}
-
-	public void setOrderDate(OffsetDateTime orderDate) {
-		this.orderDate = orderDate;
-	}
-
-	public ServiceOrder priority(String priority) {
-		this.priority = priority;
-		return this;
-	}
-	
-	public void setOrderDate(String orderDate) {
-
-		if (orderDate!=null) {
-			this.orderDate = OffsetDateTime.parse( orderDate );
-			
-		}
-	}
-
-	/**
-	 * Can be used by consumers to prioritize orders in a Service Order Management
-	 * system
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "Can be used by consumers to prioritize orders in a Service Order Management system")
-
-	public String getPriority() {
-		return priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-
-	public ServiceOrder requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Requested delivery date from the requestors perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestors perspective")
-
-	@Valid
-
-	@JsonProperty("requestedCompletionDate")
-	public String getRequestedCompletionDateString() {
-
-		if ( this.requestedCompletionDate == null) {
-			return null;
-		}
-		return this.requestedCompletionDate.toString();
-	}
-	
-	public OffsetDateTime getRequestedCompletionDate() {
-		return requestedCompletionDate;
-	}
-
-	public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-	}
-
-	public ServiceOrder requestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-		return this;
-	}
-	
-	public void setRequestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate!=null) {
-			this.requestedCompletionDate = OffsetDateTime.parse( requestedCompletionDate );
-			
-		}
-	}
-
-	/**
-	 * Order start date wished by the requestor
-	 * 
-	 * @return requestedStartDate
-	 **/
-	@Schema(description = "Order start date wished by the requestor")
-
-	@Valid
-	@JsonProperty("requestedStartDate")
-	public String getRequestedStartDateString() {
-
-		if ( this.requestedStartDate == null) {
-			return null;
-		}
-		return this.requestedStartDate.toString();
-	}
-	
-	public OffsetDateTime getRequestedStartDate() {
-		return requestedStartDate;
-	}
-
-	public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-	}
-
-	
-	public void setRequestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate!=null) {
-			this.requestedStartDate = OffsetDateTime.parse( requestedStartDate );
-			
-		}
-	}
-
-
-	public ServiceOrder startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-	/**
-	 * Date when the order was started for processing
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the order was started for processing")
-
-	@Valid
-	@JsonProperty("startDate")
-	public String getStartDateString() {
-		if ( this.startDate == null) {
-			return null;
-		}
-		return this.startDate.toString();
-	}
-	
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-	
-	public void setStartDate(String requestedStartDate) {
-		if (requestedStartDate!=null) {
-			this.startDate = OffsetDateTime.parse( requestedStartDate );			
-		}
-	}
-
-
-	public ServiceOrder note(Set<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ServiceOrder addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new HashSet<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Extra-information about the order; e.g. useful to add extra delivery
-	 * information that could be useful for a human process
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "Extra-information about the order; e.g. useful to add extra delivery information that could be useful for a human process")
-
-	@Valid
-
-	public Set<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(Set<Note> note) {
-		this.note = note;
-	}
-
-	public ServiceOrder orderItem(Set<ServiceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-		return this;
-	}
-
-	public ServiceOrder addOrderItemItem(ServiceOrderItem orderItemItem) {
-		this.orderItem.add(orderItemItem);
-		return this;
-	}
-
-	/**
-	 * A list of service order items to be processed by this order
-	 * 
-	 * @return orderItem
-	 **/
-	@Schema(description = "A list of service order items to be processed by this order")
-	@NotNull
-
-	@Valid
-	@Size(min = 1)
-	public Set<ServiceOrderItem> getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(Set<ServiceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public ServiceOrder orderRelationship(Set<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-		return this;
-	}
-
-	public ServiceOrder addOrderRelationshipItem(ServiceOrderRelationship orderRelationshipItem) {
-		if (this.orderRelationship == null) {
-			this.orderRelationship = new HashSet<>();
-		}
-		this.orderRelationship.add(orderRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service orders related to this order (e.g. prerequisite, dependent
-	 * on)
-	 * 
-	 * @return orderRelationship
-	 **/
-	@Schema(description = "A list of service orders related to this order (e.g. prerequisite, dependent on)")
-
-	@Valid
-
-	public Set<ServiceOrderRelationship> getOrderRelationship() {
-		return orderRelationship;
-	}
-
-	public void setOrderRelationship(Set<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-	}
-
-	public ServiceOrder relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceOrder addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of parties which are involved in this order and the role they are
-	 * playing
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of parties which are involved in this order and the role they are playing")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceOrder state(ServiceOrderStateType state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * State of the order: described in the state-machine diagram
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "State of the order: described in the state-machine diagram")
-
-	@Valid
-
-	public ServiceOrderStateType getState() {
-		return state;
-	}
-
-	public void setState(ServiceOrderStateType state) {
-		this.state = state;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceOrder serviceOrder = (ServiceOrder) o;
-		return Objects.equals(this.id, serviceOrder.id) && Objects.equals(this.href, serviceOrder.href)
-				&& Objects.equals(this.category, serviceOrder.category)
-				&& Objects.equals(this.completionDate, serviceOrder.completionDate)
-				&& Objects.equals(this.description, serviceOrder.description)
-				&& Objects.equals(this.expectedCompletionDate, serviceOrder.expectedCompletionDate)
-				&& Objects.equals(this.externalId, serviceOrder.externalId)
-				&& Objects.equals(this.notificationContact, serviceOrder.notificationContact)
-				&& Objects.equals(this.orderDate, serviceOrder.orderDate)
-				&& Objects.equals(this.priority, serviceOrder.priority)
-				&& Objects.equals(this.requestedCompletionDate, serviceOrder.requestedCompletionDate)
-				&& Objects.equals(this.requestedStartDate, serviceOrder.requestedStartDate)
-				&& Objects.equals(this.startDate, serviceOrder.startDate)
-				&& Objects.equals(this.note, serviceOrder.note)
-				&& Objects.equals(this.orderItem, serviceOrder.orderItem)
-				&& Objects.equals(this.orderRelationship, serviceOrder.orderRelationship)
-				&& Objects.equals(this.relatedParty, serviceOrder.relatedParty)
-				&& Objects.equals(this.state, serviceOrder.state)
-				&& Objects.equals(this.baseType, serviceOrder.baseType)
-				&& Objects.equals(this.schemaLocation, serviceOrder.schemaLocation)
-				&& Objects.equals(this.type, serviceOrder.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, category, completionDate, description, expectedCompletionDate, externalId,
-//				notificationContact, orderDate, priority, requestedCompletionDate, requestedStartDate, startDate, note,
-//				orderItem, orderRelationship, relatedParty, state, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrder {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    completionDate: ").append(toIndentedString(completionDate)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-		sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-		sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-		sb.append("    orderDate: ").append(toIndentedString(orderDate)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-		sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-		sb.append("    orderRelationship: ").append(toIndentedString(orderRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public ServiceOrderItem findOrderItemById(String id) {
-		for (ServiceOrderItem oi : this.orderItem) {
-			if ( oi.getId().equals(id)) {
-				return oi;
-			}			
-		}
-		return null;
-	}
-	
-	/**
-	 * @return the PartyRole that made the request
-	 */
-	public RelatedParty getOrderRequester() {
-		for (RelatedParty rp : relatedParty) {
-			if (rp.getRole().equals( UserPartRoleType.REQUESTER.toString() )) {
-				return rp;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderActionType.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderActionType.java
deleted file mode 100644
index fd213f7621cfff9e66ba8011eb5eb6d46b2892e9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderActionType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * string
- */
-public enum ServiceOrderActionType {
-  
-  ADD("add"),
-  
-  MODIFY("modify"),
-  
-  DELETE("delete"),
-  
-  NOCHANGE("noChange");
-
-  private String value;
-
-  ServiceOrderActionType(String value) {
-    this.value = value;
-  }
-
-  @Override
-  @JsonValue
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static ServiceOrderActionType fromValue(String text) {
-    for (ServiceOrderActionType b : ServiceOrderActionType.values()) {
-      if (String.valueOf(b.value).equals(text)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeEvent.java
deleted file mode 100644
index 7c4299ca45cae7cabc3f571b744e89f028ba7b26..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderAttributeValueChangeEvent   {
-  @JsonProperty("serviceOrder")
-  private ServiceOrder serviceOrder = null;
-
-  public ServiceOrderAttributeValueChangeEvent serviceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceOrder
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceOrder getServiceOrder() {
-    return serviceOrder;
-  }
-
-  public void setServiceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderAttributeValueChangeEvent serviceOrderAttributeValueChangeEvent = (ServiceOrderAttributeValueChangeEvent) o;
-    return Objects.equals(this.serviceOrder, serviceOrderAttributeValueChangeEvent.serviceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderAttributeValueChangeEvent {\n");
-    
-    sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeNotification.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeNotification.java
deleted file mode 100644
index 926527c05e6ea5d411580ad90d8d83ee1c508bd7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderAttributeValueChangeNotification.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderAttributeValueChangeNotification  extends Notification {
-
-
-  @JsonProperty("event")
-  private ServiceOrderAttributeValueChangeEvent event = null;
-
-  public ServiceOrderAttributeValueChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ServiceOrderAttributeValueChangeNotification event(ServiceOrderAttributeValueChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceOrderAttributeValueChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceOrderAttributeValueChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderAttributeValueChangeNotification serviceOrderAttributeValueChangeNotification = (ServiceOrderAttributeValueChangeNotification) o;
-    return Objects.equals(this.eventId, serviceOrderAttributeValueChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceOrderAttributeValueChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceOrderAttributeValueChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceOrderAttributeValueChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceOrderAttributeValueChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceOrderAttributeValueChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderAttributeValueChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreate.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreate.java
deleted file mode 100644
index 5347ad0c1cde9b1e50184924011af4a2c6c9a7b4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreate.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-
-/**
- * Skipped properties:
- * id,href,orderDate,completionDate,expectedCompletionDate,startDate,state
- */
-@Schema(description = " Skipped properties: id,href,orderDate,completionDate,expectedCompletionDate,startDate,state")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderCreate {
-	@JsonProperty("category")
-	private String category = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("externalId")
-	private String externalId = null;
-
-	@JsonProperty("notificationContact")
-	private String notificationContact = null;
-
-	@JsonProperty("priority")
-	private String priority = null;
-
-	private OffsetDateTime requestedCompletionDate = null;
-
-	private OffsetDateTime requestedStartDate = null;
-
-	@JsonProperty("note")
-	@Valid
-	private List<Note> note = null;
-
-	@JsonProperty("orderItem")
-	@Valid
-	private List<ServiceOrderItem> orderItem = new ArrayList<>();
-
-	@JsonProperty("orderRelationship")
-	@Valid
-	private List<ServiceOrderRelationship> orderRelationship = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("@baseType")
-	private String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	@JsonProperty("@type")
-	private String type = null;
-
-	public ServiceOrderCreate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Used to categorize the order, useful for the OM system, such as: Broadband,
-	 * TVOption
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Used to categorize the order, useful for the OM system, such as: Broadband, TVOption")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ServiceOrderCreate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A free-text description of the service order
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A free-text description of the service order")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceOrderCreate externalId(String externalId) {
-		this.externalId = externalId;
-		return this;
-	}
-
-	/**
-	 * ID given by the consumer to facilitate searches
-	 * 
-	 * @return externalId
-	 **/
-	@Schema(description = "ID given by the consumer to facilitate searches")
-
-	public String getExternalId() {
-		return externalId;
-	}
-
-	public void setExternalId(String externalId) {
-		this.externalId = externalId;
-	}
-
-	public ServiceOrderCreate notificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-		return this;
-	}
-
-	/**
-	 * Contact attached to the order to send back information regarding this order
-	 * 
-	 * @return notificationContact
-	 **/
-	@Schema(description = "Contact attached to the order to send back information regarding this order")
-
-	public String getNotificationContact() {
-		return notificationContact;
-	}
-
-	public void setNotificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-	}
-
-	public ServiceOrderCreate priority(String priority) {
-		this.priority = priority;
-		return this;
-	}
-
-	/**
-	 * Can be used by consumers to prioritize orders in a Service Order Management
-	 * system
-	 * 
-	 * @return priority
-	 **/
-	@Schema(description = "Can be used by consumers to prioritize orders in a Service Order Management system")
-
-	public String getPriority() {
-		return priority;
-	}
-
-	public void setPriority(String priority) {
-		this.priority = priority;
-	}
-
-	public ServiceOrderCreate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Requested delivery date from the requestors perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestors perspective")
-
-	@Valid
-	public OffsetDateTime getRequestedCompletionDate() {
-		return requestedCompletionDate;
-	}
-
-
-	@JsonProperty("requestedCompletionDate")
-	public String getRequestedCompletionDateStr() {
-		if ( requestedCompletionDate != null) {
-			return requestedCompletionDate.toString();	
-		} else {
-			return null;
-		}
-	}
-	
-	
-	public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-	}
-
-
-	
-	public void setRequestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate!=null) {
-			this.requestedCompletionDate = OffsetDateTime.parse( requestedCompletionDate );
-			
-		}
-	}
-	
-	public ServiceOrderCreate requestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-		return this;
-	}
-
-	/**
-	 * Order start date wished by the requestor
-	 * 
-	 * @return requestedStartDate
-	 **/
-	@Schema(description = "Order start date wished by the requestor")
-
-	@Valid
-
-	public OffsetDateTime getRequestedStartDate() {
-		return requestedStartDate;
-	}
-	
-
-	@JsonProperty("requestedStartDate")
-	public String getRequestedStartDateStr() {
-
-		if ( requestedStartDate != null) {
-			return requestedStartDate.toString();	
-		}
-		
-		return null;
-	}
-	
-
-	public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-	}
-
-	public ServiceOrderCreate note(List<Note> note) {
-		this.note = note;
-		return this;
-	}
-	
-
-	public void setRequestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate!=null) {
-			this.requestedStartDate = OffsetDateTime.parse( requestedStartDate );
-			
-		}
-	}
-
-	public ServiceOrderCreate addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new ArrayList<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Extra-information about the order; e.g. useful to add extra delivery
-	 * information that could be useful for a human process
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "Extra-information about the order; e.g. useful to add extra delivery information that could be useful for a human process")
-
-	@Valid
-
-	public List<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(List<Note> note) {
-		this.note = note;
-	}
-
-	public ServiceOrderCreate orderItem(List<ServiceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-		return this;
-	}
-
-	public ServiceOrderCreate addOrderItemItem(ServiceOrderItem orderItemItem) {
-		this.orderItem.add(orderItemItem);
-		return this;
-	}
-
-	/**
-	 * A list of service order items to be processed by this order
-	 * 
-	 * @return orderItem
-	 **/
-	@Schema(description = "A list of service order items to be processed by this order")
-	@NotNull
-
-	@Valid
-	@Size(min = 1)
-	public List<ServiceOrderItem> getOrderItem() {
-		return orderItem;
-	}
-
-	public void setOrderItem(List<ServiceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-	}
-
-	public ServiceOrderCreate orderRelationship(List<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-		return this;
-	}
-
-	public ServiceOrderCreate addOrderRelationshipItem(ServiceOrderRelationship orderRelationshipItem) {
-		if (this.orderRelationship == null) {
-			this.orderRelationship = new ArrayList<>();
-		}
-		this.orderRelationship.add(orderRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service orders related to this order (e.g. prerequisite, dependent
-	 * on)
-	 * 
-	 * @return orderRelationship
-	 **/
-	@Schema(description = "A list of service orders related to this order (e.g. prerequisite, dependent on)")
-
-	@Valid
-
-	public List<ServiceOrderRelationship> getOrderRelationship() {
-		return orderRelationship;
-	}
-
-	public void setOrderRelationship(List<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-	}
-
-	public ServiceOrderCreate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceOrderCreate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of parties which are involved in this order and the role they are
-	 * playing
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of parties which are involved in this order and the role they are playing")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceOrderCreate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceOrderCreate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceOrderCreate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceOrderCreate serviceOrderCreate = (ServiceOrderCreate) o;
-		return Objects.equals(this.category, serviceOrderCreate.category)
-				&& Objects.equals(this.description, serviceOrderCreate.description)
-				&& Objects.equals(this.externalId, serviceOrderCreate.externalId)
-				&& Objects.equals(this.notificationContact, serviceOrderCreate.notificationContact)
-				&& Objects.equals(this.priority, serviceOrderCreate.priority)
-				&& Objects.equals(this.requestedCompletionDate, serviceOrderCreate.requestedCompletionDate)
-				&& Objects.equals(this.requestedStartDate, serviceOrderCreate.requestedStartDate)
-				&& Objects.equals(this.note, serviceOrderCreate.note)
-				&& Objects.equals(this.orderItem, serviceOrderCreate.orderItem)
-				&& Objects.equals(this.orderRelationship, serviceOrderCreate.orderRelationship)
-				&& Objects.equals(this.relatedParty, serviceOrderCreate.relatedParty)
-				&& Objects.equals(this.baseType, serviceOrderCreate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceOrderCreate.schemaLocation)
-				&& Objects.equals(this.type, serviceOrderCreate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(category, description, externalId, notificationContact, priority, requestedCompletionDate,
-				requestedStartDate, note, orderItem, orderRelationship, relatedParty, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrderCreate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    externalId: ").append(toIndentedString(externalId)).append("\n");
-		sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-		sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-		sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-		sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    orderItem: ").append(toIndentedString(orderItem)).append("\n");
-		sb.append("    orderRelationship: ").append(toIndentedString(orderRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateEvent.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateEvent.java
deleted file mode 100644
index 49e79234914e7f65050cf0d5d5881a2ed5d0cee0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderCreateEvent   {
-  @JsonProperty("serviceOrder")
-  private ServiceOrder serviceOrder = null;
-
-  public ServiceOrderCreateEvent serviceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceOrder
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceOrder getServiceOrder() {
-    return serviceOrder;
-  }
-
-  public void setServiceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderCreateEvent serviceOrderCreateEvent = (ServiceOrderCreateEvent) o;
-    return Objects.equals(this.serviceOrder, serviceOrderCreateEvent.serviceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderCreateEvent {\n");
-    
-    sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateNotification.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateNotification.java
deleted file mode 100644
index 763a81032b345745a3b60fcae62568c8d7f4ea7a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderCreateNotification.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderCreateNotification extends Notification  {
-  
-  @JsonProperty("event")
-  private ServiceOrderCreateEvent event = null;
-
-  public ServiceOrderCreateNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-
-
-  public ServiceOrderCreateNotification event(ServiceOrderCreateEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceOrderCreateEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceOrderCreateEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderCreateNotification serviceOrderCreateNotification = (ServiceOrderCreateNotification) o;
-    return Objects.equals(this.eventId, serviceOrderCreateNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceOrderCreateNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceOrderCreateNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceOrderCreateNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceOrderCreateNotification.resourcePath) &&
-        Objects.equals(this.event, serviceOrderCreateNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderCreateNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteEvent.java
deleted file mode 100644
index f711617c615fdbe9624f35e5df23690d5f70fbe9..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderDeleteEvent   {
-  @JsonProperty("serviceOrder")
-  private ServiceOrder serviceOrder = null;
-
-  public ServiceOrderDeleteEvent serviceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceOrder
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceOrder getServiceOrder() {
-    return serviceOrder;
-  }
-
-  public void setServiceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderDeleteEvent serviceOrderDeleteEvent = (ServiceOrderDeleteEvent) o;
-    return Objects.equals(this.serviceOrder, serviceOrderDeleteEvent.serviceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderDeleteEvent {\n");
-    
-    sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteNotification.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteNotification.java
deleted file mode 100644
index 0aa1a5cd5804227c023e9596a2730f874a40abb5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderDeleteNotification.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderDeleteNotification extends Notification  {
-  
-
-  @JsonProperty("event")
-  private ServiceOrderDeleteEvent event = null;
-
-  public ServiceOrderDeleteNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  
-
-  public ServiceOrderDeleteNotification event(ServiceOrderDeleteEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceOrderDeleteEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceOrderDeleteEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderDeleteNotification serviceOrderDeleteNotification = (ServiceOrderDeleteNotification) o;
-    return Objects.equals(this.eventId, serviceOrderDeleteNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceOrderDeleteNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceOrderDeleteNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceOrderDeleteNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceOrderDeleteNotification.resourcePath) &&
-        Objects.equals(this.event, serviceOrderDeleteNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderDeleteNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItem.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItem.java
deleted file mode 100644
index c86e16136badf5a6952255adf0a8120bd9d758be..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItem.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * ServiceOrderItem
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "ServiceOrderItem")
-public class ServiceOrderItem extends BaseRootEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("action")
-	private ServiceOrderActionType action = ServiceOrderActionType.ADD;
-
-
-	@JsonProperty("orderItemRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceOrderItemRelationship> orderItemRelationship = new HashSet<>();
-
-
-	@JsonProperty("state")
-	private ServiceOrderStateType state = ServiceOrderStateType.INITIAL;
-	
-
-	@OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "service_restrictuuid", referencedColumnName = "uuid")
-	@JsonProperty("service")
-	private ServiceRestriction service = null;
-
-	/**
-	 * not managed for now
-	 */
-	@OneToOne(cascade = CascadeType.ALL)
-    @JoinColumn(name = "appointment_refid", referencedColumnName = "uuid")
-	@JsonProperty("appointment")
-	private AppointmentRef appointment = null;
-	
-	
-
-	/**
-	 * Identifier of the individual line item
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Identifier of the individual line item")
-	public String getId() {
-		return uuid;
-	}
-
-	
-
-	public ServiceOrderItem action(ServiceOrderActionType action) {
-		this.action = action;
-		return this;
-	}
-
-	/**
-	 * The action to be carried out on the Service. Can be: add, modify, delete,
-	 * noChange
-	 * 
-	 * @return action
-	 **/
-	@Schema(description = "The action to be carried out on the Service. Can be: add, modify, delete, noChange")
-	@NotNull
-
-	@Valid
-
-	public ServiceOrderActionType getAction() {
-		return action;
-	}
-
-	public void setAction(ServiceOrderActionType action) {
-		this.action = action;
-	}
-
-	public ServiceOrderItem appointment(AppointmentRef appointment) {
-		this.appointment = appointment;
-		return this;
-	}
-
-	/**
-	 * An appointment that was set up with a related party for this order item
-	 * 
-	 * @return appointment
-	 **/
-	@Schema(description = "An appointment that was set up with a related party for this order item")
-
-	@Valid
-
-	public AppointmentRef getAppointment() {
-		return appointment;
-	}
-
-	public void setAppointment(AppointmentRef appointment) {
-		this.appointment = appointment;
-	}
-
-	public ServiceOrderItem orderItemRelationship(Set<ServiceOrderItemRelationship> orderItemRelationship) {
-		this.orderItemRelationship = orderItemRelationship;
-		return this;
-	}
-
-	public ServiceOrderItem addOrderItemRelationshipItem(ServiceOrderItemRelationship orderItemRelationshipItem) {
-		if (this.orderItemRelationship == null) {
-			this.orderItemRelationship = new HashSet<>();
-		}
-		this.orderItemRelationship.add(orderItemRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of order items related to this order item
-	 * 
-	 * @return orderItemRelationship
-	 **/
-	@Schema(description = "A list of order items related to this order item")
-
-	@Valid
-
-	public Set<ServiceOrderItemRelationship> getOrderItemRelationship() {
-		return orderItemRelationship;
-	}
-
-	public void setOrderItemRelationship(Set<ServiceOrderItemRelationship> orderItemRelationship) {
-		this.orderItemRelationship = orderItemRelationship;
-	}
-
-	public ServiceOrderItem service(ServiceRestriction service) {
-		this.service = service;
-		return this;
-	}
-
-	/**
-	 * The Service to be acted on by the order item
-	 * 
-	 * @return service
-	 **/
-	@Schema(description = "The Service to be acted on by the order item")
-	@NotNull
-
-	@Valid
-
-	public ServiceRestriction getService() {
-		return service;
-	}
-
-	public void setService(ServiceRestriction service) {
-		this.service = service;
-	}
-
-	public ServiceOrderItem state(ServiceOrderStateType state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * State of the order item: described in the state machine diagram. This is the
-	 * requested state.
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "State of the order item: described in the state machine diagram. This is the requested state.")
-
-	@Valid
-
-	public ServiceOrderStateType getState() {
-		return state;
-	}
-
-	public void setState(ServiceOrderStateType state) {
-		this.state = state;
-	}
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceOrderItem serviceOrderItem = (ServiceOrderItem) o;
-		return Objects.equals(this.getId(), serviceOrderItem.getId()) && Objects.equals(this.action, serviceOrderItem.action)
-				&& Objects.equals(this.appointment, serviceOrderItem.appointment)
-				&& Objects.equals(this.orderItemRelationship, serviceOrderItem.orderItemRelationship)
-				&& Objects.equals(this.service, serviceOrderItem.service)
-				&& Objects.equals(this.state, serviceOrderItem.state)
-				&& Objects.equals(this.baseType, serviceOrderItem.baseType)
-				&& Objects.equals(this.schemaLocation, serviceOrderItem.schemaLocation)
-				&& Objects.equals(this.type, serviceOrderItem.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(uuid, getId(), action, appointment, orderItemRelationship, service, state, baseType, schemaLocation,
-//				type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrderItem {\n");
-
-		sb.append("    id: ").append(toIndentedString(getId())).append("\n");
-		sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-		sb.append("    action: ").append(toIndentedString(action)).append("\n");
-		sb.append("    appointment: ").append(toIndentedString(appointment)).append("\n");
-		sb.append("    orderItemRelationship: ").append(toIndentedString(orderItemRelationship)).append("\n");
-		sb.append("    service: ").append(toIndentedString(service)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItemRelationship.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItemRelationship.java
deleted file mode 100644
index 6abc2330f113ba517e48037f7497e3f59545f718..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderItemRelationship.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Linked service order item to the one containing this attribute
- */
-@Schema(description = "Linked service order item to the one containing this attribute")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-@Entity(name = "ServiceOrderItemRelationship")
-public class ServiceOrderItemRelationship  extends BaseRootEntity {
-	
-	
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  public ServiceOrderItemRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique identifier of a service order item
-   * @return id
-  **/
-  @Schema(description = "Unique identifier of a service order item")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ServiceOrderItemRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * The type of related order item, can be: dependency if the order item needs to be not started until another order item is complete
-   * @return relationshipType
-  **/
-  @Schema(description = "The type of related order item, can be: dependency if the order item needs to be not started until another order item is complete")
-  @NotNull
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderItemRelationship serviceOrderItemRelationship = (ServiceOrderItemRelationship) o;
-    return Objects.equals(this.id, serviceOrderItemRelationship.id) &&
-        Objects.equals(this.relationshipType, serviceOrderItemRelationship.relationshipType) &&
-        Objects.equals(this.baseType, serviceOrderItemRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, serviceOrderItemRelationship.schemaLocation) &&
-        Objects.equals(this.type, serviceOrderItemRelationship.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, relationshipType, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderItemRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderRelationship.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderRelationship.java
deleted file mode 100644
index 0ac406ca7b7c5f24c28d22bc0d99292787b322ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderRelationship.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Linked service order to the one containing this attribute
- */
-@Schema(description = "Linked service order to the one containing this attribute")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ServiceOrderRelationship")
-public class ServiceOrderRelationship  extends BaseRootEntity  {
-  @JsonProperty("id")
-  private String id = null;
-
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ServiceOrderRelationship id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The id of the related order
-   * @return id
-  **/
-  @Schema(description = "The id of the related order")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ServiceOrderRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * The type of related order, such as: [dependency] if the order needs to be [not started] until another order item is complete (a service order in this case) or [cross-ref] to keep track of the source order (a productOrder)
-   * @return relationshipType
-  **/
-  @Schema(description = "The type of related order, such as: [dependency] if the order needs to be [not started] until another order item is complete (a service order in this case) or [cross-ref] to keep track of the source order (a productOrder)")
-
-
-  public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-
-  /**
-   * The entity type of the related order
-   * @return referredType
-  **/
-  @Schema(description = "The entity type of the related order")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderRelationship serviceOrderRelationship = (ServiceOrderRelationship) o;
-    return Objects.equals(this.id, serviceOrderRelationship.id) &&
-        Objects.equals(this.href, serviceOrderRelationship.href) &&
-        Objects.equals(this.relationshipType, serviceOrderRelationship.relationshipType) &&
-        Objects.equals(this.baseType, serviceOrderRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, serviceOrderRelationship.schemaLocation) &&
-        Objects.equals(this.type, serviceOrderRelationship.type) &&
-        Objects.equals(this.referredType, serviceOrderRelationship.referredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, relationshipType, baseType, schemaLocation, type, referredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeEvent.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeEvent.java
deleted file mode 100644
index b8d90fac30dbf34b6793aa512acb828aa8943700..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeEvent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderStateChangeEvent   {
-  @JsonProperty("serviceOrder")
-  private ServiceOrder serviceOrder = null;
-
-  public ServiceOrderStateChangeEvent serviceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-    return this;
-  }
-
-  /**
-   * The involved resource data for the event
-   * @return serviceOrder
-  **/
-  @Schema(description = "The involved resource data for the event")
-
-  @Valid
-
-  public ServiceOrder getServiceOrder() {
-    return serviceOrder;
-  }
-
-  public void setServiceOrder(ServiceOrder serviceOrder) {
-    this.serviceOrder = serviceOrder;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderStateChangeEvent serviceOrderStateChangeEvent = (ServiceOrderStateChangeEvent) o;
-    return Objects.equals(this.serviceOrder, serviceOrderStateChangeEvent.serviceOrder);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceOrder);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderStateChangeEvent {\n");
-    
-    sb.append("    serviceOrder: ").append(toIndentedString(serviceOrder)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeNotification.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeNotification.java
deleted file mode 100644
index 196a6e1078b67f926de4f4324c5e23eb74f8e2a4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateChangeNotification.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Notification;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderStateChangeNotification  extends Notification {
- 
-  @JsonProperty("event")
-  private ServiceOrderStateChangeEvent event = null;
-
-  public ServiceOrderStateChangeNotification eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
- 
-
-  public ServiceOrderStateChangeNotification event(ServiceOrderStateChangeEvent event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * The event linked to the involved resource object
-   * @return event
-  **/
-  @Schema(description = "The event linked to the involved resource object")
-
-  @Valid
-
-  public ServiceOrderStateChangeEvent getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceOrderStateChangeEvent event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceOrderStateChangeNotification serviceOrderStateChangeNotification = (ServiceOrderStateChangeNotification) o;
-    return Objects.equals(this.eventId, serviceOrderStateChangeNotification.eventId) &&
-        Objects.equals(this.eventTime, serviceOrderStateChangeNotification.eventTime) &&
-        Objects.equals(this.eventType, serviceOrderStateChangeNotification.eventType) &&
-        Objects.equals(this.fieldPath, serviceOrderStateChangeNotification.fieldPath) &&
-        Objects.equals(this.resourcePath, serviceOrderStateChangeNotification.resourcePath) &&
-        Objects.equals(this.event, serviceOrderStateChangeNotification.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, fieldPath, resourcePath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceOrderStateChangeNotification {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    resourcePath: ").append(toIndentedString(resourcePath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateType.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateType.java
deleted file mode 100644
index 0a18e50328cad82ec4a6bc85a45db3bf7b76eee7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderStateType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Possible values for the state of the order
- */
-public enum ServiceOrderStateType {
-	
-	INITIAL("INITIAL"),
-
-	ACKNOWLEDGED("ACKNOWLEDGED"),
-
-	REJECTED("REJECTED"),
-
-	PENDING("PENDING"),
-
-	HELD("HELD"),
-
-	INPROGRESS("INPROGRESS"),
-
-	CANCELLED("CANCELLED"),
-
-	COMPLETED("COMPLETED"),
-
-	FAILED("FAILED"),
-
-	PARTIAL("PARTIAL");
-
-	private String value;
-
-	ServiceOrderStateType(String value) {
-		this.value = value;
-	}
-
-	@Override
-	@JsonValue
-	public String toString() {
-		return String.valueOf(value);
-	}
-
-	@JsonCreator
-	public static ServiceOrderStateType fromValue(String text) {
-		for (ServiceOrderStateType b : ServiceOrderStateType.values()) {
-			if (String.valueOf(b.value).equals(text)) {
-				return b;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderUpdate.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderUpdate.java
deleted file mode 100644
index 94347b03865f27e30e9a218947f7b26833ac255c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceOrderUpdate.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.service.Note;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Skipped properties:
- * id,href,externalId,priority,state,orderDate,completionDate,orderItem
- */
-@Schema(description = " Skipped properties: id,href,externalId,priority,state,orderDate,completionDate,orderItem")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-public class ServiceOrderUpdate {
-	@JsonProperty("category")
-	private String category = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("notificationContact")
-	private String notificationContact = null;
-
-	private OffsetDateTime expectedCompletionDate = null;
-
-	private OffsetDateTime requestedCompletionDate = null;
-
-	private OffsetDateTime requestedStartDate = null;
-
-	private OffsetDateTime startDate = null;
-
-	@JsonProperty("note")
-	@Valid
-	private List<Note> note = null;
-
-	@JsonProperty("orderRelationship")
-	@Valid
-	private List<ServiceOrderRelationship> orderRelationship = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	private List<RelatedParty> relatedParty = null;
-
-	/**
-	 * standard says that this must not be available.
-	 * Still we will allow to update
-	 */
-	@JsonProperty("state")
-	private ServiceOrderStateType state = null;
-
-
-	@JsonProperty("orderItem")
-	@Valid
-	private List<ServiceOrderItem> orderItem = new ArrayList<>();
-	
-
-	@JsonProperty("@baseType")
-	private String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	private String schemaLocation = null;
-
-	@JsonProperty("@type")
-	private String type = null;
-
-	public ServiceOrderUpdate category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Used to categorize the order, useful for the OM system, such as: Broadband,
-	 * TVOption
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Used to categorize the order, useful for the OM system, such as: Broadband, TVOption")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ServiceOrderUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A free-text description of the service order
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A free-text description of the service order")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceOrderUpdate expectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-		return this;
-	}
-
-	@JsonProperty("expectedCompletionDate")
-	public String getExpectedCompletionDateStr() {
-		if ( expectedCompletionDate!=null ) {
-			return expectedCompletionDate.toString();
-		}
-		return baseType;
-	}
-
-	/**
-	 * Expected delivery date amended by the provider
-	 * 
-	 * @return expectedCompletionDate
-	 **/
-	@Schema(description = "Expected delivery date amended by the provider")
-
-	@Valid
-
-	public OffsetDateTime getExpectedCompletionDate() {
-		return expectedCompletionDate;
-	}
-
-	public void setExpectedCompletionDate(OffsetDateTime expectedCompletionDate) {
-		this.expectedCompletionDate = expectedCompletionDate;
-	}
-
-	public void setExpectedCompletionDate(String expectedCompletionDate) {
-
-		if (expectedCompletionDate != null) {
-			this.expectedCompletionDate = OffsetDateTime.parse(expectedCompletionDate);
-
-		}
-	}
-
-	public ServiceOrderUpdate notificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-		return this;
-	}
-
-	/**
-	 * Contact attached to the order to send back information regarding this order
-	 * 
-	 * @return notificationContact
-	 **/
-	@Schema(description = "Contact attached to the order to send back information regarding this order")
-
-	public String getNotificationContact() {
-		return notificationContact;
-	}
-
-	public void setNotificationContact(String notificationContact) {
-		this.notificationContact = notificationContact;
-	}
-
-	public ServiceOrderUpdate requestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-		return this;
-	}
-
-	/**
-	 * Requested delivery date from the requestors perspective
-	 * 
-	 * @return requestedCompletionDate
-	 **/
-	@Schema(description = "Requested delivery date from the requestors perspective")
-
-	@Valid
-
-	public OffsetDateTime getRequestedCompletionDate() {
-		return requestedCompletionDate;
-	}
-
-	@JsonProperty("requestedCompletionDate")
-	public String getRequestedCompletionDateStr() {
-		if (requestedCompletionDate != null) {
-			return requestedCompletionDate.toString();
-		}
-
-		return null;
-	}
-
-	public void setRequestedCompletionDate(OffsetDateTime requestedCompletionDate) {
-		this.requestedCompletionDate = requestedCompletionDate;
-	}
-
-	public ServiceOrderUpdate requestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-		return this;
-	}
-
-	public void setRequestedCompletionDate(String requestedCompletionDate) {
-
-		if (requestedCompletionDate != null) {
-			this.requestedCompletionDate = OffsetDateTime.parse(requestedCompletionDate);
-
-		}
-	}
-
-	/**
-	 * Order start date wished by the requestor
-	 * 
-	 * @return requestedStartDate
-	 **/
-	@Schema(description = "Order start date wished by the requestor")
-
-	@Valid
-
-	public OffsetDateTime getRequestedStartDate() {
-		return requestedStartDate;
-	}
-
-	@JsonProperty("requestedStartDate")
-	public String getRequestedStartDateStr() {
-
-		if (requestedStartDate != null) {
-			return requestedStartDate.toString();
-		}
-
-		return null;
-	}
-
-	public void setRequestedStartDate(OffsetDateTime requestedStartDate) {
-		this.requestedStartDate = requestedStartDate;
-	}
-
-	public void setRequestedStartDate(String requestedStartDate) {
-
-		if (requestedStartDate != null) {
-			this.requestedStartDate = OffsetDateTime.parse(requestedStartDate);
-
-		}
-	}
-
-	public ServiceOrderUpdate startDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-		return this;
-	}
-
-	/**
-	 * Date when the order was started for processing
-	 * 
-	 * @return startDate
-	 **/
-	@Schema(description = "Date when the order was started for processing")
-
-	@Valid
-
-	public OffsetDateTime getStartDate() {
-		return startDate;
-	}
-
-	@JsonProperty("startDate")
-	public String getStartDateStr() {
-
-		if (startDate != null) {
-			return startDate.toString();
-		}
-		
-		return null;
-	}
-
-	public void setStartDate(OffsetDateTime startDate) {
-		this.startDate = startDate;
-	}
-
-	public void setStartDate(String startDate) {
-		if (startDate != null) {
-			this.startDate = OffsetDateTime.parse(startDate);
-
-		}
-	}
-
-	public ServiceOrderUpdate note(List<Note> note) {
-		this.note = note;
-		return this;
-	}
-
-	public ServiceOrderUpdate addNoteItem(Note noteItem) {
-		if (this.note == null) {
-			this.note = new ArrayList<>();
-		}
-		this.note.add(noteItem);
-		return this;
-	}
-
-	/**
-	 * Extra-information about the order; e.g. useful to add extra delivery
-	 * information that could be useful for a human process
-	 * 
-	 * @return note
-	 **/
-	@Schema(description = "Extra-information about the order; e.g. useful to add extra delivery information that could be useful for a human process")
-
-	@Valid
-
-	public List<Note> getNote() {
-		return note;
-	}
-
-	public void setNote(List<Note> note) {
-		this.note = note;
-	}
-
-	public ServiceOrderUpdate orderRelationship(List<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-		return this;
-	}
-
-	public ServiceOrderUpdate addOrderRelationshipItem(ServiceOrderRelationship orderRelationshipItem) {
-		if (this.orderRelationship == null) {
-			this.orderRelationship = new ArrayList<>();
-		}
-		this.orderRelationship.add(orderRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service orders related to this order (e.g. prerequisite, dependent
-	 * on)
-	 * 
-	 * @return orderRelationship
-	 **/
-	@Schema(description = "A list of service orders related to this order (e.g. prerequisite, dependent on)")
-
-	@Valid
-
-	public List<ServiceOrderRelationship> getOrderRelationship() {
-		return orderRelationship;
-	}
-
-	public void setOrderRelationship(List<ServiceOrderRelationship> orderRelationship) {
-		this.orderRelationship = orderRelationship;
-	}
-
-	public ServiceOrderUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceOrderUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of parties which are involved in this order and the role they are
-	 * playing
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of parties which are involved in this order and the role they are playing")
-
-	@Valid
-
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceOrderUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getBaseType() {
-		return baseType;
-	}
-
-	public void setBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceOrderUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceOrderUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class entity name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class entity name")
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	/**
-	 * @return the state
-	 */
-	public ServiceOrderStateType getState() {
-		return state;
-	}
-	
-	public ServiceOrderUpdate addOrderItemItem(ServiceOrderItem orderItemItem) {
-		this.orderItem.add(orderItemItem);
-		return this;
-	}
-
-	public List<ServiceOrderItem> getOrderItem() {
-		return orderItem;
-	}
-	
-	public void setOrderItem(List<ServiceOrderItem> orderItem) {
-		this.orderItem = orderItem;
-	}
-
-
-	/**
-	 * @param state the state to set
-	 */
-	public void setState(ServiceOrderStateType state) {
-		this.state = state;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceOrderUpdate serviceOrderUpdate = (ServiceOrderUpdate) o;
-		return Objects.equals(this.category, serviceOrderUpdate.category)
-				&& Objects.equals(this.description, serviceOrderUpdate.description)
-				&& Objects.equals(this.expectedCompletionDate, serviceOrderUpdate.expectedCompletionDate)
-				&& Objects.equals(this.notificationContact, serviceOrderUpdate.notificationContact)
-				&& Objects.equals(this.requestedCompletionDate, serviceOrderUpdate.requestedCompletionDate)
-				&& Objects.equals(this.requestedStartDate, serviceOrderUpdate.requestedStartDate)
-				&& Objects.equals(this.startDate, serviceOrderUpdate.startDate)
-				&& Objects.equals(this.note, serviceOrderUpdate.note)
-				&& Objects.equals(this.orderRelationship, serviceOrderUpdate.orderRelationship)
-				&& Objects.equals(this.relatedParty, serviceOrderUpdate.relatedParty)
-				&& Objects.equals(this.baseType, serviceOrderUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceOrderUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceOrderUpdate.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(category, description, expectedCompletionDate, notificationContact, requestedCompletionDate,
-//				requestedStartDate, startDate, note, orderRelationship, relatedParty, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceOrderUpdate {\n");
-
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    expectedCompletionDate: ").append(toIndentedString(expectedCompletionDate)).append("\n");
-		sb.append("    notificationContact: ").append(toIndentedString(notificationContact)).append("\n");
-		sb.append("    requestedCompletionDate: ").append(toIndentedString(requestedCompletionDate)).append("\n");
-		sb.append("    requestedStartDate: ").append(toIndentedString(requestedStartDate)).append("\n");
-		sb.append("    startDate: ").append(toIndentedString(startDate)).append("\n");
-		sb.append("    note: ").append(toIndentedString(note)).append("\n");
-		sb.append("    orderRelationship: ").append(toIndentedString(orderRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceRestriction.java b/src/main/java/org/etsi/osl/tmf/so641/model/ServiceRestriction.java
deleted file mode 100644
index 19f370b7800c7f0e96f2147856fbf8d0d9c164d4..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/so641/model/ServiceRestriction.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.so641.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.service.Characteristic;
-import org.etsi.osl.tmf.common.model.service.Place;
-import org.etsi.osl.tmf.common.model.service.ResourceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.common.model.service.ServiceRelationship;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.common.model.service.ServiceStateType;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * In the context of a service order, and depending of the action requested
- * (add/modify/delete/noChange) this data structure captures the configuration
- * to apply to an existing subscribed service or to a new one
- */
-@Schema(description = "In the context of a service order, and depending of the action requested (add/modify/delete/noChange) this data structure captures the configuration to apply to an existing subscribed service or to a new one")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:09:58.885+03:00")
-
-@Entity(name = "ServiceRestriction")
-public class ServiceRestriction extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("category")
-	private String category = null;
-
-	@JsonProperty("serviceType")
-	private String serviceType = null;
-	
-	@OneToOne(cascade = CascadeType.ALL)
-	private ServiceSpecificationRef serviceSpecificationRef = null;
-	
-
-	@JsonProperty("place")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Place> place = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("serviceCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> serviceCharacteristic = new HashSet<>();
-
-	@JsonProperty("state")
-	private ServiceStateType state = ServiceStateType.FEASIBILITYCHECKED;
-
-	@JsonProperty("supportingResource")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ResourceRef> supportingResource = new HashSet<>();
-
-
-	@JsonProperty("serviceRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceRelationship> serviceRelationship = new HashSet<>();
-
-
-	
-	@JsonProperty("supportingService")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceRef> supportingService = new HashSet<>();
-
-	/**
-	 * Unique identifier of the service
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique identifier of the service")
-
-	public String getId() {
-		return uuid;
-	}
-
-	public ServiceRestriction category(String category) {
-		this.category = category;
-		return this;
-	}
-
-	/**
-	 * Is it a customer facing or resource facing service
-	 * 
-	 * @return category
-	 **/
-	@Schema(description = "Is it a customer facing or resource facing service")
-
-	public String getCategory() {
-		return category;
-	}
-
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	public ServiceRestriction serviceType(String serviceType) {
-		this.serviceType = serviceType;
-		return this;
-	}
-
-	/**
-	 * Business type of the service
-	 * 
-	 * @return serviceType
-	 **/
-	@Schema(description = "Business type of the service")
-
-	public String getServiceType() {
-		return serviceType;
-	}
-
-	public void setServiceType(String serviceType) {
-		this.serviceType = serviceType;
-	}
-
-	public ServiceRestriction place(Set<Place> place) {
-		this.place = place;
-		return this;
-	}
-
-	public ServiceRestriction addPlaceItem(Place placeItem) {
-		if (this.place == null) {
-			this.place = new HashSet<>();
-		}
-		this.place.add(placeItem);
-		return this;
-	}
-
-	/**
-	 * A list of places (Place [*]). Used to define a place useful for the service
-	 * (for example a delivery geographical place)
-	 * 
-	 * @return place
-	 **/
-	@Schema(description = "A list of places (Place [*]). Used to define a place useful for the service (for example a delivery geographical place)")
-
-	@Valid
-
-	public Set<Place> getPlace() {
-		return place;
-	}
-
-	public void setPlace(Set<Place> place) {
-		this.place = place;
-	}
-
-	public ServiceRestriction relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceRestriction addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * A list of related party references (RelatedParty [*]). A related party
-	 * defines party or party role linked to a specific entity
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "A list of related party references (RelatedParty [*]). A related party defines party or party role linked to a specific entity")
-
-	@Valid
-
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceRestriction serviceCharacteristic(Set<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-		return this;
-	}
-
-	public ServiceRestriction addServiceCharacteristicItem(Characteristic serviceCharacteristicItem) {
-		if (this.serviceCharacteristic == null) {
-			this.serviceCharacteristic = new HashSet<>();
-		}
-		this.serviceCharacteristic.add(serviceCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * A list of characteristics that characterize this service
-	 * (ServiceCharacteristic [*])
-	 * 
-	 * @return serviceCharacteristic
-	 **/
-	@Schema(description = "A list of characteristics that characterize this service (ServiceCharacteristic [*]) ")
-
-	@Valid
-
-	public Set<Characteristic> getServiceCharacteristic() {
-		return serviceCharacteristic;
-	}
-
-	public void setServiceCharacteristic(Set<Characteristic> serviceCharacteristic) {
-		this.serviceCharacteristic = serviceCharacteristic;
-	}
-
-	public ServiceRestriction serviceRelationship(Set<ServiceRelationship> serviceRelationship) {
-		this.serviceRelationship = serviceRelationship;
-		return this;
-	}
-
-	public ServiceRestriction addServiceRelationshipItem(ServiceRelationship serviceRelationshipItem) {
-		if (this.serviceRelationship == null) {
-			this.serviceRelationship = new HashSet<>();
-		}
-		this.serviceRelationship.add(serviceRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service relationships (ServiceRelationship [*]). Describes links
-	 * with other service(s) in the inventory (useful for describing relies-on,
-	 * relies-from between CFS for example).
-	 * 
-	 * @return serviceRelationship
-	 **/
-	@Schema(description = "A list of service relationships (ServiceRelationship [*]). Describes links with other service(s) in the inventory (useful for describing relies-on, relies-from between CFS for example).")
-
-	@Valid
-
-	public Set<ServiceRelationship> getServiceRelationship() {
-		return serviceRelationship;
-	}
-
-	public void setServiceRelationship(Set<ServiceRelationship> serviceRelationship) {
-		this.serviceRelationship = serviceRelationship;
-	}
-
-
-	/**
-	 * The specification from which this service was instantiated
-	 * 
-	 * @return serviceSpecification
-	 **/
-	@Schema(description = "The specification from which this service was instantiated")
-	@Valid
-	public ServiceSpecificationRef getServiceSpecification() {
-
-		
-		return this.serviceSpecificationRef;
-	}
-
-	public void setServiceSpecification(ServiceSpecificationRef aServiceSpecificationRef) {
-		
-		this.serviceSpecificationRef = aServiceSpecificationRef;
-		this.name = aServiceSpecificationRef.getName();
-	}
-	
-
-
-
-	public ServiceRestriction state(ServiceStateType state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The life cycle state of the service, such as: [feasibilityChecked],
-	 * [designed]
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The life cycle state of the service, such as: [feasibilityChecked], [designed]")
-
-	@Valid
-
-	public ServiceStateType getState() {
-		return state;
-	}
-
-	public void setState(ServiceStateType state) {
-		this.state = state;
-	}
-
-	public ServiceRestriction supportingResource(Set<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-		return this;
-	}
-
-	public ServiceRestriction addSupportingResourceItem(ResourceRef supportingResourceItem) {
-		if (this.supportingResource == null) {
-			this.supportingResource = new HashSet<>();
-		}
-		this.supportingResource.add(supportingResourceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting resources (SupportingResource [*]).Note: only Service of
-	 * type RFS can be associated with Resources
-	 * 
-	 * @return supportingResource
-	 **/
-	@Schema(description = "A list of supporting resources (SupportingResource [*]).Note: only Service of type RFS can be associated with Resources")
-
-	@Valid
-
-	public Set<ResourceRef> getSupportingResource() {
-		return supportingResource;
-	}
-
-	public void setSupportingResource(Set<ResourceRef> supportingResource) {
-		this.supportingResource = supportingResource;
-	}
-
-	public ServiceRestriction supportingService(Set<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-		return this;
-	}
-
-	public ServiceRestriction addSupportingServiceItem(ServiceRef supportingServiceItem) {
-		if (this.supportingService == null) {
-			this.supportingService = new HashSet<>();
-		}
-		this.supportingService.add(supportingServiceItem);
-		return this;
-	}
-
-	/**
-	 * A list of supporting services (SupportingService [*]). A collection of
-	 * services that support this service (bundling, link CFS to RFS)
-	 * 
-	 * @return supportingService
-	 **/
-	@Schema(description = "A list of supporting services (SupportingService [*]). A collection of services that support this service (bundling, link CFS to RFS)")
-
-	@Valid
-
-	public Set<ServiceRef> getSupportingService() {
-		return supportingService;
-	}
-
-	public void setSupportingService(Set<ServiceRef> supportingService) {
-		this.supportingService = supportingService;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceRestriction serviceRestriction = (ServiceRestriction) o;
-		return Objects.equals(this.id, serviceRestriction.id) && Objects.equals(this.href, serviceRestriction.href)
-				&& Objects.equals(this.category, serviceRestriction.category)
-				&& Objects.equals(this.name, serviceRestriction.name)
-				&& Objects.equals(this.serviceType, serviceRestriction.serviceType)
-				&& Objects.equals(this.place, serviceRestriction.place)
-				&& Objects.equals(this.relatedParty, serviceRestriction.relatedParty)
-				&& Objects.equals(this.serviceCharacteristic, serviceRestriction.serviceCharacteristic)
-				&& Objects.equals(this.serviceRelationship, serviceRestriction.serviceRelationship)
-				&& Objects.equals(this.getServiceSpecification(), serviceRestriction.getServiceSpecification())
-				&& Objects.equals(this.state, serviceRestriction.state)
-				&& Objects.equals(this.supportingResource, serviceRestriction.supportingResource)
-				&& Objects.equals(this.supportingService, serviceRestriction.supportingService)
-				&& Objects.equals(this.baseType, serviceRestriction.baseType)
-				&& Objects.equals(this.schemaLocation, serviceRestriction.schemaLocation)
-				&& Objects.equals(this.type, serviceRestriction.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, category, name, serviceType, place, relatedParty, serviceCharacteristic,
-//				serviceRelationship, getServiceSpecification(), state, supportingResource, supportingService, baseType,
-//				schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceRestriction {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    category: ").append(toIndentedString(category)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    serviceType: ").append(toIndentedString(serviceType)).append("\n");
-		sb.append("    place: ").append(toIndentedString(place)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    serviceCharacteristic: ").append(toIndentedString(serviceCharacteristic)).append("\n");
-		sb.append("    serviceRelationship: ").append(toIndentedString(serviceRelationship)).append("\n");
-		sb.append("    serviceSpecification: ").append(toIndentedString(getServiceSpecification())).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    supportingResource: ").append(toIndentedString(supportingResource)).append("\n");
-		sb.append("    supportingService: ").append(toIndentedString(supportingService)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public Object getSupportingServiceById(@NotNull String id) {
-		for (ServiceRef sr : supportingService) {
-			if ( sr.getId().equals(id)) {
-				return sr;
-			}
-		}
-		return null;
-	}
-
-	public Object getSupportingResourceById(@NotNull String id) {
-		for (ResourceRef sr : supportingResource) {
-			if ( sr.getId().equals(id)) {
-				return sr;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * return a characteristic matching by name
-	 * @param name
-	 * @return
-	 */
-	public Characteristic findCharacteristicByName(String aName) {
-		for (Characteristic c : serviceCharacteristic) {
-			if ( c.getName().equals(aName) ) {
-				return c;
-			}
-		}
-		
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/EntityRef.java
deleted file mode 100644
index 238344f832959a09bf5ed2c29c97adef7c181433..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/EntityRef.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The related entity source of a KQI or KPI. A KQI draws its data from a number of sources,  including Key Performance Indicators (KPIs).  A KPI provides a measurement of a specific aspect  of the performance of a Service (whether it is a network- or a non-network-based Service) or a  group of Services of the same type.
- */
-@Schema(description = "The related entity source of a KQI or KPI. A KQI draws its data from a number of sources,  including Key Performance Indicators (KPIs).  A KPI provides a measurement of a specific aspect  of the performance of a Service (whether it is a network- or a non-network-based Service) or a  group of Services of the same type.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class EntityRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public EntityRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The hyperlink to access an entity.
-   * @return href
-  **/
-  @Schema(description = "The hyperlink to access an entity.")
-  @NotNull
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public EntityRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier of an entity.
-   * @return id
-  **/
-  @Schema(description = "The identifier of an entity.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EntityRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of an entity.
-   * @return name
-  **/
-  @Schema(description = "The name of an entity.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public EntityRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EntityRef entityRef = (EntityRef) o;
-    return Objects.equals(this.href, entityRef.href) &&
-        Objects.equals(this.id, entityRef.id) &&
-        Objects.equals(this.name, entityRef.name) &&
-        Objects.equals(this.referredType, entityRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, name, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EntityRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/Error.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/Error.java
deleted file mode 100644
index 42c1b700efa2f230d9c258089313f94f5772c75a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/Error.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Error
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class Error   {
-  @JsonProperty("code")
-  private Integer code = null;
-
-  @JsonProperty("reason")
-  private Integer reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private Integer status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  public Error code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application related code.
-   * @return code
-  **/
-  @Schema(description = "Application related code.")
-  @NotNull
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public Error reason(Integer reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Text that explains the reason for error.
-   * @return reason
-  **/
-  @Schema(description = "Text that explains the reason for error.")
-  @NotNull
-
-
-  public Integer getReason() {
-    return reason;
-  }
-
-  public void setReason(Integer reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * (optional) Text that provide more details and corrective actions related to the error.
-   * @return message
-  **/
-  @Schema(description = "(optional) Text that provide more details and corrective actions related to the error.")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(Integer status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * (optional) http error code extension like 400-2
-   * @return status
-  **/
-  @Schema(description = "(optional) http error code extension like 400-2")
-
-
-  public Integer getStatus() {
-    return status;
-  }
-
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * (optional) A URL to online documentation that provides more information about the error.
-   * @return referenceError
-  **/
-  @Schema(description = "(optional) A URL to online documentation that provides more information about the error.")
-
-
-  public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * (optional) The class type of a REST resource.
-   * @return type
-  **/
-  @Schema(description = "(optional) The class type of a REST resource.")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * (optional) A link to the schema describing a REST resource.
-   * @return schemaLocation
-  **/
-  @Schema(description = "(optional) A link to the schema describing a REST resource.")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.type, error.type) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, type, schemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscription.java
deleted file mode 100644
index f00766a5fa25b45e0c3171c0a8f254951f5046f5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscription.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscription
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscriptionInput.java
deleted file mode 100644
index bd87706ed8b8d4e68843277610504b82402e7b32..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * EventSubscriptionInput
- */
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-  @NotNull
-
-
-  public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-
-
-  public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjective.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjective.java
deleted file mode 100644
index c748f6dd6d8af99209fb0f380277cfb147595412..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjective.java
+++ /dev/null
@@ -1,493 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters.
- */
-@Schema(description = "Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelObjective   {
-  @JsonProperty("conformanceComparator")
-  private String conformanceComparator = null;
-
-  @JsonProperty("conformancePeriod")
-  private TimePeriod conformancePeriod = null;
-
-  @JsonProperty("conformanceTarget")
-  private String conformanceTarget = null;
-
-  @JsonProperty("graceTimes")
-  private String graceTimes = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("thresholdTarget")
-  private String thresholdTarget = null;
-
-  @JsonProperty("tolerancePeriod")
-  private TimePeriod tolerancePeriod = null;
-
-  @JsonProperty("toleranceTarget")
-  private String toleranceTarget = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("specParameter")
-  private ServiceLevelSpecParameter specParameter = null;
-
-  @JsonProperty("specConsequence")
-  @Valid
-  private List<ServiceLevelSpecConsequence> specConsequence = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelObjective conformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-    return this;
-  }
-
-  /**
-   * An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.
-   * @return conformanceComparator
-  **/
-  @Schema(description = "An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.")
-
-
-  public String getConformanceComparator() {
-    return conformanceComparator;
-  }
-
-  public void setConformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-  }
-
-  public ServiceLevelObjective conformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-    return this;
-  }
-
-  /**
-   * An interval of time during which the Conformance Target must be measured.
-   * @return conformancePeriod
-  **/
-  @Schema(description = "An interval of time during which the Conformance Target must be measured.")
-
-  @Valid
-
-  public TimePeriod getConformancePeriod() {
-    return conformancePeriod;
-  }
-
-  public void setConformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-  }
-
-  public ServiceLevelObjective conformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-    return this;
-  }
-
-  /**
-   * A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.
-   * @return conformanceTarget
-  **/
-  @Schema(description = "A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.")
-
-
-  public String getConformanceTarget() {
-    return conformanceTarget;
-  }
-
-  public void setConformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-  }
-
-  public ServiceLevelObjective graceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-    return this;
-  }
-
-  /**
-   * The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.
-   * @return graceTimes
-  **/
-  @Schema(description = "The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.")
-
-
-  public String getGraceTimes() {
-    return graceTimes;
-  }
-
-  public void setGraceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-  }
-
-  public ServiceLevelObjective href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The hyperlink to access a service level objective.
-   * @return href
-  **/
-  @Schema(description = "The hyperlink to access a service level objective.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ServiceLevelObjective id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier of a service level objectives.
-   * @return id
-  **/
-  @Schema(description = "The identifier of a service level objectives.")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ServiceLevelObjective name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of the service level objectives.
-   * @return name
-  **/
-  @Schema(description = "The name of the service level objectives.")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelObjective thresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-    return this;
-  }
-
-  /**
-   * A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.
-   * @return thresholdTarget
-  **/
-  @Schema(description = "A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.")
-
-
-  public String getThresholdTarget() {
-    return thresholdTarget;
-  }
-
-  public void setThresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-  }
-
-  public ServiceLevelObjective tolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-    return this;
-  }
-
-  /**
-   * Get tolerancePeriod
-   * @return tolerancePeriod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getTolerancePeriod() {
-    return tolerancePeriod;
-  }
-
-  public void setTolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-  }
-
-  public ServiceLevelObjective toleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-    return this;
-  }
-
-  /**
-   * A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.
-   * @return toleranceTarget
-  **/
-  @Schema(description = "A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.")
-
-
-  public String getToleranceTarget() {
-    return toleranceTarget;
-  }
-
-  public void setToleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-  }
-
-  public ServiceLevelObjective validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelObjective specParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-    return this;
-  }
-
-  /**
-   * Get specParameter
-   * @return specParameter
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public ServiceLevelSpecParameter getSpecParameter() {
-    return specParameter;
-  }
-
-  public void setSpecParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-  }
-
-  public ServiceLevelObjective specConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-    return this;
-  }
-
-  public ServiceLevelObjective addSpecConsequenceItem(ServiceLevelSpecConsequence specConsequenceItem) {
-    if (this.specConsequence == null) {
-      this.specConsequence = new ArrayList<>();
-    }
-    this.specConsequence.add(specConsequenceItem);
-    return this;
-  }
-
-  /**
-   * Get specConsequence
-   * @return specConsequence
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ServiceLevelSpecConsequence> getSpecConsequence() {
-    return specConsequence;
-  }
-
-  public void setSpecConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-  }
-
-  public ServiceLevelObjective type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelObjective schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelObjective baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelObjective serviceLevelObjective = (ServiceLevelObjective) o;
-    return Objects.equals(this.conformanceComparator, serviceLevelObjective.conformanceComparator) &&
-        Objects.equals(this.conformancePeriod, serviceLevelObjective.conformancePeriod) &&
-        Objects.equals(this.conformanceTarget, serviceLevelObjective.conformanceTarget) &&
-        Objects.equals(this.graceTimes, serviceLevelObjective.graceTimes) &&
-        Objects.equals(this.href, serviceLevelObjective.href) &&
-        Objects.equals(this.id, serviceLevelObjective.id) &&
-        Objects.equals(this.name, serviceLevelObjective.name) &&
-        Objects.equals(this.thresholdTarget, serviceLevelObjective.thresholdTarget) &&
-        Objects.equals(this.tolerancePeriod, serviceLevelObjective.tolerancePeriod) &&
-        Objects.equals(this.toleranceTarget, serviceLevelObjective.toleranceTarget) &&
-        Objects.equals(this.validFor, serviceLevelObjective.validFor) &&
-        Objects.equals(this.specParameter, serviceLevelObjective.specParameter) &&
-        Objects.equals(this.specConsequence, serviceLevelObjective.specConsequence) &&
-        Objects.equals(this.type, serviceLevelObjective.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelObjective.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelObjective.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(conformanceComparator, conformancePeriod, conformanceTarget, graceTimes, href, id, name, thresholdTarget, tolerancePeriod, toleranceTarget, validFor, specParameter, specConsequence, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelObjective {\n");
-    
-    sb.append("    conformanceComparator: ").append(toIndentedString(conformanceComparator)).append("\n");
-    sb.append("    conformancePeriod: ").append(toIndentedString(conformancePeriod)).append("\n");
-    sb.append("    conformanceTarget: ").append(toIndentedString(conformanceTarget)).append("\n");
-    sb.append("    graceTimes: ").append(toIndentedString(graceTimes)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    thresholdTarget: ").append(toIndentedString(thresholdTarget)).append("\n");
-    sb.append("    tolerancePeriod: ").append(toIndentedString(tolerancePeriod)).append("\n");
-    sb.append("    toleranceTarget: ").append(toIndentedString(toleranceTarget)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    specParameter: ").append(toIndentedString(specParameter)).append("\n");
-    sb.append("    specConsequence: ").append(toIndentedString(specConsequence)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveCreate.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveCreate.java
deleted file mode 100644
index e27475efe57973e5755e92a23e18560b67e22c6f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveCreate.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters. Skipped properties: id,href
- */
-@Schema(description = "Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelObjectiveCreate   {
-  @JsonProperty("conformanceComparator")
-  private String conformanceComparator = null;
-
-  @JsonProperty("conformancePeriod")
-  private TimePeriod conformancePeriod = null;
-
-  @JsonProperty("conformanceTarget")
-  private String conformanceTarget = null;
-
-  @JsonProperty("graceTimes")
-  private String graceTimes = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("thresholdTarget")
-  private String thresholdTarget = null;
-
-  @JsonProperty("tolerancePeriod")
-  private TimePeriod tolerancePeriod = null;
-
-  @JsonProperty("toleranceTarget")
-  private String toleranceTarget = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("specParameter")
-  private ServiceLevelSpecParameter specParameter = null;
-
-  @JsonProperty("specConsequence")
-  @Valid
-  private List<ServiceLevelSpecConsequence> specConsequence = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelObjectiveCreate conformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-    return this;
-  }
-
-  /**
-   * An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.
-   * @return conformanceComparator
-  **/
-  @Schema(description = "An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.")
-  @NotNull
-
-
-  public String getConformanceComparator() {
-    return conformanceComparator;
-  }
-
-  public void setConformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-  }
-
-  public ServiceLevelObjectiveCreate conformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-    return this;
-  }
-
-  /**
-   * An interval of time during which the Conformance Target must be measured.
-   * @return conformancePeriod
-  **/
-  @Schema(description = "An interval of time during which the Conformance Target must be measured.")
-
-  @Valid
-
-  public TimePeriod getConformancePeriod() {
-    return conformancePeriod;
-  }
-
-  public void setConformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-  }
-
-  public ServiceLevelObjectiveCreate conformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-    return this;
-  }
-
-  /**
-   * A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.
-   * @return conformanceTarget
-  **/
-  @Schema(description = "A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.")
-  @NotNull
-
-
-  public String getConformanceTarget() {
-    return conformanceTarget;
-  }
-
-  public void setConformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-  }
-
-  public ServiceLevelObjectiveCreate graceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-    return this;
-  }
-
-  /**
-   * The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.
-   * @return graceTimes
-  **/
-  @Schema(description = "The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.")
-
-
-  public String getGraceTimes() {
-    return graceTimes;
-  }
-
-  public void setGraceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-  }
-
-  public ServiceLevelObjectiveCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of the service level objectives.
-   * @return name
-  **/
-  @Schema(description = "The name of the service level objectives.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelObjectiveCreate thresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-    return this;
-  }
-
-  /**
-   * A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.
-   * @return thresholdTarget
-  **/
-  @Schema(description = "A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.")
-
-
-  public String getThresholdTarget() {
-    return thresholdTarget;
-  }
-
-  public void setThresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-  }
-
-  public ServiceLevelObjectiveCreate tolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-    return this;
-  }
-
-  /**
-   * Get tolerancePeriod
-   * @return tolerancePeriod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getTolerancePeriod() {
-    return tolerancePeriod;
-  }
-
-  public void setTolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-  }
-
-  public ServiceLevelObjectiveCreate toleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-    return this;
-  }
-
-  /**
-   * A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.
-   * @return toleranceTarget
-  **/
-  @Schema(description = "A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.")
-
-
-  public String getToleranceTarget() {
-    return toleranceTarget;
-  }
-
-  public void setToleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-  }
-
-  public ServiceLevelObjectiveCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelObjectiveCreate specParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-    return this;
-  }
-
-  /**
-   * Get specParameter
-   * @return specParameter
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public ServiceLevelSpecParameter getSpecParameter() {
-    return specParameter;
-  }
-
-  public void setSpecParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-  }
-
-  public ServiceLevelObjectiveCreate specConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-    return this;
-  }
-
-  public ServiceLevelObjectiveCreate addSpecConsequenceItem(ServiceLevelSpecConsequence specConsequenceItem) {
-    if (this.specConsequence == null) {
-      this.specConsequence = new ArrayList<>();
-    }
-    this.specConsequence.add(specConsequenceItem);
-    return this;
-  }
-
-  /**
-   * Get specConsequence
-   * @return specConsequence
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ServiceLevelSpecConsequence> getSpecConsequence() {
-    return specConsequence;
-  }
-
-  public void setSpecConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-  }
-
-  public ServiceLevelObjectiveCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelObjectiveCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelObjectiveCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelObjectiveCreate serviceLevelObjectiveCreate = (ServiceLevelObjectiveCreate) o;
-    return Objects.equals(this.conformanceComparator, serviceLevelObjectiveCreate.conformanceComparator) &&
-        Objects.equals(this.conformancePeriod, serviceLevelObjectiveCreate.conformancePeriod) &&
-        Objects.equals(this.conformanceTarget, serviceLevelObjectiveCreate.conformanceTarget) &&
-        Objects.equals(this.graceTimes, serviceLevelObjectiveCreate.graceTimes) &&
-        Objects.equals(this.name, serviceLevelObjectiveCreate.name) &&
-        Objects.equals(this.thresholdTarget, serviceLevelObjectiveCreate.thresholdTarget) &&
-        Objects.equals(this.tolerancePeriod, serviceLevelObjectiveCreate.tolerancePeriod) &&
-        Objects.equals(this.toleranceTarget, serviceLevelObjectiveCreate.toleranceTarget) &&
-        Objects.equals(this.validFor, serviceLevelObjectiveCreate.validFor) &&
-        Objects.equals(this.specParameter, serviceLevelObjectiveCreate.specParameter) &&
-        Objects.equals(this.specConsequence, serviceLevelObjectiveCreate.specConsequence) &&
-        Objects.equals(this.type, serviceLevelObjectiveCreate.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelObjectiveCreate.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelObjectiveCreate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(conformanceComparator, conformancePeriod, conformanceTarget, graceTimes, name, thresholdTarget, tolerancePeriod, toleranceTarget, validFor, specParameter, specConsequence, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelObjectiveCreate {\n");
-    
-    sb.append("    conformanceComparator: ").append(toIndentedString(conformanceComparator)).append("\n");
-    sb.append("    conformancePeriod: ").append(toIndentedString(conformancePeriod)).append("\n");
-    sb.append("    conformanceTarget: ").append(toIndentedString(conformanceTarget)).append("\n");
-    sb.append("    graceTimes: ").append(toIndentedString(graceTimes)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    thresholdTarget: ").append(toIndentedString(thresholdTarget)).append("\n");
-    sb.append("    tolerancePeriod: ").append(toIndentedString(tolerancePeriod)).append("\n");
-    sb.append("    toleranceTarget: ").append(toIndentedString(toleranceTarget)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    specParameter: ").append(toIndentedString(specParameter)).append("\n");
-    sb.append("    specConsequence: ").append(toIndentedString(specConsequence)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveRef.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveRef.java
deleted file mode 100644
index 0a2bfd05589bf81665a5936a1f122a56fc9a476b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveRef.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A set of Service Level Objectives that are contained in the Service Level Specification.
- */
-@Schema(description = "A set of Service Level Objectives that are contained in the Service Level Specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelObjectiveRef   {
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("@referredType")
-  private String referredType = null;
-
-  public ServiceLevelObjectiveRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The hyperlink to access a service level object.
-   * @return href
-  **/
-  @Schema(description = "The hyperlink to access a service level object.")
-  @NotNull
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ServiceLevelObjectiveRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier of a service level object.
-   * @return id
-  **/
-  @Schema(description = "The identifier of a service level object.")
-  @NotNull
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ServiceLevelObjectiveRef referredType(String referredType) {
-    this.referredType = referredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return referredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-
-  public String getReferredType() {
-    return referredType;
-  }
-
-  public void setReferredType(String referredType) {
-    this.referredType = referredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelObjectiveRef serviceLevelObjectiveRef = (ServiceLevelObjectiveRef) o;
-    return Objects.equals(this.href, serviceLevelObjectiveRef.href) &&
-        Objects.equals(this.id, serviceLevelObjectiveRef.id) &&
-        Objects.equals(this.referredType, serviceLevelObjectiveRef.referredType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(href, id, referredType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelObjectiveRef {\n");
-    
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    referredType: ").append(toIndentedString(referredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveUpdate.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveUpdate.java
deleted file mode 100644
index 4adee80422a6f981bbfa77318e5be3dca0d9e854..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelObjectiveUpdate.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters. Skipped properties: id,href,id,href,validFor
- */
-@Schema(description = "Service level objectives are defined in terms of parameters and metrics, thresholds, and tolerances  associated with the parameters. Skipped properties: id,href,id,href,validFor")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelObjectiveUpdate   {
-  @JsonProperty("conformanceComparator")
-  private String conformanceComparator = null;
-
-  @JsonProperty("conformancePeriod")
-  private TimePeriod conformancePeriod = null;
-
-  @JsonProperty("conformanceTarget")
-  private String conformanceTarget = null;
-
-  @JsonProperty("graceTimes")
-  private String graceTimes = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("thresholdTarget")
-  private String thresholdTarget = null;
-
-  @JsonProperty("tolerancePeriod")
-  private TimePeriod tolerancePeriod = null;
-
-  @JsonProperty("toleranceTarget")
-  private String toleranceTarget = null;
-
-  @JsonProperty("specParameter")
-  private ServiceLevelSpecParameter specParameter = null;
-
-  @JsonProperty("specConsequence")
-  @Valid
-  private List<ServiceLevelSpecConsequence> specConsequence = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelObjectiveUpdate conformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-    return this;
-  }
-
-  /**
-   * An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.
-   * @return conformanceComparator
-  **/
-  @Schema(description = "An operator that specifies whether a Service Level Objective is  violated above or below the conformanceTarget.")
-
-
-  public String getConformanceComparator() {
-    return conformanceComparator;
-  }
-
-  public void setConformanceComparator(String conformanceComparator) {
-    this.conformanceComparator = conformanceComparator;
-  }
-
-  public ServiceLevelObjectiveUpdate conformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-    return this;
-  }
-
-  /**
-   * An interval of time during which the Conformance Target must be measured.
-   * @return conformancePeriod
-  **/
-  @Schema(description = "An interval of time during which the Conformance Target must be measured.")
-
-  @Valid
-
-  public TimePeriod getConformancePeriod() {
-    return conformancePeriod;
-  }
-
-  public void setConformancePeriod(TimePeriod conformancePeriod) {
-    this.conformancePeriod = conformancePeriod;
-  }
-
-  public ServiceLevelObjectiveUpdate conformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-    return this;
-  }
-
-  /**
-   * A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.
-   * @return conformanceTarget
-  **/
-  @Schema(description = "A value used to determine if Service Level Objective is met.  The data type should be adjusted case by case.")
-
-
-  public String getConformanceTarget() {
-    return conformanceTarget;
-  }
-
-  public void setConformanceTarget(String conformanceTarget) {
-    this.conformanceTarget = conformanceTarget;
-  }
-
-  public ServiceLevelObjectiveUpdate graceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-    return this;
-  }
-
-  /**
-   * The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.
-   * @return graceTimes
-  **/
-  @Schema(description = "The number of times an objective can remain un-updated without  a violation of a Service Level Agreement in reference to a measurement period and/or Service Level Agreement reporting period.")
-
-
-  public String getGraceTimes() {
-    return graceTimes;
-  }
-
-  public void setGraceTimes(String graceTimes) {
-    this.graceTimes = graceTimes;
-  }
-
-  public ServiceLevelObjectiveUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of the service level objectives.
-   * @return name
-  **/
-  @Schema(description = "The name of the service level objectives.")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelObjectiveUpdate thresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-    return this;
-  }
-
-  /**
-   * A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.
-   * @return thresholdTarget
-  **/
-  @Schema(description = "A value that used to specify when a warning should be used  that indicates an objective is danger of not being met. Notice, the data type should be adjusted case by case.")
-
-
-  public String getThresholdTarget() {
-    return thresholdTarget;
-  }
-
-  public void setThresholdTarget(String thresholdTarget) {
-    this.thresholdTarget = thresholdTarget;
-  }
-
-  public ServiceLevelObjectiveUpdate tolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-    return this;
-  }
-
-  /**
-   * Get tolerancePeriod
-   * @return tolerancePeriod
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public TimePeriod getTolerancePeriod() {
-    return tolerancePeriod;
-  }
-
-  public void setTolerancePeriod(TimePeriod tolerancePeriod) {
-    this.tolerancePeriod = tolerancePeriod;
-  }
-
-  public ServiceLevelObjectiveUpdate toleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-    return this;
-  }
-
-  /**
-   * A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.
-   * @return toleranceTarget
-  **/
-  @Schema(description = "A value that specifies the allowable variation of a conformance  Target. The data type should be adjusted case by case.")
-
-
-  public String getToleranceTarget() {
-    return toleranceTarget;
-  }
-
-  public void setToleranceTarget(String toleranceTarget) {
-    this.toleranceTarget = toleranceTarget;
-  }
-
-  public ServiceLevelObjectiveUpdate specParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-    return this;
-  }
-
-  /**
-   * Get specParameter
-   * @return specParameter
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public ServiceLevelSpecParameter getSpecParameter() {
-    return specParameter;
-  }
-
-  public void setSpecParameter(ServiceLevelSpecParameter specParameter) {
-    this.specParameter = specParameter;
-  }
-
-  public ServiceLevelObjectiveUpdate specConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-    return this;
-  }
-
-  public ServiceLevelObjectiveUpdate addSpecConsequenceItem(ServiceLevelSpecConsequence specConsequenceItem) {
-    if (this.specConsequence == null) {
-      this.specConsequence = new ArrayList<>();
-    }
-    this.specConsequence.add(specConsequenceItem);
-    return this;
-  }
-
-  /**
-   * Get specConsequence
-   * @return specConsequence
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ServiceLevelSpecConsequence> getSpecConsequence() {
-    return specConsequence;
-  }
-
-  public void setSpecConsequence(List<ServiceLevelSpecConsequence> specConsequence) {
-    this.specConsequence = specConsequence;
-  }
-
-  public ServiceLevelObjectiveUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelObjectiveUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelObjectiveUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelObjectiveUpdate serviceLevelObjectiveUpdate = (ServiceLevelObjectiveUpdate) o;
-    return Objects.equals(this.conformanceComparator, serviceLevelObjectiveUpdate.conformanceComparator) &&
-        Objects.equals(this.conformancePeriod, serviceLevelObjectiveUpdate.conformancePeriod) &&
-        Objects.equals(this.conformanceTarget, serviceLevelObjectiveUpdate.conformanceTarget) &&
-        Objects.equals(this.graceTimes, serviceLevelObjectiveUpdate.graceTimes) &&
-        Objects.equals(this.name, serviceLevelObjectiveUpdate.name) &&
-        Objects.equals(this.thresholdTarget, serviceLevelObjectiveUpdate.thresholdTarget) &&
-        Objects.equals(this.tolerancePeriod, serviceLevelObjectiveUpdate.tolerancePeriod) &&
-        Objects.equals(this.toleranceTarget, serviceLevelObjectiveUpdate.toleranceTarget) &&
-        Objects.equals(this.specParameter, serviceLevelObjectiveUpdate.specParameter) &&
-        Objects.equals(this.specConsequence, serviceLevelObjectiveUpdate.specConsequence) &&
-        Objects.equals(this.type, serviceLevelObjectiveUpdate.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelObjectiveUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelObjectiveUpdate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(conformanceComparator, conformancePeriod, conformanceTarget, graceTimes, name, thresholdTarget, tolerancePeriod, toleranceTarget, specParameter, specConsequence, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelObjectiveUpdate {\n");
-    
-    sb.append("    conformanceComparator: ").append(toIndentedString(conformanceComparator)).append("\n");
-    sb.append("    conformancePeriod: ").append(toIndentedString(conformancePeriod)).append("\n");
-    sb.append("    conformanceTarget: ").append(toIndentedString(conformanceTarget)).append("\n");
-    sb.append("    graceTimes: ").append(toIndentedString(graceTimes)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    thresholdTarget: ").append(toIndentedString(thresholdTarget)).append("\n");
-    sb.append("    tolerancePeriod: ").append(toIndentedString(tolerancePeriod)).append("\n");
-    sb.append("    toleranceTarget: ").append(toIndentedString(toleranceTarget)).append("\n");
-    sb.append("    specParameter: ").append(toIndentedString(specParameter)).append("\n");
-    sb.append("    specConsequence: ").append(toIndentedString(specConsequence)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecConsequence.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecConsequence.java
deleted file mode 100644
index 34955d3a0cea8a09856b4bffbae76258ce3d320b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecConsequence.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * Some consequences for the provider of the Service are resulted when the service level objective does not meet.
- */
-@Schema(description = "Some consequences for the provider of the Service are resulted when the service level objective does not meet.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelSpecConsequence   {
-  @JsonProperty("prescribedAction")
-  private String prescribedAction = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelSpecConsequence prescribedAction(String prescribedAction) {
-    this.prescribedAction = prescribedAction;
-    return this;
-  }
-
-  /**
-   * Recommended remedy for a violated Service Level Objective.  This could be a hyperlink to the recommended action.
-   * @return prescribedAction
-  **/
-  @Schema(description = "Recommended remedy for a violated Service Level Objective.  This could be a hyperlink to the recommended action.")
-
-
-  public String getPrescribedAction() {
-    return prescribedAction;
-  }
-
-  public void setPrescribedAction(String prescribedAction) {
-    this.prescribedAction = prescribedAction;
-  }
-
-  public ServiceLevelSpecConsequence validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelSpecConsequence type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelSpecConsequence schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelSpecConsequence baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelSpecConsequence serviceLevelSpecConsequence = (ServiceLevelSpecConsequence) o;
-    return Objects.equals(this.prescribedAction, serviceLevelSpecConsequence.prescribedAction) &&
-        Objects.equals(this.validFor, serviceLevelSpecConsequence.validFor) &&
-        Objects.equals(this.type, serviceLevelSpecConsequence.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelSpecConsequence.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelSpecConsequence.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(prescribedAction, validFor, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelSpecConsequence {\n");
-    
-    sb.append("    prescribedAction: ").append(toIndentedString(prescribedAction)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecParameter.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecParameter.java
deleted file mode 100644
index 450fee5772211f4102db7837c2885cb0e0e20d7b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecParameter.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Service Level Specification parameters can be one of two types. A Key Quality Indicator (KQI)  provides a measurement of a specific aspect of the performance of a Product (i.e., Product  Specification, Product Offering, or Product) or a Service (i.e., Service Specification or Service).
- */
-@Schema(description = "Service Level Specification parameters can be one of two types. A Key Quality Indicator (KQI)  provides a measurement of a specific aspect of the performance of a Product (i.e., Product  Specification, Product Offering, or Product) or a Service (i.e., Service Specification or Service).")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelSpecParameter   {
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("serviceParmCategory")
-  private String serviceParmCategory = null;
-
-  @JsonProperty("serviceParmPerspective")
-  private String serviceParmPerspective = null;
-
-  @JsonProperty("transformationAlgorithmOfKQI")
-  private String transformationAlgorithmOfKQI = null;
-
-  @JsonProperty("type")
-  private String paramtype = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("relatedEntity")
-  @Valid
-  private List<EntityRef> relatedEntity = new ArrayList<>();
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelSpecParameter name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of parameter.
-   * @return name
-  **/
-  @Schema(description = "The name of parameter.")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelSpecParameter serviceParmCategory(String serviceParmCategory) {
-    this.serviceParmCategory = serviceParmCategory;
-    return this;
-  }
-
-  /**
-   * A string that specifies whether the Service Level Specification Parameter is technology specific, service specific, or technology/service independent
-   * @return serviceParmCategory
-  **/
-  @Schema(description = "A string that specifies whether the Service Level Specification Parameter is technology specific, service specific, or technology/service independent")
-
-
-  public String getServiceParmCategory() {
-    return serviceParmCategory;
-  }
-
-  public void setServiceParmCategory(String serviceParmCategory) {
-    this.serviceParmCategory = serviceParmCategory;
-  }
-
-  public ServiceLevelSpecParameter serviceParmPerspective(String serviceParmPerspective) {
-    this.serviceParmPerspective = serviceParmPerspective;
-    return this;
-  }
-
-  /**
-   * A string that specifies whether the Service Level Specification  Parameter represents a single user instance parameter or a parameter that represents an aggregation.
-   * @return serviceParmPerspective
-  **/
-  @Schema(description = "A string that specifies whether the Service Level Specification  Parameter represents a single user instance parameter or a parameter that represents an aggregation.")
-
-
-  public String getServiceParmPerspective() {
-    return serviceParmPerspective;
-  }
-
-  public void setServiceParmPerspective(String serviceParmPerspective) {
-    this.serviceParmPerspective = serviceParmPerspective;
-  }
-
-  public ServiceLevelSpecParameter transformationAlgorithmOfKQI(String transformationAlgorithmOfKQI) {
-    this.transformationAlgorithmOfKQI = transformationAlgorithmOfKQI;
-    return this;
-  }
-
-  /**
-   * The description of a logical step-by-step procedure used to  calculate the value of a KQI.
-   * @return transformationAlgorithmOfKQI
-  **/
-  @Schema(description = "The description of a logical step-by-step procedure used to  calculate the value of a KQI.")
-
-
-  public String getTransformationAlgorithmOfKQI() {
-    return transformationAlgorithmOfKQI;
-  }
-
-  public void setTransformationAlgorithmOfKQI(String transformationAlgorithmOfKQI) {
-    this.transformationAlgorithmOfKQI = transformationAlgorithmOfKQI;
-  }
-
-  public ServiceLevelSpecParameter paramtype(String type) {
-    this.paramtype = type;
-    return this;
-  }
-
-  /**
-   * Types of Service Level Specification parameters are KQI or KPI.
-   * @return type
-  **/
-  @Schema(description = "Types of Service Level Specification parameters are KQI or KPI.")
-
-
-  public String getParamtype() {
-    return paramtype;
-  }
-
-  public void setParamtype(String type) {
-    this.paramtype = type;
-  }
-
-  public ServiceLevelSpecParameter validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelSpecParameter relatedEntity(List<EntityRef> relatedEntity) {
-    this.relatedEntity = relatedEntity;
-    return this;
-  }
-
-  public ServiceLevelSpecParameter addRelatedEntityItem(EntityRef relatedEntityItem) {
-    this.relatedEntity.add(relatedEntityItem);
-    return this;
-  }
-
-  /**
-   * Get relatedEntity
-   * @return relatedEntity
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public List<EntityRef> getRelatedEntity() {
-    return relatedEntity;
-  }
-
-  public void setRelatedEntity(List<EntityRef> relatedEntity) {
-    this.relatedEntity = relatedEntity;
-  }
-
-  public ServiceLevelSpecParameter type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelSpecParameter schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelSpecParameter baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelSpecParameter serviceLevelSpecParameter = (ServiceLevelSpecParameter) o;
-    return Objects.equals(this.name, serviceLevelSpecParameter.name) &&
-        Objects.equals(this.serviceParmCategory, serviceLevelSpecParameter.serviceParmCategory) &&
-        Objects.equals(this.serviceParmPerspective, serviceLevelSpecParameter.serviceParmPerspective) &&
-        Objects.equals(this.transformationAlgorithmOfKQI, serviceLevelSpecParameter.transformationAlgorithmOfKQI) &&
-        Objects.equals(this.type, serviceLevelSpecParameter.type) &&
-        Objects.equals(this.validFor, serviceLevelSpecParameter.validFor) &&
-        Objects.equals(this.relatedEntity, serviceLevelSpecParameter.relatedEntity) &&
-        Objects.equals(this.type, serviceLevelSpecParameter.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelSpecParameter.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelSpecParameter.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, serviceParmCategory, serviceParmPerspective, transformationAlgorithmOfKQI, type, validFor, relatedEntity, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelSpecParameter {\n");
-    
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    serviceParmCategory: ").append(toIndentedString(serviceParmCategory)).append("\n");
-    sb.append("    serviceParmPerspective: ").append(toIndentedString(serviceParmPerspective)).append("\n");
-    sb.append("    transformationAlgorithmOfKQI: ").append(toIndentedString(transformationAlgorithmOfKQI)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    relatedEntity: ").append(toIndentedString(relatedEntity)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecification.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecification.java
deleted file mode 100644
index 5411f36c002ddb20e7314239841096205daaea12..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecification.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications.
- */
-@Schema(description = "A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelSpecification   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("objective")
-  @Valid
-  private List<ServiceLevelObjectiveRef> objective = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelSpecification description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A brief introduction of a service level specification.
-   * @return description
-  **/
-  @Schema(description = "A brief introduction of a service level specification.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceLevelSpecification href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * The hyperlink to access a service level specification.
-   * @return href
-  **/
-  @Schema(description = "The hyperlink to access a service level specification.")
-
-
-  public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ServiceLevelSpecification id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * The identifier to a service level specification.
-   * @return id
-  **/
-  @Schema(description = "The identifier to a service level specification.")
-
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ServiceLevelSpecification name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of Service Level Specification
-   * @return name
-  **/
-  @Schema(description = "The name of Service Level Specification")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelSpecification validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelSpecification objective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-    return this;
-  }
-
-  public ServiceLevelSpecification addObjectiveItem(ServiceLevelObjectiveRef objectiveItem) {
-    if (this.objective == null) {
-      this.objective = new ArrayList<>();
-    }
-    this.objective.add(objectiveItem);
-    return this;
-  }
-
-  /**
-   * Get objective
-   * @return objective
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ServiceLevelObjectiveRef> getObjective() {
-    return objective;
-  }
-
-  public void setObjective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-  }
-
-  public ServiceLevelSpecification type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelSpecification schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelSpecification baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelSpecification serviceLevelSpecification = (ServiceLevelSpecification) o;
-    return Objects.equals(this.description, serviceLevelSpecification.description) &&
-        Objects.equals(this.href, serviceLevelSpecification.href) &&
-        Objects.equals(this.id, serviceLevelSpecification.id) &&
-        Objects.equals(this.name, serviceLevelSpecification.name) &&
-        Objects.equals(this.validFor, serviceLevelSpecification.validFor) &&
-        Objects.equals(this.objective, serviceLevelSpecification.objective) &&
-        Objects.equals(this.type, serviceLevelSpecification.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelSpecification.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelSpecification.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, href, id, name, validFor, objective, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelSpecification {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationCreate.java
deleted file mode 100644
index 14c11b3d6cf387dd78c58fedce713a84cabc9c8e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationCreate.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications. Skipped properties: id,href
- */
-@Schema(description = "A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelSpecificationCreate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("objective")
-  @Valid
-  private List<ServiceLevelObjectiveRef> objective = new ArrayList<>();
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelSpecificationCreate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A brief introduction of a service level specification.
-   * @return description
-  **/
-  @Schema(description = "A brief introduction of a service level specification.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceLevelSpecificationCreate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of Service Level Specification
-   * @return name
-  **/
-  @Schema(description = "The name of Service Level Specification")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelSpecificationCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * A valid duration of a thing.
-   * @return validFor
-  **/
-  @Schema(description = "A valid duration of a thing.")
-
-  @Valid
-
-  public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public ServiceLevelSpecificationCreate objective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-    return this;
-  }
-
-  public ServiceLevelSpecificationCreate addObjectiveItem(ServiceLevelObjectiveRef objectiveItem) {
-    this.objective.add(objectiveItem);
-    return this;
-  }
-
-  /**
-   * Get objective
-   * @return objective
-  **/
-  @Schema(description = "")
-  @NotNull
-
-  @Valid
-
-  public List<ServiceLevelObjectiveRef> getObjective() {
-    return objective;
-  }
-
-  public void setObjective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-  }
-
-  public ServiceLevelSpecificationCreate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelSpecificationCreate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelSpecificationCreate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelSpecificationCreate serviceLevelSpecificationCreate = (ServiceLevelSpecificationCreate) o;
-    return Objects.equals(this.description, serviceLevelSpecificationCreate.description) &&
-        Objects.equals(this.name, serviceLevelSpecificationCreate.name) &&
-        Objects.equals(this.validFor, serviceLevelSpecificationCreate.validFor) &&
-        Objects.equals(this.objective, serviceLevelSpecificationCreate.objective) &&
-        Objects.equals(this.type, serviceLevelSpecificationCreate.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelSpecificationCreate.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelSpecificationCreate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, validFor, objective, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelSpecificationCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationUpdate.java
deleted file mode 100644
index 78fb496b25d5582e189bef1d13e63b9ce7f1ea75..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/sqm657/model/ServiceLevelSpecificationUpdate.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.sqm657.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications. Skipped properties: id,href,id,href,validFor
- */
-@Schema(description = "A Service Level Specification represents a pre-defined or negotiated set of Service Level  Objectives. In addition, certain consequences are associated with not meeting the Service Level  Objectives. Service Level Agreements are expressed in terms of Service Level Specifications. Skipped properties: id,href,id,href,validFor")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-19T00:14:31.369+03:00")
-
-public class ServiceLevelSpecificationUpdate   {
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("objective")
-  @Valid
-  private List<ServiceLevelObjectiveRef> objective = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  public ServiceLevelSpecificationUpdate description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A brief introduction of a service level specification.
-   * @return description
-  **/
-  @Schema(description = "A brief introduction of a service level specification.")
-
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceLevelSpecificationUpdate name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * The name of Service Level Specification
-   * @return name
-  **/
-  @Schema(description = "The name of Service Level Specification")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceLevelSpecificationUpdate objective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-    return this;
-  }
-
-  public ServiceLevelSpecificationUpdate addObjectiveItem(ServiceLevelObjectiveRef objectiveItem) {
-    if (this.objective == null) {
-      this.objective = new ArrayList<>();
-    }
-    this.objective.add(objectiveItem);
-    return this;
-  }
-
-  /**
-   * Get objective
-   * @return objective
-  **/
-  @Schema(description = "")
-
-  @Valid
-
-  public List<ServiceLevelObjectiveRef> getObjective() {
-    return objective;
-  }
-
-  public void setObjective(List<ServiceLevelObjectiveRef> objective) {
-    this.objective = objective;
-  }
-
-  public ServiceLevelSpecificationUpdate type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * The class type of the actual resource (for type extension).
-   * @return type
-  **/
-  @Schema(description = "The class type of the actual resource (for type extension).")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ServiceLevelSpecificationUpdate schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A link to the schema describing a resource (for type extension).
-   * @return schemaLocation
-  **/
-  @Schema(description = "A link to the schema describing a resource (for type extension).")
-
-
-  public String getSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public ServiceLevelSpecificationUpdate baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * The base type for use in polymorphic collections
-   * @return baseType
-  **/
-  @Schema(description = "The base type for use in polymorphic collections")
-
-
-  public String getBaseType() {
-    return baseType;
-  }
-
-  public void setBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceLevelSpecificationUpdate serviceLevelSpecificationUpdate = (ServiceLevelSpecificationUpdate) o;
-    return Objects.equals(this.description, serviceLevelSpecificationUpdate.description) &&
-        Objects.equals(this.name, serviceLevelSpecificationUpdate.name) &&
-        Objects.equals(this.objective, serviceLevelSpecificationUpdate.objective) &&
-        Objects.equals(this.type, serviceLevelSpecificationUpdate.type) &&
-        Objects.equals(this.schemaLocation, serviceLevelSpecificationUpdate.schemaLocation) &&
-        Objects.equals(this.baseType, serviceLevelSpecificationUpdate.baseType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, name, objective, type, schemaLocation, baseType);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceLevelSpecificationUpdate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    objective: ").append(toIndentedString(objective)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/Addressable.java b/src/main/java/org/etsi/osl/tmf/stm653/model/Addressable.java
deleted file mode 100644
index 63329b1a3ca2c082f58c7f1f1463c18d2c05c925..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/Addressable.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Base schema for adressable entities
- */
-@Schema(description = "Base schema for adressable entities")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class Addressable   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("href")
-  private String href = null;
-
-  public Addressable id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * unique identifier
-   * @return id
-  **/
-  @Schema(description = "unique identifier")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Addressable href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference
-   * @return href
-  **/
-  @Schema(description = "Hyperlink reference")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Addressable addressable = (Addressable) o;
-    return Objects.equals(this.id, addressable.id) &&
-        Objects.equals(this.href, addressable.href);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, href);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Addressable {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/AppliedConsequence.java b/src/main/java/org/etsi/osl/tmf/stm653/model/AppliedConsequence.java
deleted file mode 100644
index 10b53160d5aaf6ab95cb9555915a2146daed1f5c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/AppliedConsequence.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.Table;
-
-/**
- * An Applied Consequence defines the action (prescribed action or notification)
- * to take when a MeasureThresholdRuleViolation occurs.
- */
-@Schema(description = "An Applied Consequence defines the action (prescribed action or notification) to take when a  MeasureThresholdRuleViolation occurs.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMAppliedConsequence")
-@Table(name = "STMAppliedConsequence")
-public class AppliedConsequence extends BaseRootNamedEntity {
-	@JsonProperty("appliedAction")
-	private String appliedAction = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-
-	@JsonProperty("repeatAction")
-	private Boolean repeatAction = null;
-
-
-	public AppliedConsequence appliedAction(String appliedAction) {
-		this.appliedAction = appliedAction;
-		return this;
-	}
-
-	/**
-	 * The action for a violated threshold. This could be a hyperlink to the action.
-	 * 
-	 * @return appliedAction
-	 **/
-	@Schema(description = "The action for a violated threshold. This could be a hyperlink to  the action.")
-
-	public String getAppliedAction() {
-		return appliedAction;
-	}
-
-	public void setAppliedAction(String appliedAction) {
-		this.appliedAction = appliedAction;
-	}
-
-	public AppliedConsequence description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative that explains in detail what the consequence is.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative that explains in detail what the consequence is.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public AppliedConsequence name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A word, term, or phrase by which Consequence is known and distinguished from
-	 * other MetricDefMeasureConsequences.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A word, term, or phrase by which Consequence is known and  distinguished from other MetricDefMeasureConsequences.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public AppliedConsequence repeatAction(Boolean repeatAction) {
-		this.repeatAction = repeatAction;
-		return this;
-	}
-
-	/**
-	 * An indicator used to specify that a consequence should cease being applied if
-	 * a value is in the same range as the previous value or continue being applied
-	 * if a value is in the same range as the previous value. If the repeatAction is
-	 * True, if the consequence is always applied as soon as the MetricMeasure value
-	 * is in the range of values and if the repeatAction is False, the consequence
-	 * is applied only if the previous MetricMeasure value was not in the same
-	 * range.
-	 * 
-	 * @return repeatAction
-	 **/
-	@Schema(description = "An indicator used to specify that a consequence should cease  being applied if a value is in the same range as the previous value or continue being applied if a value is in the same range as the previous value.   If the repeatAction is True, if the consequence is always applied as soon as the MetricMeasure value is in the range of values and if the repeatAction is False, the consequence is applied only if the previous MetricMeasure value was not in the same range.")
-
-	public Boolean isRepeatAction() {
-		return repeatAction;
-	}
-
-	public void setRepeatAction(Boolean repeatAction) {
-		this.repeatAction = repeatAction;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		AppliedConsequence appliedConsequence = (AppliedConsequence) o;
-		return Objects.equals(this.appliedAction, appliedConsequence.appliedAction)
-				&& Objects.equals(this.description, appliedConsequence.description)
-				&& Objects.equals(this.name, appliedConsequence.name)
-				&& Objects.equals(this.repeatAction, appliedConsequence.repeatAction)
-				&& Objects.equals(this.baseType, appliedConsequence.baseType)
-				&& Objects.equals(this.schemaLocation, appliedConsequence.schemaLocation)
-				&& Objects.equals(this.type, appliedConsequence.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(appliedAction, description, name, repeatAction, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class AppliedConsequence {\n");
-
-		sb.append("    appliedAction: ").append(toIndentedString(appliedAction)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    repeatAction: ").append(toIndentedString(repeatAction)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/AssociationSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/stm653/model/AssociationSpecificationRef.java
deleted file mode 100644
index 09633f998a90daa13d1d632b3afaf76bb93a5097..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/AssociationSpecificationRef.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * reference to an AssociationSpecification object
- */
-@Schema(description = "reference to an AssociationSpecification object")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMAssociationSpecificationRef")
-@Table(name = "STMAssociationSpecificationRef")
-public class AssociationSpecificationRef  extends BaseRootNamedEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-  public AssociationSpecificationRef id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * unique identifier
-   * @return id
-  **/
-  @Schema(description = "unique identifier")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public AssociationSpecificationRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference
-   * @return href
-  **/
-  @Schema(description = "Hyperlink reference")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public AssociationSpecificationRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
- 
-
-  public AssociationSpecificationRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AssociationSpecificationRef associationSpecificationRef = (AssociationSpecificationRef) o;
-    return Objects.equals(this.id, associationSpecificationRef.id) &&
-        Objects.equals(this.href, associationSpecificationRef.href) &&
-        Objects.equals(this.name, associationSpecificationRef.name) &&
-        Objects.equals(this.baseType, associationSpecificationRef.baseType) &&
-        Objects.equals(this.schemaLocation, associationSpecificationRef.schemaLocation) &&
-        Objects.equals(this.type, associationSpecificationRef.type) &&
-        Objects.equals(this._atReferredType, associationSpecificationRef._atReferredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AssociationSpecificationRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/stm653/model/Characteristic.java
deleted file mode 100644
index 340d2c7425eeeccad679ba55108ecb7636527e88..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/Characteristic.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Describes a given characteristic of an object or entity through a name/value
- * pair.
- */
-@Schema(description = "Describes a given characteristic of an object or entity through a name/value pair.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMCharacteristic")
-@Table(name = "STMCharacteristic")
-public class Characteristic extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("characteristicRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicRelationship> characteristicRelationship = null;
-
-	@JsonProperty("value")
-	private Any value = null;
-
-	public Characteristic() {
-	}
-	
-	
-	public Characteristic(Characteristic src) {
-		name = src.name;
-		valueType = src.valueType;
-	}
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public Characteristic name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the characteristic
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the characteristic")
-	@NotNull
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Characteristic valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * Data type of the value of the characteristic
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "Data type of the value of the characteristic")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public Characteristic characteristicRelationship(Set<CharacteristicRelationship> characteristicRelationship) {
-		this.characteristicRelationship = characteristicRelationship;
-		return this;
-	}
-
-	public Characteristic addCharacteristicRelationshipItem(CharacteristicRelationship characteristicRelationshipItem) {
-		if (this.characteristicRelationship == null) {
-			this.characteristicRelationship = new HashSet<>();
-		}
-		this.characteristicRelationship.add(characteristicRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Get characteristicRelationship
-	 * 
-	 * @return characteristicRelationship
-	 **/
-	@Schema(description = "")
-	@Valid
-	public Set<CharacteristicRelationship> getCharacteristicRelationship() {
-		return characteristicRelationship;
-	}
-
-	public void setCharacteristicRelationship(Set<CharacteristicRelationship> characteristicRelationship) {
-		this.characteristicRelationship = characteristicRelationship;
-	}
-
-	public Characteristic value(Any value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * Get value
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "")
-	@NotNull
-
-	@Valid
-	public Any getValue() {
-		return value;
-	}
-
-	public void setValue(Any value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Characteristic characteristic = (Characteristic) o;
-		return Objects.equals(this.id, characteristic.id) && Objects.equals(this.name, characteristic.name)
-				&& Objects.equals(this.valueType, characteristic.valueType)
-				&& Objects.equals(this.characteristicRelationship, characteristic.characteristicRelationship)
-				&& Objects.equals(this.value, characteristic.value)
-				&& Objects.equals(this.baseType, characteristic.baseType)
-				&& Objects.equals(this.schemaLocation, characteristic.schemaLocation)
-				&& Objects.equals(this.type, characteristic.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, name, valueType, characteristicRelationship, value, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class Characteristic {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    characteristicRelationship: ").append(toIndentedString(characteristicRelationship)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-//	public void updateWith(Characteristic src) {
-//		this.name = src.getName();
-//		this.valueType = src.valueType;
-//
-//		this.updateServiceCharacteristicRel(src.getCharacteristicRelationship() );
-//
-//	}
-//
-//	private void updateServiceCharacteristicRel(@Valid Set<CharacteristicRelationship> srcSet) {
-//		
-//		if ( srcSet == null ) {
-//			return;
-//		}
-//		Map< String, Boolean> idAddedUpdated = new HashMap<>();
-//		/**
-//		 * update, add the incomings
-//		 */
-//		for (CharacteristicRelationship r : srcSet) {
-//
-//			boolean valueExists = false;
-//			for (CharacteristicRelationship thisCharVal : this.characteristicRelationship ) {
-//				if ( (thisCharVal.getId() !=null) && (thisCharVal.getId().equals(r.getId() ) )) {
-//					valueExists = true;
-//					idAddedUpdated.put( thisCharVal.getId() , true);
-//					break;
-//				}
-//			}
-//			
-//			if (!valueExists) {
-//				this.characteristicRelationship.add( new CharacteristicRelationship( r ));
-//				idAddedUpdated.put( r.getId(), true);
-//			}
-//			
-//		}
-//		
-//		/**
-//		 * remove those that don't exist anymore
-//		 */
-//		
-//		List<CharacteristicRelationship> toRemove = new ArrayList<>();
-//		for (CharacteristicRelationship ss : this.characteristicRelationship) {
-//			if ( idAddedUpdated.get( ss.getId() ) == null ) {
-//				toRemove.add(ss);
-//			}
-//		}
-//		
-//		for (CharacteristicRelationship r : toRemove) {
-//			this.characteristicRelationship.remove(r);
-//		}
-//		
-//	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicRelationship.java
deleted file mode 100644
index 986a192d675f908ded6645629d59cebd1b19352c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicRelationship.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * Another Characteristic that is related to the current Characteristic;
- */
-@Schema(description = "Another Characteristic that is related to the current Characteristic;")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMCharacteristicRelationship")
-@Table(name = "STMCharacteristicRelationship")
-public class CharacteristicRelationship extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public CharacteristicRelationship() {
-		
-	}
-	
-	
-	public CharacteristicRelationship( CharacteristicRelationship src) {
-
-		relationshipType = src.relationshipType;
-	}
-
-	
-	public CharacteristicRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * The type of relationship
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "The type of relationship")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CharacteristicRelationship characteristicRelationship = (CharacteristicRelationship) o;
-		return Objects.equals(this.id, characteristicRelationship.id)
-				&& Objects.equals(this.relationshipType, characteristicRelationship.relationshipType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, relationshipType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CharacteristicRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecification.java b/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecification.java
deleted file mode 100644
index 7f64397387c8152a032a9bac74af102e1af2b13a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecification.java
+++ /dev/null
@@ -1,635 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * This class defines a characteristic specification.
- */
-@Schema(description = "This class defines a characteristic specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMCharactSpec")
-@Table(name = "STMCharactSpec")
-public class CharacteristicSpecification extends BaseRootNamedEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("configurable")
-	private Boolean configurable = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("extensible")
-	private Boolean extensible = null;
-
-	@JsonProperty("isUnique")
-	private Boolean isUnique = null;
-
-	@JsonProperty("maxCardinality")
-	private Integer maxCardinality = null;
-
-	@JsonProperty("minCardinality")
-	private Integer minCardinality = null;
-
-	@JsonProperty("regex")
-	private String regex = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("charSpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicSpecificationRelationship> charSpecRelationship = new HashSet<>();
-
-	@JsonProperty("characteristicValueSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicValueSpecification> characteristicValueSpecification = new HashSet<>();
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	@JsonProperty("@valueSchemaLocation")
-	private String _atValueSchemaLocation = null;
-
-	public CharacteristicSpecification() {
-		this.baseType = "BaseRootEntity";
-		this.type = this.getClass().getName();		
-	}
-	
-	
-	public CharacteristicSpecification(CharacteristicSpecification src) {
-		this();
-		configurable = src.configurable;
-		description = src.description;
-		extensible = src.extensible;
-		isUnique = src.isUnique;
-		maxCardinality = src.maxCardinality;
-		minCardinality = src.minCardinality;
-		name = src.name;
-		regex = src.regex;
-		valueType = src.valueType;
-		validFor = new TimePeriod( src.validFor ) ;
-		
-		for (CharacteristicSpecificationRelationship r : src.charSpecRelationship) {
-			this.addServiceSpecCharRelationshipItem( new CharacteristicSpecificationRelationship( r ));
-		}
-		
-		for (CharacteristicValueSpecification r : src.characteristicValueSpecification) {
-			this.addServiceSpecCharacteristicValueItem( new CharacteristicValueSpecification(r) );
-		}
-	}
-	
-
-	private CharacteristicSpecification addServiceSpecCharRelationshipItem(
-			CharacteristicSpecificationRelationship characteristicSpecificationRelationship) {
-		
-		if (this.charSpecRelationship == null) {
-			this.charSpecRelationship = new HashSet<CharacteristicSpecificationRelationship>();
-		}
-		this.charSpecRelationship.add( characteristicSpecificationRelationship );
-		return this;
-		
-	}
-
-
-	/**
-	 * Unique ID for the characteristic
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "Unique ID for the characteristic")
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-	public CharacteristicSpecification configurable(Boolean configurable) {
-		this.configurable = configurable;
-		return this;
-	}
-
-	/**
-	 * If true, the Boolean indicates that the target Characteristic is configurable
-	 * 
-	 * @return configurable
-	 **/
-	@Schema(description = "If true, the Boolean indicates that the target Characteristic is configurable")
-
-	public Boolean isConfigurable() {
-		return configurable;
-	}
-
-	public void setConfigurable(Boolean configurable) {
-		this.configurable = configurable;
-	}
-
-	public CharacteristicSpecification description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * A narrative that explains the CharacteristicSpecification.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "A narrative that explains the CharacteristicSpecification.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public CharacteristicSpecification extensible(Boolean extensible) {
-		this.extensible = extensible;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies that the values for the characteristic can be
-	 * extended by adding new values when instantiating a characteristic for a
-	 * resource.
-	 * 
-	 * @return extensible
-	 **/
-	@Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a resource.")
-
-	public Boolean isExtensible() {
-		return extensible;
-	}
-
-	public void setExtensible(Boolean extensible) {
-		this.extensible = extensible;
-	}
-
-	public CharacteristicSpecification isUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-		return this;
-	}
-
-	/**
-	 * An indicator that specifies if a value is unique for the specification.
-	 * Possible values are; \"unique while value is in effect\" and \"unique whether
-	 * value is in effect or not\"
-	 * 
-	 * @return isUnique
-	 **/
-	@Schema(description = "An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"")
-
-	public Boolean isIsUnique() {
-		return isUnique;
-	}
-
-	public void setIsUnique(Boolean isUnique) {
-		this.isUnique = isUnique;
-	}
-
-	public CharacteristicSpecification maxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-		return this;
-	}
-
-	/**
-	 * The maximum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where five is
-	 * the value for the maxCardinality.
-	 * 
-	 * @return maxCardinality
-	 **/
-	@Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.")
-
-	public Integer getMaxCardinality() {
-		return maxCardinality;
-	}
-
-	public void setMaxCardinality(Integer maxCardinality) {
-		this.maxCardinality = maxCardinality;
-	}
-
-	public CharacteristicSpecification minCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-		return this;
-	}
-
-	/**
-	 * The minimum number of instances a CharacteristicValue can take on. For
-	 * example, zero to five phone numbers in a group calling plan, where zero is
-	 * the value for the minCardinality.
-	 * 
-	 * @return minCardinality
-	 **/
-	@Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.")
-
-	public Integer getMinCardinality() {
-		return minCardinality;
-	}
-
-	public void setMinCardinality(Integer minCardinality) {
-		this.minCardinality = minCardinality;
-	}
-
-	public CharacteristicSpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * A word, term, or phrase by which this characteristic specification is known
-	 * and distinguished from other characteristic specifications.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "A word, term, or phrase by which this characteristic specification is known and distinguished from other characteristic specifications.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public CharacteristicSpecification regex(String regex) {
-		this.regex = regex;
-		return this;
-	}
-
-	/**
-	 * A rule or principle represented in regular expression used to derive the
-	 * value of a characteristic value.
-	 * 
-	 * @return regex
-	 **/
-	@Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value.")
-
-	public String getRegex() {
-		return regex;
-	}
-
-	public void setRegex(String regex) {
-		this.regex = regex;
-	}
-
-	public CharacteristicSpecification valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the characteristic can take on, such as numeric, text
-	 * and so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public CharacteristicSpecification charSpecRelationship(
-			Set<CharacteristicSpecificationRelationship> charSpecRelationship) {
-		this.charSpecRelationship = charSpecRelationship;
-		return this;
-	}
-
-	public CharacteristicSpecification addCharSpecRelationshipItem(
-			CharacteristicSpecificationRelationship charSpecRelationshipItem) {
-		if (this.charSpecRelationship == null) {
-			this.charSpecRelationship = new HashSet<>();
-		}
-		this.charSpecRelationship.add(charSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * An aggregation, migration, substitution, dependency or exclusivity
-	 * relationship between/among Specification Characteristics.
-	 * 
-	 * @return charSpecRelationship
-	 **/
-	@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among Specification Characteristics.")
-	@Valid
-	public Set<CharacteristicSpecificationRelationship> getCharSpecRelationship() {
-		return charSpecRelationship;
-	}
-
-	public void setCharSpecRelationship(Set<CharacteristicSpecificationRelationship> charSpecRelationship) {
-		this.charSpecRelationship = charSpecRelationship;
-	}
-
-	public CharacteristicSpecification characteristicValueSpecification(
-			Set<CharacteristicValueSpecification> characteristicValueSpecification) {
-		this.characteristicValueSpecification = characteristicValueSpecification;
-		return this;
-	}
-
-	public CharacteristicSpecification addCharacteristicValueSpecificationItem(
-			CharacteristicValueSpecification characteristicValueSpecificationItem) {
-		if (this.characteristicValueSpecification == null) {
-			this.characteristicValueSpecification = new HashSet<>();
-		}
-		this.characteristicValueSpecification.add(characteristicValueSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * A CharacteristicValueSpecification object is used to define a set of
-	 * attributes, each of which can be assigned to a corresponding set of
-	 * attributes in a CharacteristicSpecification object. The values of the
-	 * attributes in the CharacteristicValueSpecification object describe the values
-	 * of the attributes that a corresponding Characteristic object can take on.
-	 * 
-	 * @return characteristicValueSpecification
-	 **/
-	@Schema(description = "A CharacteristicValueSpecification object is used to define a set of attributes, each of which can be assigned to a corresponding set of attributes in a CharacteristicSpecification object. The values of the attributes in the CharacteristicValueSpecification object describe the values of the attributes that a corresponding Characteristic object can take on.")
-	@Valid
-	public Set<CharacteristicValueSpecification> getCharacteristicValueSpecification() {
-		return characteristicValueSpecification;
-	}
-
-	public void setCharacteristicValueSpecification(
-			Set<CharacteristicValueSpecification> characteristicValueSpecification) {
-		this.characteristicValueSpecification = characteristicValueSpecification;
-	}
-
-	public CharacteristicSpecification validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public CharacteristicSpecification _atValueSchemaLocation(String _atValueSchemaLocation) {
-		this._atValueSchemaLocation = _atValueSchemaLocation;
-		return this;
-	}
-
-	/**
-	 * This (optional) field provides a link to the schema describing the value
-	 * type.
-	 * 
-	 * @return _atValueSchemaLocation
-	 **/
-	@Schema(description = "This (optional) field provides a link to the schema describing the value type.")
-
-	public String getAtValueSchemaLocation() {
-		return _atValueSchemaLocation;
-	}
-
-	public void setAtValueSchemaLocation(String _atValueSchemaLocation) {
-		this._atValueSchemaLocation = _atValueSchemaLocation;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CharacteristicSpecification characteristicSpecification = (CharacteristicSpecification) o;
-		return Objects.equals(this.id, characteristicSpecification.id)
-				&& Objects.equals(this.configurable, characteristicSpecification.configurable)
-				&& Objects.equals(this.description, characteristicSpecification.description)
-				&& Objects.equals(this.extensible, characteristicSpecification.extensible)
-				&& Objects.equals(this.isUnique, characteristicSpecification.isUnique)
-				&& Objects.equals(this.maxCardinality, characteristicSpecification.maxCardinality)
-				&& Objects.equals(this.minCardinality, characteristicSpecification.minCardinality)
-				&& Objects.equals(this.name, characteristicSpecification.name)
-				&& Objects.equals(this.regex, characteristicSpecification.regex)
-				&& Objects.equals(this.valueType, characteristicSpecification.valueType)
-				&& Objects.equals(this.charSpecRelationship, characteristicSpecification.charSpecRelationship)
-				&& Objects.equals(this.characteristicValueSpecification,
-						characteristicSpecification.characteristicValueSpecification)
-				&& Objects.equals(this.validFor, characteristicSpecification.validFor)
-				&& Objects.equals(this.baseType, characteristicSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, characteristicSpecification.baseType)
-				&& Objects.equals(this.type, characteristicSpecification.type)
-				&& Objects.equals(this._atValueSchemaLocation, characteristicSpecification._atValueSchemaLocation);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, configurable, description, extensible, isUnique, maxCardinality, minCardinality, name, regex, valueType, charSpecRelationship, characteristicValueSpecification, validFor, baseType, schemaLocation, type, _atValueSchemaLocation);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CharacteristicSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-		sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-		sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-		sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    charSpecRelationship: ").append(toIndentedString(charSpecRelationship)).append("\n");
-		sb.append("    characteristicValueSpecification: ").append(toIndentedString(characteristicValueSpecification))
-				.append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atValueSchemaLocation: ").append(toIndentedString(_atValueSchemaLocation)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public void updateWith(CharacteristicSpecification src) {
-		this.name = src.getName();
-		this.description = src.getDescription();
-		this.maxCardinality = src.getMaxCardinality();
-		this.minCardinality = src.getMinCardinality();
-		this.regex = src.getRegex();
-		this.isUnique = src.isUnique;
-		this.configurable = src.isConfigurable();
-		this.extensible = src.isExtensible();
-		this.valueType = src.valueType;
-
-		this.updateServiceSpecCharacteristicValues(src.getCharacteristicValueSpecification());
-		this.updateServiceSpecCharRelationships(src.getCharSpecRelationship());
-
-	}
-
-
-	private void updateServiceSpecCharacteristicValues(
-			@Valid Set<CharacteristicValueSpecification> srcSet) {
-		
-
-		Map<Integer, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (CharacteristicValueSpecification r : srcSet) {
-
-			boolean valueExists = false;
-			for (CharacteristicValueSpecification thisCharVal : this.characteristicValueSpecification ) {
-				if ( thisCharVal.hashCode() == r.hashCode() ) {
-					valueExists = true;
-					idAddedUpdated.put(thisCharVal.hashCode(), true);
-					break;
-				}
-			}
-			
-			if (!valueExists) {
-				CharacteristicValueSpecification nr = new CharacteristicValueSpecification( r );
-				this.addServiceSpecCharacteristicValueItem( nr );
-				idAddedUpdated.put( nr.hashCode(), true);
-			}
-			
-		}
-		
-		/**
-		 * remove those that don't exist anymore
-		 */
-		
-		List<CharacteristicValueSpecification> toRemove = new ArrayList<>();
-		for (CharacteristicValueSpecification ss : this.characteristicValueSpecification) {
-			if ( idAddedUpdated.get( ss.hashCode() ) == null ) {
-				toRemove.add(ss);
-			}
-		}
-		
-		for (CharacteristicValueSpecification r : toRemove) {
-			this.characteristicValueSpecification.remove(r);
-		}
-
-	}
-
-	private CharacteristicSpecification addServiceSpecCharacteristicValueItem(CharacteristicValueSpecification nr) {
-		if (this.characteristicValueSpecification == null) {
-			this.characteristicValueSpecification = new HashSet<CharacteristicValueSpecification>();
-		}
-		this.characteristicValueSpecification.add(nr);
-		return this;
-		
-	}
-	
-	
-
-
-	private void updateServiceSpecCharRelationships(
-			@Valid Set<CharacteristicSpecificationRelationship> srcSet) {
-		
-
-		Map< String, Boolean> idAddedUpdated = new HashMap<>();
-		/**
-		 * update, add the incomings
-		 */
-		for (CharacteristicSpecificationRelationship r : srcSet) {
-
-			boolean valueExists = false;
-			for (CharacteristicSpecificationRelationship thisCharVal : this.charSpecRelationship ) {
-				if ( (thisCharVal.getCharacteristicSpecificationId()!=null) && (thisCharVal.getCharacteristicSpecificationId().equals(r.getCharacteristicSpecificationId() ) )) {
-					valueExists = true;
-					idAddedUpdated.put( thisCharVal.getCharacteristicSpecificationId() , true);
-					break;
-				}
-			}
-			
-			if (!valueExists) {
-				this.charSpecRelationship.add( new CharacteristicSpecificationRelationship( r ));
-				idAddedUpdated.put( r.getCharacteristicSpecificationId(), true);
-			}
-			
-		}
-		
-		/**
-		 * remove those that don't exist anymore
-		 */
-		
-		List<CharacteristicSpecificationRelationship> toRemove = new ArrayList<>();
-		for (CharacteristicSpecificationRelationship ss : this.charSpecRelationship) {
-			if ( idAddedUpdated.get( ss.getCharacteristicSpecificationId() ) == null ) {
-				toRemove.add(ss);
-			}
-		}
-		
-		for (CharacteristicSpecificationRelationship r : toRemove) {
-			this.charSpecRelationship.remove(r);
-		}
-		
-	}
-
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationBase.java b/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationBase.java
deleted file mode 100644
index fcfd5ad3b6f46918c147a3616ecd5809933acd3d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationBase.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * This class defines a characteristic specification.
- */
-@Schema(description = "This class defines a characteristic specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class CharacteristicSpecificationBase   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("configurable")
-  private Boolean configurable = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("extensible")
-  private Boolean extensible = null;
-
-  @JsonProperty("isUnique")
-  private Boolean isUnique = null;
-
-  @JsonProperty("maxCardinality")
-  private Integer maxCardinality = null;
-
-  @JsonProperty("minCardinality")
-  private Integer minCardinality = null;
-
-  @JsonProperty("name")
-  private String name = null;
-
-  @JsonProperty("regex")
-  private String regex = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  @JsonProperty("@valueSchemaLocation")
-  private String _atValueSchemaLocation = null;
-
-  public CharacteristicSpecificationBase id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Unique ID for the characteristic
-   * @return id
-  **/
-  @Schema(description = "Unique ID for the characteristic")
-  
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public CharacteristicSpecificationBase configurable(Boolean configurable) {
-    this.configurable = configurable;
-    return this;
-  }
-
-  /**
-   * If true, the Boolean indicates that the target Characteristic is configurable
-   * @return configurable
-  **/
-  @Schema(description = "If true, the Boolean indicates that the target Characteristic is configurable")
-  
-    public Boolean isConfigurable() {
-    return configurable;
-  }
-
-  public void setConfigurable(Boolean configurable) {
-    this.configurable = configurable;
-  }
-
-  public CharacteristicSpecificationBase description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains the CharacteristicSpecification.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains the CharacteristicSpecification.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public CharacteristicSpecificationBase extensible(Boolean extensible) {
-    this.extensible = extensible;
-    return this;
-  }
-
-  /**
-   * An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a resource.
-   * @return extensible
-  **/
-  @Schema(description = "An indicator that specifies that the values for the characteristic can be extended by adding new values when instantiating a characteristic for a resource.")
-  
-    public Boolean isExtensible() {
-    return extensible;
-  }
-
-  public void setExtensible(Boolean extensible) {
-    this.extensible = extensible;
-  }
-
-  public CharacteristicSpecificationBase isUnique(Boolean isUnique) {
-    this.isUnique = isUnique;
-    return this;
-  }
-
-  /**
-   * An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"
-   * @return isUnique
-  **/
-  @Schema(description = "An indicator that specifies if a value is unique for the specification. Possible values are; \"unique while value is in effect\" and \"unique whether value is in effect or not\"")
-  
-    public Boolean isIsUnique() {
-    return isUnique;
-  }
-
-  public void setIsUnique(Boolean isUnique) {
-    this.isUnique = isUnique;
-  }
-
-  public CharacteristicSpecificationBase maxCardinality(Integer maxCardinality) {
-    this.maxCardinality = maxCardinality;
-    return this;
-  }
-
-  /**
-   * The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.
-   * @return maxCardinality
-  **/
-  @Schema(description = "The maximum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where five is the value for the maxCardinality.")
-  
-    public Integer getMaxCardinality() {
-    return maxCardinality;
-  }
-
-  public void setMaxCardinality(Integer maxCardinality) {
-    this.maxCardinality = maxCardinality;
-  }
-
-  public CharacteristicSpecificationBase minCardinality(Integer minCardinality) {
-    this.minCardinality = minCardinality;
-    return this;
-  }
-
-  /**
-   * The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.
-   * @return minCardinality
-  **/
-  @Schema(description = "The minimum number of instances a CharacteristicValue can take on. For example, zero to five phone numbers in a group calling plan, where zero is the value for the minCardinality.")
-  
-    public Integer getMinCardinality() {
-    return minCardinality;
-  }
-
-  public void setMinCardinality(Integer minCardinality) {
-    this.minCardinality = minCardinality;
-  }
-
-  public CharacteristicSpecificationBase name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which this characteristic specification is known and distinguished from other characteristic specifications.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which this characteristic specification is known and distinguished from other characteristic specifications.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public CharacteristicSpecificationBase regex(String regex) {
-    this.regex = regex;
-    return this;
-  }
-
-  /**
-   * A rule or principle represented in regular expression used to derive the value of a characteristic value.
-   * @return regex
-  **/
-  @Schema(description = "A rule or principle represented in regular expression used to derive the value of a characteristic value.")
-  
-    public String getRegex() {
-    return regex;
-  }
-
-  public void setRegex(String regex) {
-    this.regex = regex;
-  }
-
-  public CharacteristicSpecificationBase valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * A kind of value that the characteristic can take on, such as numeric, text and so forth
-   * @return valueType
-  **/
-  @Schema(description = "A kind of value that the characteristic can take on, such as numeric, text and so forth")
-  
-    public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public CharacteristicSpecificationBase validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CharacteristicSpecificationBase baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public CharacteristicSpecificationBase schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public CharacteristicSpecificationBase type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class Extensible name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-  public CharacteristicSpecificationBase _atValueSchemaLocation(String _atValueSchemaLocation) {
-    this._atValueSchemaLocation = _atValueSchemaLocation;
-    return this;
-  }
-
-  /**
-   * This (optional) field provides a link to the schema describing the value type.
-   * @return _atValueSchemaLocation
-  **/
-  @Schema(description = "This (optional) field provides a link to the schema describing the value type.")
-  
-    public String getAtValueSchemaLocation() {
-    return _atValueSchemaLocation;
-  }
-
-  public void setAtValueSchemaLocation(String _atValueSchemaLocation) {
-    this._atValueSchemaLocation = _atValueSchemaLocation;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CharacteristicSpecificationBase characteristicSpecificationBase = (CharacteristicSpecificationBase) o;
-    return Objects.equals(this.id, characteristicSpecificationBase.id) &&
-        Objects.equals(this.configurable, characteristicSpecificationBase.configurable) &&
-        Objects.equals(this.description, characteristicSpecificationBase.description) &&
-        Objects.equals(this.extensible, characteristicSpecificationBase.extensible) &&
-        Objects.equals(this.isUnique, characteristicSpecificationBase.isUnique) &&
-        Objects.equals(this.maxCardinality, characteristicSpecificationBase.maxCardinality) &&
-        Objects.equals(this.minCardinality, characteristicSpecificationBase.minCardinality) &&
-        Objects.equals(this.name, characteristicSpecificationBase.name) &&
-        Objects.equals(this.regex, characteristicSpecificationBase.regex) &&
-        Objects.equals(this.valueType, characteristicSpecificationBase.valueType) &&
-        Objects.equals(this.validFor, characteristicSpecificationBase.validFor) &&
-        Objects.equals(this.baseType, characteristicSpecificationBase.baseType) &&
-        Objects.equals(this.schemaLocation, characteristicSpecificationBase.schemaLocation) &&
-        Objects.equals(this.type, characteristicSpecificationBase.type) &&
-        Objects.equals(this._atValueSchemaLocation, characteristicSpecificationBase._atValueSchemaLocation);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, configurable, description, extensible, isUnique, maxCardinality, minCardinality, name, regex, valueType, validFor, baseType, schemaLocation, type, _atValueSchemaLocation);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CharacteristicSpecificationBase {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    configurable: ").append(toIndentedString(configurable)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    extensible: ").append(toIndentedString(extensible)).append("\n");
-    sb.append("    isUnique: ").append(toIndentedString(isUnique)).append("\n");
-    sb.append("    maxCardinality: ").append(toIndentedString(maxCardinality)).append("\n");
-    sb.append("    minCardinality: ").append(toIndentedString(minCardinality)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atValueSchemaLocation: ").append(toIndentedString(_atValueSchemaLocation)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationRelationship.java
deleted file mode 100644
index 982fc4b67f5b69b54a84e15e12d4ff191b150dab..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicSpecificationRelationship.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * An aggregation, migration, substitution, dependency or exclusivity
- * relationship between/among Characteristic specifications. The specification
- * characteristic is embedded within the specification whose ID and href are in
- * this entity, and identified by its ID.
- */
-@Schema(description = "An aggregation, migration, substitution, dependency or exclusivity relationship between/among Characteristic specifications. The specification characteristic is embedded within the specification whose ID and href are in this entity, and identified by its ID.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMCharacSpecRel")
-@Table(name = "STMCharacSpecRel")
-public class CharacteristicSpecificationRelationship extends BaseRootNamedEntity {
-	@JsonProperty("characteristicSpecificationId")
-	private String characteristicSpecificationId = null;
-
-	@JsonProperty("parentSpecificationHref")
-	private String parentSpecificationHref = null;
-
-	@JsonProperty("parentSpecificationId")
-	private String parentSpecificationId = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public CharacteristicSpecificationRelationship() {
-		
-	}
-	
-	
-	public CharacteristicSpecificationRelationship(CharacteristicSpecificationRelationship src) {
-		name = src.name;
-		relationshipType = src.relationshipType;
-		validFor = new TimePeriod(src.validFor);
-		characteristicSpecificationId = src.characteristicSpecificationId;
-	}
-
-	public CharacteristicSpecificationRelationship characteristicSpecificationId(String characteristicSpecificationId) {
-		this.characteristicSpecificationId = characteristicSpecificationId;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the characteristic within the specification
-	 * 
-	 * @return characteristicSpecificationId
-	 **/
-	@Schema(description = "Unique identifier of the characteristic within the specification")
-
-	public String getCharacteristicSpecificationId() {
-		return characteristicSpecificationId;
-	}
-
-	public void setCharacteristicSpecificationId(String characteristicSpecificationId) {
-		this.characteristicSpecificationId = characteristicSpecificationId;
-	}
-
-	public CharacteristicSpecificationRelationship parentSpecificationHref(String parentSpecificationHref) {
-		this.parentSpecificationHref = parentSpecificationHref;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference to the parent specification containing the target
-	 * characteristic
-	 * 
-	 * @return parentSpecificationHref
-	 **/
-	@Schema(description = "Hyperlink reference to the parent specification containing the target characteristic")
-
-	public String getParentSpecificationHref() {
-		return parentSpecificationHref;
-	}
-
-	public void setParentSpecificationHref(String parentSpecificationHref) {
-		this.parentSpecificationHref = parentSpecificationHref;
-	}
-
-	public CharacteristicSpecificationRelationship parentSpecificationId(String parentSpecificationId) {
-		this.parentSpecificationId = parentSpecificationId;
-		return this;
-	}
-
-	/**
-	 * Unique identifier of the parent specification containing the target
-	 * characteristic
-	 * 
-	 * @return parentSpecificationId
-	 **/
-	@Schema(description = "Unique identifier of the parent specification containing the target characteristic")
-
-	public String getParentSpecificationId() {
-		return parentSpecificationId;
-	}
-
-	public void setParentSpecificationId(String parentSpecificationId) {
-		this.parentSpecificationId = parentSpecificationId;
-	}
-
-	public CharacteristicSpecificationRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of relationship such as aggregation, migration, substitution,
-	 * dependency, exclusivity
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of relationship such as aggregation, migration, substitution, dependency, exclusivity")
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public CharacteristicSpecificationRelationship validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CharacteristicSpecificationRelationship characteristicSpecificationRelationship = (CharacteristicSpecificationRelationship) o;
-		return Objects.equals(this.characteristicSpecificationId,
-				characteristicSpecificationRelationship.characteristicSpecificationId)
-				&& Objects.equals(this.name, characteristicSpecificationRelationship.name)
-				&& Objects.equals(this.parentSpecificationHref,
-						characteristicSpecificationRelationship.parentSpecificationHref)
-				&& Objects.equals(this.parentSpecificationId,
-						characteristicSpecificationRelationship.parentSpecificationId)
-				&& Objects.equals(this.relationshipType, characteristicSpecificationRelationship.relationshipType)
-				&& Objects.equals(this.validFor, characteristicSpecificationRelationship.validFor);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(characteristicSpecificationId, name, parentSpecificationHref, parentSpecificationId,
-				relationshipType, validFor);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class CharacteristicSpecificationRelationship {\n");
-
-		sb.append("    characteristicSpecificationId: ").append(toIndentedString(characteristicSpecificationId))
-				.append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    parentSpecificationHref: ").append(toIndentedString(parentSpecificationHref)).append("\n");
-		sb.append("    parentSpecificationId: ").append(toIndentedString(parentSpecificationId)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicValueSpecification.java b/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicValueSpecification.java
deleted file mode 100644
index 1df4533038d347dc71e33c33391f752fcde8bcd2..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/CharacteristicValueSpecification.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.Any;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * specification of a value (number or text or an object) that can be assigned to a Characteristic.
- */
-@Schema(description = "specification of a value (number or text or an object) that can be assigned to a Characteristic.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMCharacValSpec")
-@Table(name = "STMCharacValSpec")
-public class CharacteristicValueSpecification  extends BaseRootEntity {
-  @JsonProperty("isDefault")
-  private Boolean isDefault = null;
-
-  @JsonProperty("rangeInterval")
-  private String rangeInterval = null;
-
-  @JsonProperty("regex")
-  private String regex = null;
-
-  @JsonProperty("unitOfMeasure")
-  private String unitOfMeasure = null;
-
-  @JsonProperty("valueFrom")
-  private Integer valueFrom = null;
-
-  @JsonProperty("valueTo")
-  private Integer valueTo = null;
-
-  @JsonProperty("valueType")
-  private String valueType = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-  @JsonProperty("value")
-  private Any value = null;
-
-  
-  public CharacteristicValueSpecification() {
-	  
-  }
-  
-  
-  public CharacteristicValueSpecification( CharacteristicValueSpecification r) {
-		this();
-		isDefault = r.isDefault;
-		rangeInterval = r.rangeInterval;
-		regex = r.regex;
-		unitOfMeasure = r.unitOfMeasure;
-		valueFrom = r.valueFrom;
-		valueTo = r.valueTo;
-		valueType = r.valueType;
-		validFor = new TimePeriod( r.validFor );
-		value = new Any( r.value ) ;
-//		type = r.type;
-		baseType = r.baseType;
-	  
-  }
-
-  public CharacteristicValueSpecification isDefault(Boolean isDefault) {
-    this.isDefault = isDefault;
-    return this;
-  }
-
-  /**
-   * If true, the Boolean Indicates if the value is the default value for a characteristic
-   * @return isDefault
-  **/
-  @Schema(description = "If true, the Boolean Indicates if the value is the default value for a characteristic")
-  
-    public Boolean isIsDefault() {
-    return isDefault;
-  }
-
-  public void setIsDefault(Boolean isDefault) {
-    this.isDefault = isDefault;
-  }
-
-  public CharacteristicValueSpecification rangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-    return this;
-  }
-
-  /**
-   * An indicator that specifies the inclusion or exclusion of the valueFrom and valueTo attributes. If applicable, possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".
-   * @return rangeInterval
-  **/
-  @Schema(description = "An indicator that specifies the inclusion or exclusion of the valueFrom and valueTo attributes. If applicable, possible values are \"open\", \"closed\", \"closedBottom\" and \"closedTop\".")
-  
-    public String getRangeInterval() {
-    return rangeInterval;
-  }
-
-  public void setRangeInterval(String rangeInterval) {
-    this.rangeInterval = rangeInterval;
-  }
-
-  public CharacteristicValueSpecification regex(String regex) {
-    this.regex = regex;
-    return this;
-  }
-
-  /**
-   * A regular expression constraint for given value
-   * @return regex
-  **/
-  @Schema(description = "A regular expression constraint for given value")
-  
-    public String getRegex() {
-    return regex;
-  }
-
-  public void setRegex(String regex) {
-    this.regex = regex;
-  }
-
-  public CharacteristicValueSpecification unitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-    return this;
-  }
-
-  /**
-   * A length, surface, volume, dry measure, liquid measure, money, weight, time, and the like. In general, a determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.
-   * @return unitOfMeasure
-  **/
-  @Schema(description = "A length, surface, volume, dry measure, liquid measure, money, weight, time, and the like. In general, a determinate quantity or magnitude of the kind designated, taken as a standard of comparison for others of the same kind, in assigning to them numerical values, as 1 foot, 1 yard, 1 mile, 1 square foot.")
-  
-    public String getUnitOfMeasure() {
-    return unitOfMeasure;
-  }
-
-  public void setUnitOfMeasure(String unitOfMeasure) {
-    this.unitOfMeasure = unitOfMeasure;
-  }
-
-  public CharacteristicValueSpecification valueFrom(Integer valueFrom) {
-    this.valueFrom = valueFrom;
-    return this;
-  }
-
-  /**
-   * The low range value that a characteristic can take on
-   * @return valueFrom
-  **/
-  @Schema(description = "The low range value that a characteristic can take on")
-  
-    public Integer getValueFrom() {
-    return valueFrom;
-  }
-
-  public void setValueFrom(Integer valueFrom) {
-    this.valueFrom = valueFrom;
-  }
-
-  public CharacteristicValueSpecification valueTo(Integer valueTo) {
-    this.valueTo = valueTo;
-    return this;
-  }
-
-  /**
-   * The upper range value that a characteristic can take on
-   * @return valueTo
-  **/
-  @Schema(description = "The upper range value that a characteristic can take on")
-  
-    public Integer getValueTo() {
-    return valueTo;
-  }
-
-  public void setValueTo(Integer valueTo) {
-    this.valueTo = valueTo;
-  }
-
-  public CharacteristicValueSpecification valueType(String valueType) {
-    this.valueType = valueType;
-    return this;
-  }
-
-  /**
-   * A kind of value that the characteristic value can take on, such as numeric, text and so forth
-   * @return valueType
-  **/
-  @Schema(description = "A kind of value that the characteristic value can take on, such as numeric, text and so forth")
-  
-    public String getValueType() {
-    return valueType;
-  }
-
-  public void setValueType(String valueType) {
-    this.valueType = valueType;
-  }
-
-  public CharacteristicValueSpecification validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-  public CharacteristicValueSpecification value(Any value) {
-    this.value = value;
-    return this;
-  }
-
-  /**
-   * Get value
-   * @return value
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public Any getValue() {
-    return value;
-  }
-
-  public void setValue(Any value) {
-    this.value = value;
-  }
-
-  
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CharacteristicValueSpecification characteristicValueSpecification = (CharacteristicValueSpecification) o;
-    return Objects.equals(this.isDefault, characteristicValueSpecification.isDefault) &&
-        Objects.equals(this.rangeInterval, characteristicValueSpecification.rangeInterval) &&
-        Objects.equals(this.regex, characteristicValueSpecification.regex) &&
-        Objects.equals(this.unitOfMeasure, characteristicValueSpecification.unitOfMeasure) &&
-        Objects.equals(this.valueFrom, characteristicValueSpecification.valueFrom) &&
-        Objects.equals(this.valueTo, characteristicValueSpecification.valueTo) &&
-        Objects.equals(this.valueType, characteristicValueSpecification.valueType) &&
-        Objects.equals(this.validFor, characteristicValueSpecification.validFor) &&
-        Objects.equals(this.value, characteristicValueSpecification.value) &&
-        Objects.equals(this.baseType, characteristicValueSpecification.baseType) &&
-        Objects.equals(this.schemaLocation, characteristicValueSpecification.schemaLocation) &&
-        Objects.equals(this.type, characteristicValueSpecification.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(isDefault, rangeInterval, regex, unitOfMeasure, valueFrom, valueTo, valueType, validFor, value, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CharacteristicValueSpecification {\n");
-    
-    sb.append("    isDefault: ").append(toIndentedString(isDefault)).append("\n");
-    sb.append("    rangeInterval: ").append(toIndentedString(rangeInterval)).append("\n");
-    sb.append("    regex: ").append(toIndentedString(regex)).append("\n");
-    sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-    sb.append("    valueFrom: ").append(toIndentedString(valueFrom)).append("\n");
-    sb.append("    valueTo: ").append(toIndentedString(valueTo)).append("\n");
-    sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    value: ").append(toIndentedString(value)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ConstraintRef.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ConstraintRef.java
deleted file mode 100644
index 7aea328c03a25cab9c235f2e98c3f56976cab489..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ConstraintRef.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.
- */
-@Schema(description = "Constraint reference. The Constraint resource represents a policy/rule applied to an entity or entity spec.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMConstraintRef")
-@Table(name = "STMConstraintRef")
-public class ConstraintRef  extends BaseRootNamedEntity  {
-  @JsonProperty("id")
-  private String id = null;
-
-  
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-
-
-  @JsonProperty("version")
-  private String version = null;
-
-
-
-/**
-   * reference id to the target constraint
-   * @return id
-  **/
-  @Schema(description = "reference id to the target constraint")
-      @NotNull
-  	/**
-  	 * @return the id
-  	 */
-  	public String getId() {
-  		if ( uuid != null ) {
-  			id = uuid;			
-  		} 
-  		return id;
-  	}
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public ConstraintRef href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference to the target constraint
-   * @return href
-  **/
-  @Schema(description = "Hyperlink reference to the target constraint")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ConstraintRef name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name given to the constraint
-   * @return name
-  **/
-  @Schema(description = "Name given to the constraint")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-
-  public ConstraintRef _atReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-    return this;
-  }
-
-  /**
-   * The (class) type of the referred constraint
-   * @return _atReferredType
-  **/
-  @Schema(description = "The (class) type of the referred constraint")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-  /**
- * @return the version
- */
-public String getVersion() {
-	return version;
-}
-
-/**
- * @param version the version to set
- */
-public void setVersion(String version) {
-	this.version = version;
-}
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ConstraintRef constraintRef = (ConstraintRef) o;
-    return Objects.equals(this.id, constraintRef.id) &&
-        Objects.equals(this.href, constraintRef.href) &&
-        Objects.equals(this.name, constraintRef.name) &&
-        Objects.equals(this.version, constraintRef.version) &&
-        Objects.equals(this.baseType, constraintRef.baseType) &&
-        Objects.equals(this.schemaLocation, constraintRef.schemaLocation) &&
-        Objects.equals(this.type, constraintRef.type) &&
-        Objects.equals(this._atReferredType, constraintRef._atReferredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, version, baseType, schemaLocation, type, _atReferredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ConstraintRef {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/Duration.java b/src/main/java/org/etsi/osl/tmf/stm653/model/Duration.java
deleted file mode 100644
index f5e3c134000ae50da3a67b2ed9d54238ddeda8e0..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/Duration.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Embeddable;
-
-/**
- * A time interval in a given unit of time
- */
-@Schema(description = "A time interval in a given unit of time")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Embeddable
-public class Duration   extends BaseRootEntity {
-  @JsonProperty("amount")
-  private Integer amount = null;
-
-  @JsonProperty("units")
-  private String units = null;
-
-  public Duration amount(Integer amount) {
-    this.amount = amount;
-    return this;
-  }
-
-  /**
-   * Time interval (number of seconds, minutes, hours, etc.)
-   * @return amount
-  **/
-  @Schema(description = "Time interval (number of seconds, minutes, hours, etc.)")
-  
-    public Integer getAmount() {
-    return amount;
-  }
-
-  public void setAmount(Integer amount) {
-    this.amount = amount;
-  }
-
-  public Duration units(String units) {
-    this.units = units;
-    return this;
-  }
-
-  /**
-   * Unit of time (seconds, minutes, hours, etc.)
-   * @return units
-  **/
-  @Schema(description = "Unit of time (seconds, minutes, hours, etc.)")
-  
-    public String getUnits() {
-    return units;
-  }
-
-  public void setUnits(String units) {
-    this.units = units;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Duration duration = (Duration) o;
-    return Objects.equals(this.amount, duration.amount) &&
-        Objects.equals(this.units, duration.units);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(amount, units);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Duration {\n");
-    
-    sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
-    sb.append("    units: ").append(toIndentedString(units)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/EntityRef.java b/src/main/java/org/etsi/osl/tmf/stm653/model/EntityRef.java
deleted file mode 100644
index 467d5a1cba0ece6050b8f73e061d946c44d6d38b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/EntityRef.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * Entity reference schema to be use for all entityRef class.
- */
-@Schema(description = "Entity reference schema to be use for all entityRef class.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMEntityRef")
-@Table(name = "STMEntityRef")
-public class EntityRef extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public EntityRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EntityRef entityRef = (EntityRef) o;
-		return Objects.equals(this.id, entityRef.id) && Objects.equals(this.href, entityRef.href)
-				&& Objects.equals(this.name, entityRef.name)
-				&& Objects.equals(this.baseType, entityRef.baseType)
-				&& Objects.equals(this.schemaLocation, entityRef.schemaLocation)
-				&& Objects.equals(this.type, entityRef.type)
-				&& Objects.equals(this._atReferredType, entityRef._atReferredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, baseType, schemaLocation, type, _atReferredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class EntityRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecification.java b/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecification.java
deleted file mode 100644
index f67a4df8bf3bd482e84a17cdc60ee42e43ea5712..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecification.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * EntitySpecification is a class that offers characteristics to describe a type
- * of entity. Entities are generic constructs that may be used to describe
- * bespoke business entities that are not effectively covered by the existing
- * SID model. Functionally, the entity specification acts as a template by which
- * entities may be instantiated and described. By sharing the same
- * specification, these entities would therefore share the same set of
- * characteristics. Note: The ‘configurable’ attribute on the
- * specCharacteristics determines if an entity instantiated from the entity
- * specification can override the value of the attribute. When set to false, the
- * entity instance may not define a value that differs from the value in the
- * specification.
- */
-@Schema(description = "EntitySpecification is a class that offers characteristics to describe a type of entity. Entities are generic constructs that may be used to describe bespoke business entities that are not effectively covered by the existing SID model. Functionally, the entity specification acts as a template by which entities may be instantiated and described. By sharing the same specification, these entities would therefore share the same set of characteristics. Note: The ‘configurable’ attribute on the specCharacteristics determines if an entity instantiated from the entity specification can override the value of the attribute. When set to false, the entity instance may not define a value that differs from the value in the specification.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMEntitySpecification")
-@Table(name = "STMEntitySpecification")
-public class EntitySpecification extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AttachmentRefOrValue> attachment = new HashSet<>();
-
-	@JsonProperty("constraint")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConstraintRef> constraint = new HashSet<>();
-
-	@JsonProperty("entitySpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<EntitySpecificationRelationship> entitySpecRelationship = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("specCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicSpecification> specCharacteristic = new HashSet<>();
-
-	@JsonProperty("targetEntitySchema")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private TargetEntitySchema targetEntitySchema = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public EntitySpecification href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public EntitySpecification description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of this REST resource
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of this REST resource")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public EntitySpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether an EntitySpecification represents a single
-	 * EntitySpecification (false), or a bundle of EntitySpecifications (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether an EntitySpecification represents a single EntitySpecification (false), or a bundle of EntitySpecifications (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public EntitySpecification lastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-		return this;
-	}
-
-	/**
-	 * Date and time of the last update of this REST resource
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update of this REST resource")
-
-	@Valid
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public EntitySpecification lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of this catalog item
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of this catalog item")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public EntitySpecification name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public EntitySpecification version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Entity specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Entity specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public EntitySpecification attachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public EntitySpecification addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Attachments that may be of relevance to this specification, such as picture,
-	 * document, media
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Attachments that may be of relevance to this specification, such as picture, document, media")
-	@Valid
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public EntitySpecification constraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public EntitySpecification addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new HashSet<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of constraint references applied to this specification
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "This is a list of constraint references applied to this specification")
-	@Valid
-	public Set<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public EntitySpecification entitySpecRelationship(Set<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-		return this;
-	}
-
-	public EntitySpecification addEntitySpecRelationshipItem(
-			EntitySpecificationRelationship entitySpecRelationshipItem) {
-		if (this.entitySpecRelationship == null) {
-			this.entitySpecRelationship = new HashSet<>();
-		}
-		this.entitySpecRelationship.add(entitySpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Relationship to another entity specification, might be dependency,
-	 * substitution, etc.
-	 * 
-	 * @return entitySpecRelationship
-	 **/
-	@Schema(description = "Relationship to another entity specification, might be dependency, substitution, etc.")
-	@Valid
-	public Set<EntitySpecificationRelationship> getEntitySpecRelationship() {
-		return entitySpecRelationship;
-	}
-
-	public void setEntitySpecRelationship(Set<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-	}
-
-	public EntitySpecification relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public EntitySpecification addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Parties who manage or otherwise have an interest in this entity specification
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "Parties who manage or otherwise have an interest in this entity specification")
-	@Valid
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public EntitySpecification specCharacteristic(Set<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-		return this;
-	}
-
-	public EntitySpecification addSpecCharacteristicItem(CharacteristicSpecification specCharacteristicItem) {
-		if (this.specCharacteristic == null) {
-			this.specCharacteristic = new HashSet<>();
-		}
-		this.specCharacteristic.add(specCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * List of characteristics that the entity can take
-	 * 
-	 * @return specCharacteristic
-	 **/
-	@Schema(description = "List of characteristics that the entity can take")
-	@Valid
-	public Set<CharacteristicSpecification> getSpecCharacteristic() {
-		return specCharacteristic;
-	}
-
-	public void setSpecCharacteristic(Set<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-	}
-
-	public EntitySpecification targetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-		return this;
-	}
-
-	/**
-	 * Get targetEntitySchema
-	 * 
-	 * @return targetEntitySchema
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TargetEntitySchema getTargetEntitySchema() {
-		return targetEntitySchema;
-	}
-
-	public void setTargetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-	}
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EntitySpecification entitySpecification = (EntitySpecification) o;
-		return Objects.equals(this.id, entitySpecification.id) && Objects.equals(this.href, entitySpecification.href)
-				&& Objects.equals(this.description, entitySpecification.description)
-				&& Objects.equals(this.isBundle, entitySpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, entitySpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, entitySpecification.lifecycleStatus)
-				&& Objects.equals(this.name, entitySpecification.name)
-				&& Objects.equals(this.version, entitySpecification.version)
-				&& Objects.equals(this.attachment, entitySpecification.attachment)
-				&& Objects.equals(this.constraint, entitySpecification.constraint)
-				&& Objects.equals(this.entitySpecRelationship, entitySpecification.entitySpecRelationship)
-				&& Objects.equals(this.relatedParty, entitySpecification.relatedParty)
-				&& Objects.equals(this.specCharacteristic, entitySpecification.specCharacteristic)
-				&& Objects.equals(this.targetEntitySchema, entitySpecification.targetEntitySchema)
-				&& Objects.equals(this.validFor, entitySpecification.validFor)
-				&& Objects.equals(this.baseType, entitySpecification.baseType)
-				&& Objects.equals(this.schemaLocation, entitySpecification.schemaLocation)
-				&& Objects.equals(this.type, entitySpecification.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment, constraint, entitySpecRelationship, relatedParty, specCharacteristic, targetEntitySchema, validFor, _atBaseType, _atSchemaLocation, _atType);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class EntitySpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    entitySpecRelationship: ").append(toIndentedString(entitySpecRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-		sb.append("    targetEntitySchema: ").append(toIndentedString(targetEntitySchema)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    _atBaseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    _atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    _atType: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecificationRelationship.java b/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecificationRelationship.java
deleted file mode 100644
index 2aa1a488fd709868c2c2ad673e998fc85064d20f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/EntitySpecificationRelationship.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A migration, substitution, dependency or exclusivity relationship
- * between/among entity specifications.
- */
-@Schema(description = "A migration, substitution, dependency or exclusivity relationship between/among entity specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMEntitySpecRel")
-@Table(name = "STMEntitySpecRel")
-public class EntitySpecificationRelationship extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("relationshipType")
-	private String relationshipType = null;
-
-	@JsonProperty("role")
-	private String role = null;
-
-	@JsonProperty("associationSpec")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private AssociationSpecificationRef associationSpec = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-	public EntitySpecificationRelationship id(String id) {
-		this.id = id;
-		return this;
-	}
-
-	/**
-	 * unique identifier
-	 * 
-	 * @return id
-	 **/
-	@Schema(description = "unique identifier")
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public EntitySpecificationRelationship href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public EntitySpecificationRelationship name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name of the related entity.
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name of the related entity.")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public EntitySpecificationRelationship relationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-		return this;
-	}
-
-	/**
-	 * Type of relationship such as migration, substitution, dependency, exclusivity
-	 * 
-	 * @return relationshipType
-	 **/
-	@Schema(description = "Type of relationship such as migration, substitution, dependency, exclusivity")
-	@NotNull
-
-	public String getRelationshipType() {
-		return relationshipType;
-	}
-
-	public void setRelationshipType(String relationshipType) {
-		this.relationshipType = relationshipType;
-	}
-
-	public EntitySpecificationRelationship role(String role) {
-		this.role = role;
-		return this;
-	}
-
-	/**
-	 * The association role for this entity specification
-	 * 
-	 * @return role
-	 **/
-	@Schema(description = "The association role for this entity specification")
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public EntitySpecificationRelationship associationSpec(AssociationSpecificationRef associationSpec) {
-		this.associationSpec = associationSpec;
-		return this;
-	}
-
-	/**
-	 * Get associationSpec
-	 * 
-	 * @return associationSpec
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public AssociationSpecificationRef getAssociationSpec() {
-		return associationSpec;
-	}
-
-	public void setAssociationSpec(AssociationSpecificationRef associationSpec) {
-		this.associationSpec = associationSpec;
-	}
-
-
-	
-
-	public EntitySpecificationRelationship _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EntitySpecificationRelationship entitySpecificationRelationship = (EntitySpecificationRelationship) o;
-		return Objects.equals(this.id, entitySpecificationRelationship.id)
-				&& Objects.equals(this.href, entitySpecificationRelationship.href)
-				&& Objects.equals(this.name, entitySpecificationRelationship.name)
-				&& Objects.equals(this.relationshipType, entitySpecificationRelationship.relationshipType)
-				&& Objects.equals(this.role, entitySpecificationRelationship.role)
-				&& Objects.equals(this.associationSpec, entitySpecificationRelationship.associationSpec)
-				&& Objects.equals(this.validFor, entitySpecificationRelationship.validFor)
-				&& Objects.equals(this.baseType, entitySpecificationRelationship.baseType)
-				&& Objects.equals(this.schemaLocation, entitySpecificationRelationship.schemaLocation)
-				&& Objects.equals(this.type, entitySpecificationRelationship.type)
-				&& Objects.equals(this._atReferredType, entitySpecificationRelationship._atReferredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, name, relationshipType, role, associationSpec, validFor, baseType,
-//				schemaLocation, type, _atReferredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class EntitySpecificationRelationship {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-		sb.append("    role: ").append(toIndentedString(role)).append("\n");
-		sb.append("    associationSpec: ").append(toIndentedString(associationSpec)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/Error.java b/src/main/java/org/etsi/osl/tmf/stm653/model/Error.java
deleted file mode 100644
index 73d56a5c937a559593704a741b3c2357a768ff9c..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/Error.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)
- */
-@Schema(description = "Used when an API throws an Error, typically with a HTTP error response-code (3xx, 4xx, 5xx)")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class Error   {
-  @JsonProperty("code")
-  private String code = null;
-
-  @JsonProperty("reason")
-  private String reason = null;
-
-  @JsonProperty("message")
-  private String message = null;
-
-  @JsonProperty("status")
-  private String status = null;
-
-  @JsonProperty("referenceError")
-  private String referenceError = null;
-
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Error code(String code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Application relevant detail, defined in the API or a common list.
-   * @return code
-  **/
-  @Schema(description = "Application relevant detail, defined in the API or a common list.")
-      @NotNull
-
-    public String getCode() {
-    return code;
-  }
-
-  public void setCode(String code) {
-    this.code = code;
-  }
-
-  public Error reason(String reason) {
-    this.reason = reason;
-    return this;
-  }
-
-  /**
-   * Explanation of the reason for the error which can be shown to a client user.
-   * @return reason
-  **/
-  @Schema(description = "Explanation of the reason for the error which can be shown to a client user.")
-      @NotNull
-
-    public String getReason() {
-    return reason;
-  }
-
-  public void setReason(String reason) {
-    this.reason = reason;
-  }
-
-  public Error message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * More details and corrective actions related to the error which can be shown to a client user.
-   * @return message
-  **/
-  @Schema(description = "More details and corrective actions related to the error which can be shown to a client user.")
-  
-    public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-  public Error status(String status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * HTTP Error code extension
-   * @return status
-  **/
-  @Schema(description = "HTTP Error code extension")
-  
-    public String getStatus() {
-    return status;
-  }
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-  public Error referenceError(String referenceError) {
-    this.referenceError = referenceError;
-    return this;
-  }
-
-  /**
-   * URI of documentation describing the error.
-   * @return referenceError
-  **/
-  @Schema(description = "URI of documentation describing the error.")
-  
-    public String getReferenceError() {
-    return referenceError;
-  }
-
-  public void setReferenceError(String referenceError) {
-    this.referenceError = referenceError;
-  }
-
-  public Error baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class.
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class.")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Error schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Error type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class entity name.
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class entity name.")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Error error = (Error) o;
-    return Objects.equals(this.code, error.code) &&
-        Objects.equals(this.reason, error.reason) &&
-        Objects.equals(this.message, error.message) &&
-        Objects.equals(this.status, error.status) &&
-        Objects.equals(this.referenceError, error.referenceError) &&
-        Objects.equals(this.baseType, error.baseType) &&
-        Objects.equals(this.schemaLocation, error.schemaLocation) &&
-        Objects.equals(this.type, error.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, reason, message, status, referenceError, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Error {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    reason: ").append(toIndentedString(reason)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    referenceError: ").append(toIndentedString(referenceError)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscription.java b/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscription.java
deleted file mode 100644
index fcf954f7ae66eecdf513c857132cbc52c2a816eb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscription.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class EventSubscription   {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscription id(String id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Id of the listener
-   * @return id
-  **/
-  @Schema(description = "Id of the listener")
-      @NotNull
-
-    public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public EventSubscription callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscription query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscription eventSubscription = (EventSubscription) o;
-    return Objects.equals(this.id, eventSubscription.id) &&
-        Objects.equals(this.callback, eventSubscription.callback) &&
-        Objects.equals(this.query, eventSubscription.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscription {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscriptionInput.java b/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscriptionInput.java
deleted file mode 100644
index 06f788ec030df4dd5512e24518f28502ed036f5e..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/EventSubscriptionInput.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * Sets the communication endpoint address the service instance must use to deliver notification information
- */
-@Schema(description = "Sets the communication endpoint address the service instance must use to deliver notification information")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class EventSubscriptionInput   {
-  @JsonProperty("callback")
-  private String callback = null;
-
-  @JsonProperty("query")
-  private String query = null;
-
-  public EventSubscriptionInput callback(String callback) {
-    this.callback = callback;
-    return this;
-  }
-
-  /**
-   * The callback being registered.
-   * @return callback
-  **/
-  @Schema(description = "The callback being registered.")
-      @NotNull
-
-    public String getCallback() {
-    return callback;
-  }
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-  public EventSubscriptionInput query(String query) {
-    this.query = query;
-    return this;
-  }
-
-  /**
-   * additional data to be passed
-   * @return query
-  **/
-  @Schema(description = "additional data to be passed")
-  
-    public String getQuery() {
-    return query;
-  }
-
-  public void setQuery(String query) {
-    this.query = query;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EventSubscriptionInput eventSubscriptionInput = (EventSubscriptionInput) o;
-    return Objects.equals(this.callback, eventSubscriptionInput.callback) &&
-        Objects.equals(this.query, eventSubscriptionInput.query);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(callback, query);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EventSubscriptionInput {\n");
-    
-    sb.append("    callback: ").append(toIndentedString(callback)).append("\n");
-    sb.append("    query: ").append(toIndentedString(query)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/Extensible.java b/src/main/java/org/etsi/osl/tmf/stm653/model/Extensible.java
deleted file mode 100644
index 9e4d5edb8cd401bb10cb9e10a5b946890beaf985..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/Extensible.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * Base Extensible schema for use in TMForum Open-APIs
- */
-@Schema(description = "Base Extensible schema for use in TMForum Open-APIs")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class Extensible   {
-  @JsonProperty("@baseType")
-  private String baseType = null;
-
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public Extensible baseType(String baseType) {
-    this.baseType = baseType;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the super-class
-   * @return baseType
-  **/
-  @Schema(description = "When sub-classing, this defines the super-class")
-  
-    public String getAtBaseType() {
-    return baseType;
-  }
-
-  public void setAtBaseType(String baseType) {
-    this.baseType = baseType;
-  }
-
-  public Extensible schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * A URI to a JSON-Schema file that defines additional attributes and relationships
-   * @return schemaLocation
-  **/
-  @Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-  
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public Extensible type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * When sub-classing, this defines the sub-class Extensible name
-   * @return type
-  **/
-  @Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-  
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Extensible extensible = (Extensible) o;
-    return Objects.equals(this.baseType, extensible.baseType) &&
-        Objects.equals(this.schemaLocation, extensible.schemaLocation) &&
-        Objects.equals(this.type, extensible.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Extensible {\n");
-    
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/MeasureThresholdRuleViolation.java b/src/main/java/org/etsi/osl/tmf/stm653/model/MeasureThresholdRuleViolation.java
deleted file mode 100644
index b74c02cdc62a2be3444a3030f03213afb1bedc8f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/MeasureThresholdRuleViolation.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A measureThresholdRuleViolation is a violation of a rule that defines the in
- * the MericDefMeasureThresholdRule.
- */
-@Schema(description = "A measureThresholdRuleViolation is a violation of a rule that defines the in the  MericDefMeasureThresholdRule.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMMeasureThresholdRuleViolation")
-@Table(name = "STMMeasureThresholdRuleViolation")
-public class MeasureThresholdRuleViolation extends BaseRootNamedEntity {
-
-	@JsonProperty("conformanceComparatorLower")
-	private String conformanceComparatorLower = null;
-
-	@JsonProperty("conformanceComparatorUpper")
-	private String conformanceComparatorUpper = null;
-
-	@JsonProperty("conformanceTargetExact")
-	private String conformanceTargetExact = null;
-
-	@JsonProperty("conformanceTargetLower")
-	private String conformanceTargetLower = null;
-
-	@JsonProperty("conformanceTargetUpper")
-	private String conformanceTargetUpper = null;
-
-	@Lob
-	@Column(name = "LDESCRIPTION", columnDefinition = "LONGTEXT")
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("numberOfAllowedCrossing")
-	private Integer numberOfAllowedCrossing = null;
-
-	@JsonProperty("thresholdRuleSeverity")
-	private String thresholdRuleSeverity = null;
-
-	@JsonProperty("appliedConsequence")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AppliedConsequence> appliedConsequence = new HashSet<>();
-
-	@JsonProperty("tolerancePeriod")
-	private Duration tolerancePeriod = null;
-
-	public MeasureThresholdRuleViolation conformanceComparatorLower(String conformanceComparatorLower) {
-		this.conformanceComparatorLower = conformanceComparatorLower;
-		return this;
-	}
-
-	/**
-	 * An operator that when applied on a value specifies whether a threshold is
-	 * crossed or ceased to be crossed. This operator is used to compare with the
-	 * conformanceTargetLower.
-	 * 
-	 * @return conformanceComparatorLower
-	 **/
-	@Schema(description = "An operator that when applied on a value specifies whether a  threshold is crossed or ceased to be crossed. This operator is used to compare with the conformanceTargetLower.")
-
-	public String getConformanceComparatorLower() {
-		return conformanceComparatorLower;
-	}
-
-	public void setConformanceComparatorLower(String conformanceComparatorLower) {
-		this.conformanceComparatorLower = conformanceComparatorLower;
-	}
-
-	public MeasureThresholdRuleViolation conformanceComparatorUpper(String conformanceComparatorUpper) {
-		this.conformanceComparatorUpper = conformanceComparatorUpper;
-		return this;
-	}
-
-	/**
-	 * An operator that when applied on a value specifies whether a threshold is
-	 * crossed or ceased to be crossed. This operator is used to compare with the
-	 * conformanceTargetUpper.
-	 * 
-	 * @return conformanceComparatorUpper
-	 **/
-	@Schema(description = "An operator that when applied on a value specifies whether a  threshold is crossed or ceased to be crossed. This operator is used to compare with the conformanceTargetUpper.")
-
-	public String getConformanceComparatorUpper() {
-		return conformanceComparatorUpper;
-	}
-
-	public void setConformanceComparatorUpper(String conformanceComparatorUpper) {
-		this.conformanceComparatorUpper = conformanceComparatorUpper;
-	}
-
-	public MeasureThresholdRuleViolation conformanceTargetExact(String conformanceTargetExact) {
-		this.conformanceTargetExact = conformanceTargetExact;
-		return this;
-	}
-
-	/**
-	 * to cater for values that are not numerical test metrics (e.g. a DSL line can
-	 * be Synchronised or Unsynchronised. If the latter, the test should result in a
-	 * rule violation).The allowed value can contain a REGEX string.
-	 * 
-	 * @return conformanceTargetExact
-	 **/
-	@Schema(description = "to cater for values that are not numerical test metrics (e.g. a DSL line can be Synchronised or Unsynchronised. If the latter, the test should result in a rule violation).The allowed value can contain a REGEX string.")
-
-	public String getConformanceTargetExact() {
-		return conformanceTargetExact;
-	}
-
-	public void setConformanceTargetExact(String conformanceTargetExact) {
-		this.conformanceTargetExact = conformanceTargetExact;
-	}
-
-	public MeasureThresholdRuleViolation conformanceTargetLower(String conformanceTargetLower) {
-		this.conformanceTargetLower = conformanceTargetLower;
-		return this;
-	}
-
-	/**
-	 * A value used to determine if the threshold is crossed or ceases to be
-	 * crossed. It represents the lower limit. The value should be less than the
-	 * conformanceTargetUpper. The conformance comparators should also be logically
-	 * defined so as to not lead to a logically impossible condition.
-	 * 
-	 * @return conformanceTargetLower
-	 **/
-	@Schema(description = "A value used to determine if the threshold is crossed or ceases  to be crossed. It represents the lower limit. The value should be less than the conformanceTargetUpper. The conformance comparators should also be logically defined so as to not lead to a logically impossible condition.")
-
-	public String getConformanceTargetLower() {
-		return conformanceTargetLower;
-	}
-
-	public void setConformanceTargetLower(String conformanceTargetLower) {
-		this.conformanceTargetLower = conformanceTargetLower;
-	}
-
-	public MeasureThresholdRuleViolation conformanceTargetUpper(String conformanceTargetUpper) {
-		this.conformanceTargetUpper = conformanceTargetUpper;
-		return this;
-	}
-
-	/**
-	 * A value used to determine if the threshold is crossed or ceases to be
-	 * crossed. It represents the Upper limit. The value should be greater than the
-	 * conformanceTargetLower. The conformance comparators should also be logically
-	 * defined so as to not lead to a logically impossible condition.
-	 * 
-	 * @return conformanceTargetUpper
-	 **/
-	@Schema(description = "A value used to determine if the threshold is crossed or ceases  to be crossed. It represents the Upper limit. The value should be greater than the conformanceTargetLower. The conformance comparators should also be logically defined so as to not lead to a logically impossible condition.")
-
-	public String getConformanceTargetUpper() {
-		return conformanceTargetUpper;
-	}
-
-	public void setConformanceTargetUpper(String conformanceTargetUpper) {
-		this.conformanceTargetUpper = conformanceTargetUpper;
-	}
-
-	public MeasureThresholdRuleViolation description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description for the MetricDefMeasureThresholdRule .
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description for the MetricDefMeasureThresholdRule .")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public MeasureThresholdRuleViolation name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name for the MetricDefMeasureThresholdRule .
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name for the MetricDefMeasureThresholdRule .")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public MeasureThresholdRuleViolation numberOfAllowedCrossing(Integer numberOfAllowedCrossing) {
-		this.numberOfAllowedCrossing = numberOfAllowedCrossing;
-		return this;
-	}
-
-	/**
-	 * The number of allowed crossing occurrences in reference to the
-	 * tolerancePeriod without a consequence being initiated.
-	 * 
-	 * @return numberOfAllowedCrossing
-	 **/
-	@Schema(description = "The number of allowed crossing occurrences in reference to the  tolerancePeriod without a consequence being initiated.")
-
-	public Integer getNumberOfAllowedCrossing() {
-		return numberOfAllowedCrossing;
-	}
-
-	public void setNumberOfAllowedCrossing(Integer numberOfAllowedCrossing) {
-		this.numberOfAllowedCrossing = numberOfAllowedCrossing;
-	}
-
-	public MeasureThresholdRuleViolation thresholdRuleSeverity(String thresholdRuleSeverity) {
-		this.thresholdRuleSeverity = thresholdRuleSeverity;
-		return this;
-	}
-
-	/**
-	 * A threshold can be generated in different severity levels. A crossing for
-	 * each level may require a different condition and possibly trigger a different
-	 * consequence.
-	 * 
-	 * @return thresholdRuleSeverity
-	 **/
-	@Schema(description = "A threshold can be generated in different severity levels. A  crossing for each level may require a different condition and possibly trigger a different consequence.")
-
-	public String getThresholdRuleSeverity() {
-		return thresholdRuleSeverity;
-	}
-
-	public void setThresholdRuleSeverity(String thresholdRuleSeverity) {
-		this.thresholdRuleSeverity = thresholdRuleSeverity;
-	}
-
-	public MeasureThresholdRuleViolation appliedConsequence( Set<AppliedConsequence> appliedConsequence) {
-		this.appliedConsequence = appliedConsequence;
-		return this;
-	}
-
-	public MeasureThresholdRuleViolation addAppliedConsequenceItem(AppliedConsequence appliedConsequenceItem) {
-		if (this.appliedConsequence == null) {
-			this.appliedConsequence = new HashSet<>();
-		}
-		this.appliedConsequence.add(appliedConsequenceItem);
-		return this;
-	}
-
-	/**
-	 * An Applied Consequence defines the action (prescribed action or notification)
-	 * to take when a MeasureThresholdRuleViolation occurs.
-	 * 
-	 * @return appliedConsequence
-	 **/
-	@Schema(description = "An Applied Consequence defines the action (prescribed action or notification) to take when a MeasureThresholdRuleViolation occurs.")
-	@Valid
-	public Set<AppliedConsequence> getAppliedConsequence() {
-		return appliedConsequence;
-	}
-
-	public void setAppliedConsequence(Set<AppliedConsequence> appliedConsequence) {
-		this.appliedConsequence = appliedConsequence;
-	}
-
-	public MeasureThresholdRuleViolation tolerancePeriod(Duration tolerancePeriod) {
-		this.tolerancePeriod = tolerancePeriod;
-		return this;
-	}
-
-	/**
-	 * Get tolerancePeriod
-	 * 
-	 * @return tolerancePeriod
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Duration getTolerancePeriod() {
-		return tolerancePeriod;
-	}
-
-	public void setTolerancePeriod(Duration tolerancePeriod) {
-		this.tolerancePeriod = tolerancePeriod;
-	}
-
-	
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		MeasureThresholdRuleViolation measureThresholdRuleViolation = (MeasureThresholdRuleViolation) o;
-		return Objects.equals(this.conformanceComparatorLower, measureThresholdRuleViolation.conformanceComparatorLower)
-				&& Objects.equals(this.conformanceComparatorUpper,
-						measureThresholdRuleViolation.conformanceComparatorUpper)
-				&& Objects.equals(this.conformanceTargetExact, measureThresholdRuleViolation.conformanceTargetExact)
-				&& Objects.equals(this.conformanceTargetLower, measureThresholdRuleViolation.conformanceTargetLower)
-				&& Objects.equals(this.conformanceTargetUpper, measureThresholdRuleViolation.conformanceTargetUpper)
-				&& Objects.equals(this.description, measureThresholdRuleViolation.description)
-				&& Objects.equals(this.name, measureThresholdRuleViolation.name)
-				&& Objects.equals(this.numberOfAllowedCrossing, measureThresholdRuleViolation.numberOfAllowedCrossing)
-				&& Objects.equals(this.thresholdRuleSeverity, measureThresholdRuleViolation.thresholdRuleSeverity)
-				&& Objects.equals(this.appliedConsequence, measureThresholdRuleViolation.appliedConsequence)
-				&& Objects.equals(this.tolerancePeriod, measureThresholdRuleViolation.tolerancePeriod)
-				&& Objects.equals(this.baseType, measureThresholdRuleViolation.baseType)
-				&& Objects.equals(this.schemaLocation, measureThresholdRuleViolation.schemaLocation)
-				&& Objects.equals(this.type, measureThresholdRuleViolation.type);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(conformanceComparatorLower, conformanceComparatorUpper, conformanceTargetExact,
-//				conformanceTargetLower, conformanceTargetUpper, description, name, numberOfAllowedCrossing,
-//				thresholdRuleSeverity, appliedConsequence, tolerancePeriod, baseType, schemaLocation, type);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class MeasureThresholdRuleViolation {\n");
-
-		sb.append("    conformanceComparatorLower: ").append(toIndentedString(conformanceComparatorLower)).append("\n");
-		sb.append("    conformanceComparatorUpper: ").append(toIndentedString(conformanceComparatorUpper)).append("\n");
-		sb.append("    conformanceTargetExact: ").append(toIndentedString(conformanceTargetExact)).append("\n");
-		sb.append("    conformanceTargetLower: ").append(toIndentedString(conformanceTargetLower)).append("\n");
-		sb.append("    conformanceTargetUpper: ").append(toIndentedString(conformanceTargetUpper)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    numberOfAllowedCrossing: ").append(toIndentedString(numberOfAllowedCrossing)).append("\n");
-		sb.append("    thresholdRuleSeverity: ").append(toIndentedString(thresholdRuleSeverity)).append("\n");
-		sb.append("    appliedConsequence: ").append(toIndentedString(appliedConsequence)).append("\n");
-		sb.append("    tolerancePeriod: ").append(toIndentedString(tolerancePeriod)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureConsequence.java b/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureConsequence.java
deleted file mode 100644
index 8a316dec6e1496e32aa9d496ec70fc1bf8c157d1..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureConsequence.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A MetricDefMeasureConsequence defines the action (prescribed action or notification) to take when a  MetricDefMeasureThresholdRule is crossed.
- */
-@Schema(description = "A MetricDefMeasureConsequence defines the action (prescribed action or notification) to take when a  MetricDefMeasureThresholdRule is crossed.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMMetricDefMeasrConseq")
-@Table(name = "STMMetricDefMeasrConseq")
-public class MetricDefMeasureConsequence  extends BaseRootNamedEntity {
-  @JsonProperty("description")
-  private String description = null;
-
-
-  @JsonProperty("prescribeAction")
-  private String prescribeAction = null;
-
-  @JsonProperty("repeatAction")
-  private Boolean repeatAction = null;
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-
-  public MetricDefMeasureConsequence description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * A narrative that explains in detail what the consequence is.
-   * @return description
-  **/
-  @Schema(description = "A narrative that explains in detail what the consequence is.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public MetricDefMeasureConsequence name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * A word, term, or phrase by which a  MetricDefMeasureConsequence is known and distinguished from other MetricDefMeasureConsequences.
-   * @return name
-  **/
-  @Schema(description = "A word, term, or phrase by which a  MetricDefMeasureConsequence is known and distinguished from other MetricDefMeasureConsequences.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public MetricDefMeasureConsequence prescribeAction(String prescribeAction) {
-    this.prescribeAction = prescribeAction;
-    return this;
-  }
-
-  /**
-   * Recommended remedy for a violated threshold. This could be  the hyperlink to the action.
-   * @return prescribeAction
-  **/
-  @Schema(description = "Recommended remedy for a violated threshold. This could be  the hyperlink to the action.")
-  
-    public String getPrescribeAction() {
-    return prescribeAction;
-  }
-
-  public void setPrescribeAction(String prescribeAction) {
-    this.prescribeAction = prescribeAction;
-  }
-
-  public MetricDefMeasureConsequence repeatAction(Boolean repeatAction) {
-    this.repeatAction = repeatAction;
-    return this;
-  }
-
-  /**
-   * An indicator used to specify that a consequence should cease  being applied if a value is in the same range as the previous value or continue being applied if a value is in the same range as the previous value.  If the repeatAction is True, if the consequence is always applied as soon as the MetricMeasure value is in the range of values and if the repeatAction is False, the consequence is applied only if the previous MetricMeasure value was not in the same range.
-   * @return repeatAction
-  **/
-  @Schema(description = "An indicator used to specify that a consequence should cease  being applied if a value is in the same range as the previous value or continue being applied if a value is in the same range as the previous value.  If the repeatAction is True, if the consequence is always applied as soon as the MetricMeasure value is in the range of values and if the repeatAction is False, the consequence is applied only if the previous MetricMeasure value was not in the same range.")
-  
-    public Boolean isRepeatAction() {
-    return repeatAction;
-  }
-
-  public void setRepeatAction(Boolean repeatAction) {
-    this.repeatAction = repeatAction;
-  }
-
-  public MetricDefMeasureConsequence validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MetricDefMeasureConsequence metricDefMeasureConsequence = (MetricDefMeasureConsequence) o;
-    return Objects.equals(this.description, metricDefMeasureConsequence.description) &&
-        Objects.equals(this.name, metricDefMeasureConsequence.name) &&
-        Objects.equals(this.prescribeAction, metricDefMeasureConsequence.prescribeAction) &&
-        Objects.equals(this.repeatAction, metricDefMeasureConsequence.repeatAction) &&
-        Objects.equals(this.validFor, metricDefMeasureConsequence.validFor) &&
-        Objects.equals(this.baseType, metricDefMeasureConsequence.baseType) &&
-        Objects.equals(this.schemaLocation, metricDefMeasureConsequence.schemaLocation) &&
-        Objects.equals(this.type, metricDefMeasureConsequence.type);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(description, name, prescribeAction, repeatAction, validFor, baseType, schemaLocation, type);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MetricDefMeasureConsequence {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    prescribeAction: ").append(toIndentedString(prescribeAction)).append("\n");
-    sb.append("    repeatAction: ").append(toIndentedString(repeatAction)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureThresholdRule.java b/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureThresholdRule.java
deleted file mode 100644
index a69ed29d972d2d0d20134c9c8c13ce3e2dd24e56..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/MetricDefMeasureThresholdRule.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A MetricDefMeasureThresholdRule is a rule that defines the condition (raise
- * or clear) to achieve to apply consequences when a threshold is crossed or
- * ceased to be crossed. It also defines the severity of the raise or clear of
- * the threshold.
- */
-@Schema(description = "A MetricDefMeasureThresholdRule is a rule that defines the condition (raise or clear) to achieve to apply  consequences when a threshold is crossed or ceased to be crossed. It also defines the severity of the  raise or clear of the threshold.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMMetrcDefMeasrThreshRule")
-@Table(name = "STMMetrcDefMeasrThreshRule")
-public class MetricDefMeasureThresholdRule extends BaseRootNamedEntity {
-	@JsonProperty("conformanceComparatorLower")
-	private String conformanceComparatorLower = null;
-
-	@JsonProperty("conformanceComparatorUpper")
-	private String conformanceComparatorUpper = null;
-
-	@JsonProperty("conformanceTargetLower")
-	private String conformanceTargetLower = null;
-
-	@JsonProperty("conformanceTargetUpper")
-	private String conformanceTargetUpper = null;
-
-	@JsonProperty("description")
-	private String description = null;
-
-	@JsonProperty("numberOfAllowedCrossing")
-	private Integer numberOfAllowedCrossing = null;
-
-	@JsonProperty("thresholdRuleSeverity")
-	private String thresholdRuleSeverity = null;
-
-	@JsonProperty("consequence")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<MetricDefMeasureConsequence> consequence = new HashSet<>();
-
-	@JsonProperty("tolerancePeriod")
-	private Duration tolerancePeriod = null;
-
-	public MetricDefMeasureThresholdRule conformanceComparatorLower(String conformanceComparatorLower) {
-		this.conformanceComparatorLower = conformanceComparatorLower;
-		return this;
-	}
-
-	/**
-	 * An operator that when applied on a value specifies whether a threshold is
-	 * crossed or ceased to be crossed. This operator is used to Service Test
-	 * Management API REST Specification compare with the conformanceTargetLower.
-	 * 
-	 * @return conformanceComparatorLower
-	 **/
-	@Schema(description = "An operator that when applied on a value specifies whether a  threshold is crossed or ceased to be crossed. This operator is used to Service Test Management API REST Specification compare with the conformanceTargetLower.")
-
-	public String getConformanceComparatorLower() {
-		return conformanceComparatorLower;
-	}
-
-	public void setConformanceComparatorLower(String conformanceComparatorLower) {
-		this.conformanceComparatorLower = conformanceComparatorLower;
-	}
-
-	public MetricDefMeasureThresholdRule conformanceComparatorUpper(String conformanceComparatorUpper) {
-		this.conformanceComparatorUpper = conformanceComparatorUpper;
-		return this;
-	}
-
-	/**
-	 * An operator that when applied on a value specifies whether a threshold is
-	 * crossed or ceased to be crossed. This operator is used to compare with the
-	 * conformanceTargetUpper.
-	 * 
-	 * @return conformanceComparatorUpper
-	 **/
-	@Schema(description = "An operator that when applied on a value specifies whether a  threshold is crossed or ceased to be crossed. This operator is used to compare with the conformanceTargetUpper.")
-
-	public String getConformanceComparatorUpper() {
-		return conformanceComparatorUpper;
-	}
-
-	public void setConformanceComparatorUpper(String conformanceComparatorUpper) {
-		this.conformanceComparatorUpper = conformanceComparatorUpper;
-	}
-
-	public MetricDefMeasureThresholdRule conformanceTargetLower(String conformanceTargetLower) {
-		this.conformanceTargetLower = conformanceTargetLower;
-		return this;
-	}
-
-	/**
-	 * A value used to determine if the threshold is crossed or ceases to be
-	 * crossed. It represents the lower limit. The value should be less than the
-	 * conformanceTargetUpper. The conformance comparators should also be logically
-	 * defined so as to not lead to a logically impossible condition.
-	 * 
-	 * @return conformanceTargetLower
-	 **/
-	@Schema(description = "A value used to determine if the threshold is crossed or ceases  to be crossed. It represents the lower limit. The value should be less than the conformanceTargetUpper. The conformance comparators should also be logically defined so as to not lead to a logically impossible condition.")
-
-	public String getConformanceTargetLower() {
-		return conformanceTargetLower;
-	}
-
-	public void setConformanceTargetLower(String conformanceTargetLower) {
-		this.conformanceTargetLower = conformanceTargetLower;
-	}
-
-	public MetricDefMeasureThresholdRule conformanceTargetUpper(String conformanceTargetUpper) {
-		this.conformanceTargetUpper = conformanceTargetUpper;
-		return this;
-	}
-
-	/**
-	 * A value used to determine if the threshold is crossed or ceases to be
-	 * crossed. It represents the Upper limit. The value should be greater than the
-	 * conformanceTargetLower. The conformance comparators should also be logically
-	 * defined so as to not lead to a logically impossible condition.
-	 * 
-	 * @return conformanceTargetUpper
-	 **/
-	@Schema(description = "A value used to determine if the threshold is crossed or ceases  to be crossed. It represents the Upper limit. The value should be greater than the conformanceTargetLower. The conformance comparators should also be logically defined so as to not lead to a logically impossible condition.")
-
-	public String getConformanceTargetUpper() {
-		return conformanceTargetUpper;
-	}
-
-	public void setConformanceTargetUpper(String conformanceTargetUpper) {
-		this.conformanceTargetUpper = conformanceTargetUpper;
-	}
-
-	public MetricDefMeasureThresholdRule description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description for the MetricDefMeasureThresholdRule .
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description for the MetricDefMeasureThresholdRule .")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public MetricDefMeasureThresholdRule name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name for the MetricDefMeasureThresholdRule .
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name for the MetricDefMeasureThresholdRule .")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public MetricDefMeasureThresholdRule numberOfAllowedCrossing(Integer numberOfAllowedCrossing) {
-		this.numberOfAllowedCrossing = numberOfAllowedCrossing;
-		return this;
-	}
-
-	/**
-	 * The number of allowed crossing occurrences in reference to the
-	 * tolerancePeriod without a consequence being initiated.
-	 * 
-	 * @return numberOfAllowedCrossing
-	 **/
-	@Schema(description = "The number of allowed crossing occurrences in reference to the  tolerancePeriod without a consequence being initiated.")
-
-	public Integer getNumberOfAllowedCrossing() {
-		return numberOfAllowedCrossing;
-	}
-
-	public void setNumberOfAllowedCrossing(Integer numberOfAllowedCrossing) {
-		this.numberOfAllowedCrossing = numberOfAllowedCrossing;
-	}
-
-	public MetricDefMeasureThresholdRule thresholdRuleSeverity(String thresholdRuleSeverity) {
-		this.thresholdRuleSeverity = thresholdRuleSeverity;
-		return this;
-	}
-
-	/**
-	 * A threshold can be generated in different severity levels. A crossing for
-	 * each level may require a different condition and possibly trigger a different
-	 * consequence.
-	 * 
-	 * @return thresholdRuleSeverity
-	 **/
-	@Schema(description = "A threshold can be generated in different severity levels. A  crossing for each level may require a different condition and possibly trigger a different consequence.")
-
-	public String getThresholdRuleSeverity() {
-		return thresholdRuleSeverity;
-	}
-
-	public void setThresholdRuleSeverity(String thresholdRuleSeverity) {
-		this.thresholdRuleSeverity = thresholdRuleSeverity;
-	}
-
-	public MetricDefMeasureThresholdRule consequence(Set<MetricDefMeasureConsequence> consequence) {
-		this.consequence = consequence;
-		return this;
-	}
-
-	public MetricDefMeasureThresholdRule addConsequenceItem(MetricDefMeasureConsequence consequenceItem) {
-		if (this.consequence == null) {
-			this.consequence = new HashSet<>();
-		}
-		this.consequence.add(consequenceItem);
-		return this;
-	}
-
-	/**
-	 * A list of consequences (actions, notifications) that will arise if the
-	 * threshold is crossed
-	 * 
-	 * @return consequence
-	 **/
-	@Schema(description = "A list of consequences (actions, notifications) that will arise if the threshold is crossed")
-	@Valid
-	public Set<MetricDefMeasureConsequence> getConsequence() {
-		return consequence;
-	}
-
-	public void setConsequence(Set<MetricDefMeasureConsequence> consequence) {
-		this.consequence = consequence;
-	}
-
-	public MetricDefMeasureThresholdRule tolerancePeriod(Duration tolerancePeriod) {
-		this.tolerancePeriod = tolerancePeriod;
-		return this;
-	}
-
-	/**
-	 * Get tolerancePeriod
-	 * 
-	 * @return tolerancePeriod
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Duration getTolerancePeriod() {
-		return tolerancePeriod;
-	}
-
-	public void setTolerancePeriod(Duration tolerancePeriod) {
-		this.tolerancePeriod = tolerancePeriod;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		MetricDefMeasureThresholdRule metricDefMeasureThresholdRule = (MetricDefMeasureThresholdRule) o;
-		return Objects.equals(this.conformanceComparatorLower, metricDefMeasureThresholdRule.conformanceComparatorLower)
-				&& Objects.equals(this.conformanceComparatorUpper,
-						metricDefMeasureThresholdRule.conformanceComparatorUpper)
-				&& Objects.equals(this.conformanceTargetLower, metricDefMeasureThresholdRule.conformanceTargetLower)
-				&& Objects.equals(this.conformanceTargetUpper, metricDefMeasureThresholdRule.conformanceTargetUpper)
-				&& Objects.equals(this.description, metricDefMeasureThresholdRule.description)
-				&& Objects.equals(this.name, metricDefMeasureThresholdRule.name)
-				&& Objects.equals(this.numberOfAllowedCrossing, metricDefMeasureThresholdRule.numberOfAllowedCrossing)
-				&& Objects.equals(this.thresholdRuleSeverity, metricDefMeasureThresholdRule.thresholdRuleSeverity)
-				&& Objects.equals(this.consequence, metricDefMeasureThresholdRule.consequence)
-				&& Objects.equals(this.tolerancePeriod, metricDefMeasureThresholdRule.tolerancePeriod)
-				&& Objects.equals(this.baseType, metricDefMeasureThresholdRule.baseType)
-				&& Objects.equals(this.schemaLocation, metricDefMeasureThresholdRule.schemaLocation)
-				&& Objects.equals(this.type, metricDefMeasureThresholdRule.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(conformanceComparatorLower, conformanceComparatorUpper, conformanceTargetLower, conformanceTargetUpper, description, name, numberOfAllowedCrossing, thresholdRuleSeverity, consequence, tolerancePeriod, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class MetricDefMeasureThresholdRule {\n");
-
-		sb.append("    conformanceComparatorLower: ").append(toIndentedString(conformanceComparatorLower)).append("\n");
-		sb.append("    conformanceComparatorUpper: ").append(toIndentedString(conformanceComparatorUpper)).append("\n");
-		sb.append("    conformanceTargetLower: ").append(toIndentedString(conformanceTargetLower)).append("\n");
-		sb.append("    conformanceTargetUpper: ").append(toIndentedString(conformanceTargetUpper)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    numberOfAllowedCrossing: ").append(toIndentedString(numberOfAllowedCrossing)).append("\n");
-		sb.append("    thresholdRuleSeverity: ").append(toIndentedString(thresholdRuleSeverity)).append("\n");
-		sb.append("    consequence: ").append(toIndentedString(consequence)).append("\n");
-		sb.append("    tolerancePeriod: ").append(toIndentedString(tolerancePeriod)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTest.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTest.java
deleted file mode 100644
index 41ed3f76d8c863849c2100c8a03ec4fdc13433d8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTest.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A service test is an entity that exists for a controlled test invocation on a
- * service. The service test is executed according to a schedule and contains
- * service test configuration parameters that are to be applied at execution
- * time, and service test measures that result.
- */
-@Schema(description = "A service test is an entity that exists for a controlled test invocation on a service. The service  test is executed according to a schedule and contains service test configuration parameters that are to be  applied at execution time, and service test measures that result.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMServiceTest")
-@Table(name = "STMServiceTest")
-public class ServiceTest extends BaseEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@Column( name = "st_end_date_time" )
-	private OffsetDateTime endDateTime = null;
-
-	@JsonProperty("mode")
-	private String mode = null;
-
-	@Column( name = "st_start_date_time" )
-	private OffsetDateTime startDateTime = null;
-
-	@JsonProperty("state")
-	private String state = null;
-
-	@JsonProperty("characteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<Characteristic> characteristic = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("relatedService")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private ServiceRef relatedService = null;
-
-	@JsonProperty("testMeasure")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TestMeasure> testMeasure = new HashSet<>();
-
-	@JsonProperty("testSpecification")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private ServiceTestSpecificationRef testSpecification = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if (uuid != null) {
-			id = uuid;
-		}
-		return id;
-	}
-
-	public ServiceTest href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink reference
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink reference")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ServiceTest description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of the service test
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of the service test")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceTest endDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-		return this;
-	}
-
-	@JsonProperty("endDateTime")
-	public String getEndDateStr() {
-		if (this.endDateTime != null) {
-			return this.endDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * The end date and time of the service test
-	 * 
-	 * @return endDateTime
-	 **/
-	@Schema(description = "The end date and time of the service test")
-
-	@Valid
-	public OffsetDateTime getEndDateTime() {
-		return endDateTime;
-	}
-
-	public void setEndDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-	}
-
-	public ServiceTest mode(String mode) {
-		this.mode = mode;
-		return this;
-	}
-
-	/**
-	 * An indication of whether the service test is running in \"PROACTIVE\" or
-	 * \"ONDEMAND\" mode
-	 * 
-	 * @return mode
-	 **/
-	@Schema(description = "An indication of whether the service test is running in  \"PROACTIVE\" or \"ONDEMAND\" mode")
-
-	public String getMode() {
-		return mode;
-	}
-
-	public void setMode(String mode) {
-		this.mode = mode;
-	}
-
-	public ServiceTest name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * The name of the service test
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "The name of the service test")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceTest startDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-		return this;
-	}
-
-	/**
-	 * The start date and time of the service test.
-	 * 
-	 * @return startDateTime
-	 **/
-	@Schema(description = "The start date and time of the service test.")
-
-	@Valid
-	public OffsetDateTime getStartDateTime() {
-		return startDateTime;
-	}
-
-	@JsonProperty("startDateTime")
-	public String getStartDateStr() {
-		if (this.startDateTime != null) {
-			return this.startDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public void setStartDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-	}
-
-	public ServiceTest state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The actual state the service test is in
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The actual state the service test is in")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public ServiceTest characteristic(Set<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-		return this;
-	}
-
-	public ServiceTest addCharacteristicItem(Characteristic characteristicItem) {
-		if (this.characteristic == null) {
-			this.characteristic = new HashSet<>();
-		}
-		this.characteristic.add(characteristicItem);
-		return this;
-	}
-
-	/**
-	 * List of characteristics with values that define the test run
-	 * 
-	 * @return characteristic
-	 **/
-	@Schema(description = "List of characteristics with values that define the test run")
-	@Valid
-	public Set<Characteristic> getCharacteristic() {
-		return characteristic;
-	}
-
-	public void setCharacteristic(Set<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-	}
-
-	public ServiceTest relatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceTest addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Party related to the test
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "Party related to the test")
-	@Valid
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceTest relatedService(ServiceRef relatedService) {
-		this.relatedService = relatedService;
-		return this;
-	}
-
-	/**
-	 * Get relatedService
-	 * 
-	 * @return relatedService
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ServiceRef getRelatedService() {
-		return relatedService;
-	}
-
-	public void setRelatedService(ServiceRef relatedService) {
-		this.relatedService = relatedService;
-	}
-
-	public ServiceTest testMeasure(Set<TestMeasure> testMeasure) {
-		this.testMeasure = testMeasure;
-		return this;
-	}
-
-	public ServiceTest addTestMeasureItem(TestMeasure testMeasureItem) {
-		if (this.testMeasure == null) {
-			this.testMeasure = new HashSet<>();
-		}
-		this.testMeasure.add(testMeasureItem);
-		return this;
-	}
-
-	/**
-	 * The results of the test in terms of the measured metrics
-	 * 
-	 * @return testMeasure
-	 **/
-	@Schema(description = "The results of the test in terms of the measured metrics")
-	@Valid
-	public Set<TestMeasure> getTestMeasure() {
-		return testMeasure;
-	}
-
-	public void setTestMeasure(Set<TestMeasure> testMeasure) {
-		this.testMeasure = testMeasure;
-	}
-
-	public ServiceTest testSpecification(ServiceTestSpecificationRef testSpecification) {
-		this.testSpecification = testSpecification;
-		return this;
-	}
-
-	/**
-	 * Get testSpecification
-	 * 
-	 * @return testSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ServiceTestSpecificationRef getTestSpecification() {
-		return testSpecification;
-	}
-
-	public void setTestSpecification(ServiceTestSpecificationRef testSpecification) {
-		this.testSpecification = testSpecification;
-	}
-
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceTest serviceTest = (ServiceTest) o;
-		return Objects.equals(this.id, serviceTest.id) && Objects.equals(this.href, serviceTest.href)
-				&& Objects.equals(this.description, serviceTest.description)
-				&& Objects.equals(this.endDateTime, serviceTest.endDateTime)
-				&& Objects.equals(this.mode, serviceTest.mode) && Objects.equals(this.name, serviceTest.name)
-				&& Objects.equals(this.startDateTime, serviceTest.startDateTime)
-				&& Objects.equals(this.state, serviceTest.state)
-				&& Objects.equals(this.characteristic, serviceTest.characteristic)
-				&& Objects.equals(this.relatedParty, serviceTest.relatedParty)
-				&& Objects.equals(this.relatedService, serviceTest.relatedService)
-				&& Objects.equals(this.testMeasure, serviceTest.testMeasure)
-				&& Objects.equals(this.testSpecification, serviceTest.testSpecification)
-				&& Objects.equals(this.validFor, serviceTest.validFor)
-				&& Objects.equals(this.baseType, serviceTest.baseType)
-				&& Objects.equals(this.schemaLocation, serviceTest.schemaLocation)
-				&& Objects.equals(this.type, serviceTest.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, endDateTime, mode, name, startDateTime, state, characteristic, relatedParty, relatedService, testMeasure, testSpecification, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceTest {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endDateTime: ").append(toIndentedString(endDateTime)).append("\n");
-		sb.append("    mode: ").append(toIndentedString(mode)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    startDateTime: ").append(toIndentedString(startDateTime)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    relatedService: ").append(toIndentedString(relatedService)).append("\n");
-		sb.append("    testMeasure: ").append(toIndentedString(testMeasure)).append("\n");
-		sb.append("    testSpecification: ").append(toIndentedString(testSpecification)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-
-	public Characteristic getCharacteristicByName(@NotNull String name) {
-		for (Characteristic c : this.characteristic) {
-			if ( c.getName().equals(name)) {
-				return c;
-			}
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEvent.java
deleted file mode 100644
index c2b60cc9a1d9b08e30f1bc2ac7896e17f14668cf..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ServiceTestAttributeValueChangeEventPayload event = null;
-
-  public ServiceTestAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ServiceTestAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceTestAttributeValueChangeEvent event(ServiceTestAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestAttributeValueChangeEvent serviceTestAttributeValueChangeEvent = (ServiceTestAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, serviceTestAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, serviceTestAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, serviceTestAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, serviceTestAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, serviceTestAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, serviceTestAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEventPayload.java
deleted file mode 100644
index e56a0366e0ea9d4abfc0ecc21d998c4b73f6c1d8..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestAttributeValueChangeEventPayload   {
-  @JsonProperty("serviceTest")
-  private ServiceTest serviceTest = null;
-
-  public ServiceTestAttributeValueChangeEventPayload serviceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-    return this;
-  }
-
-  /**
-   * Get serviceTest
-   * @return serviceTest
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTest getServiceTest() {
-    return serviceTest;
-  }
-
-  public void setServiceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestAttributeValueChangeEventPayload serviceTestAttributeValueChangeEventPayload = (ServiceTestAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.serviceTest, serviceTestAttributeValueChangeEventPayload.serviceTest);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTest);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    serviceTest: ").append(toIndentedString(serviceTest)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreate.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreate.java
deleted file mode 100644
index 0fe990f4926423a167833f8dfd1c2955b73498c6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreate.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-/**
- * A service test is an entity that exists for a controlled test invocation on a service. The service  test is executed according to a schedule and contains service test configuration parameters that are to be  applied at execution time, and service test measures that result. Skipped properties: id,href
- */
-@Schema(description = "A service test is an entity that exists for a controlled test invocation on a service. The service  test is executed according to a schedule and contains service test configuration parameters that are to be  applied at execution time, and service test measures that result. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestCreate  extends ServiceTestUpdate {
-  
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestCreate serviceTestCreate = (ServiceTestCreate) o;
-    return Objects.equals(this.description, serviceTestCreate.description) &&
-        Objects.equals(this.endDateTime, serviceTestCreate.endDateTime) &&
-        Objects.equals(this.mode, serviceTestCreate.mode) &&
-        Objects.equals(this.name, serviceTestCreate.name) &&
-        Objects.equals(this.startDateTime, serviceTestCreate.startDateTime) &&
-        Objects.equals(this.state, serviceTestCreate.state) &&
-        Objects.equals(this.characteristic, serviceTestCreate.characteristic) &&
-        Objects.equals(this.relatedParty, serviceTestCreate.relatedParty) &&
-        Objects.equals(this.relatedService, serviceTestCreate.relatedService) &&
-        Objects.equals(this.testMeasure, serviceTestCreate.testMeasure) &&
-        Objects.equals(this.testSpecification, serviceTestCreate.testSpecification) &&
-        Objects.equals(this.validFor, serviceTestCreate.validFor) &&
-        Objects.equals(this.baseType, serviceTestCreate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceTestCreate.schemaLocation) &&
-        Objects.equals(this.type, serviceTestCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, endDateTime, mode, name, startDateTime, state, characteristic, relatedParty, relatedService, testMeasure, testSpecification, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    endDateTime: ").append(toIndentedString(endDateTime)).append("\n");
-    sb.append("    mode: ").append(toIndentedString(mode)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    startDateTime: ").append(toIndentedString(startDateTime)).append("\n");
-    sb.append("    state: ").append(toIndentedString(state)).append("\n");
-    sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    relatedService: ").append(toIndentedString(relatedService)).append("\n");
-    sb.append("    testMeasure: ").append(toIndentedString(testMeasure)).append("\n");
-    sb.append("    testSpecification: ").append(toIndentedString(testSpecification)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEvent.java
deleted file mode 100644
index 0fd510eab85c221839269cfeebe50946e4e2c4fb..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEvent.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestCreateEvent   {
-  @JsonProperty("event")
-  private ServiceTestCreateEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ServiceTestCreateEvent event(ServiceTestCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestCreateEventPayload event) {
-    this.event = event;
-  }
-
-  public ServiceTestCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestCreateEvent serviceTestCreateEvent = (ServiceTestCreateEvent) o;
-    return Objects.equals(this.event, serviceTestCreateEvent.event) &&
-        Objects.equals(this.eventId, serviceTestCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestCreateEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestCreateEvent.domain) &&
-        Objects.equals(this.title, serviceTestCreateEvent.title) &&
-        Objects.equals(this.description, serviceTestCreateEvent.description) &&
-        Objects.equals(this.priority, serviceTestCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestCreateEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestCreateEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEventPayload.java
deleted file mode 100644
index 76265a90572757ff1742c39d536cb13a16b11242..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestCreateEventPayload   {
-  @JsonProperty("serviceTest")
-  private ServiceTest serviceTest = null;
-
-  public ServiceTestCreateEventPayload serviceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-    return this;
-  }
-
-  /**
-   * Get serviceTest
-   * @return serviceTest
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTest getServiceTest() {
-    return serviceTest;
-  }
-
-  public void setServiceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestCreateEventPayload serviceTestCreateEventPayload = (ServiceTestCreateEventPayload) o;
-    return Objects.equals(this.serviceTest, serviceTestCreateEventPayload.serviceTest);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTest);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestCreateEventPayload {\n");
-    
-    sb.append("    serviceTest: ").append(toIndentedString(serviceTest)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEvent.java
deleted file mode 100644
index c6870512526008f37c3b913cf3748f41146c37be..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEvent.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestDeleteEvent   {
-  @JsonProperty("event")
-  private ServiceTestDeleteEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ServiceTestDeleteEvent event(ServiceTestDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestDeleteEventPayload event) {
-    this.event = event;
-  }
-
-  public ServiceTestDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestDeleteEvent serviceTestDeleteEvent = (ServiceTestDeleteEvent) o;
-    return Objects.equals(this.event, serviceTestDeleteEvent.event) &&
-        Objects.equals(this.eventId, serviceTestDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestDeleteEvent.domain) &&
-        Objects.equals(this.title, serviceTestDeleteEvent.title) &&
-        Objects.equals(this.description, serviceTestDeleteEvent.description) &&
-        Objects.equals(this.priority, serviceTestDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestDeleteEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestDeleteEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEventPayload.java
deleted file mode 100644
index bcf2e1564d34921e4e76ec971304db84c71aa91a..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestDeleteEventPayload   {
-  @JsonProperty("serviceTest")
-  private ServiceTest serviceTest = null;
-
-  public ServiceTestDeleteEventPayload serviceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-    return this;
-  }
-
-  /**
-   * Get serviceTest
-   * @return serviceTest
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTest getServiceTest() {
-    return serviceTest;
-  }
-
-  public void setServiceTest(ServiceTest serviceTest) {
-    this.serviceTest = serviceTest;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestDeleteEventPayload serviceTestDeleteEventPayload = (ServiceTestDeleteEventPayload) o;
-    return Objects.equals(this.serviceTest, serviceTestDeleteEventPayload.serviceTest);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTest);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestDeleteEventPayload {\n");
-    
-    sb.append("    serviceTest: ").append(toIndentedString(serviceTest)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecRelationship.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecRelationship.java
deleted file mode 100644
index e69c3b384fccc450733104e97d6fc7bd22926e69..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecRelationship.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A substitution, dependency or exclusivity relationship between/among service specifications.
- */
-@Schema(description = "A substitution, dependency or exclusivity relationship between/among service specifications.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-@Entity(name = "STMServiceTestSpecRelationship")
-@Table(name = "STMServiceTestSpecRelationship")
-public class ServiceTestSpecRelationship extends BaseEntity {
-  @JsonProperty("id")
-  private String id = null;
-
-  @JsonProperty("relationshipType")
-  private String relationshipType = null;
-
-  @JsonProperty("role")
-  private String role = null;
-
-
-
-  @JsonProperty("@referredType")
-  private String _atReferredType = null;
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		id = uuid;
-		return uuid;
-	}
-
-  public ServiceTestSpecRelationship href(String href) {
-    this.href = href;
-    return this;
-  }
-
-  /**
-   * Hyperlink reference
-   * @return href
-  **/
-  @Schema(description = "Hyperlink reference")
-  
-    public String getHref() {
-    return href;
-  }
-
-  public void setHref(String href) {
-    this.href = href;
-  }
-
-  public ServiceTestSpecRelationship name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Name of the related entity.
-   * @return name
-  **/
-  @Schema(description = "Name of the related entity.")
-  
-    public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public ServiceTestSpecRelationship relationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-    return this;
-  }
-
-  /**
-   * Type of relationship such as substitution, dependency, exclusivity
-   * @return relationshipType
-  **/
-  @Schema(description = "Type of relationship such as substitution, dependency, exclusivity")
-      @NotNull
-
-    public String getRelationshipType() {
-    return relationshipType;
-  }
-
-  public void setRelationshipType(String relationshipType) {
-    this.relationshipType = relationshipType;
-  }
-
-  public ServiceTestSpecRelationship role(String role) {
-    this.role = role;
-    return this;
-  }
-
-  /**
-   * The association role for this service test specification
-   * @return role
-  **/
-  @Schema(description = "The association role for this service test specification")
-  
-    public String getRole() {
-    return role;
-  }
-
-  public void setRole(String role) {
-    this.role = role;
-  }
-
- 
-  
-
-  /**
-   * The actual type of the target instance when needed for disambiguation.
-   * @return _atReferredType
-  **/
-  @Schema(description = "The actual type of the target instance when needed for disambiguation.")
-  
-    public String getAtReferredType() {
-    return _atReferredType;
-  }
-
-  public void setAtReferredType(String _atReferredType) {
-    this._atReferredType = _atReferredType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecRelationship serviceTestSpecRelationship = (ServiceTestSpecRelationship) o;
-    return Objects.equals(this.id, serviceTestSpecRelationship.id) &&
-        Objects.equals(this.href, serviceTestSpecRelationship.href) &&
-        Objects.equals(this.name, serviceTestSpecRelationship.name) &&
-        Objects.equals(this.relationshipType, serviceTestSpecRelationship.relationshipType) &&
-        Objects.equals(this.role, serviceTestSpecRelationship.role) &&
-        Objects.equals(this.validFor, serviceTestSpecRelationship.validFor) &&
-        Objects.equals(this.baseType, serviceTestSpecRelationship.baseType) &&
-        Objects.equals(this.schemaLocation, serviceTestSpecRelationship.schemaLocation) &&
-        Objects.equals(this.type, serviceTestSpecRelationship.type) &&
-        Objects.equals(this._atReferredType, serviceTestSpecRelationship._atReferredType);
-  }
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, name, relationshipType, role, validFor, baseType, schemaLocation, type, _atReferredType);
-//  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecRelationship {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    href: ").append(toIndentedString(href)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    relationshipType: ").append(toIndentedString(relationshipType)).append("\n");
-    sb.append("    role: ").append(toIndentedString(role)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecification.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecification.java
deleted file mode 100644
index 9a665e7536fa81d967058680bb8b72c4c6ed7063..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecification.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.BaseEntity;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * The service test specification describes the service test in terms of
- * parameters to be configured and measures to be taken.
- */
-@Schema(description = "The service test specification describes the service test in terms of parameters to be configured and  measures to be taken.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMServiceTestSpec")
-@Table(name = "STMServiceTestSpec")
-public class ServiceTestSpecification extends BaseEntity {
-
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("isBundle")
-	private Boolean isBundle = null;
-
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<AttachmentRefOrValue> attachment = new HashSet<>();
-
-	@JsonProperty("constraint")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ConstraintRef> constraint = new HashSet<>();
-
-	@JsonProperty("entitySpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<EntitySpecificationRelationship> entitySpecRelationship = new HashSet<>();
-
-	@JsonProperty("relatedParty")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<RelatedParty> relatedParty = new HashSet<>();
-
-	@JsonProperty("relatedServiceSpecification")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceSpecificationRef> relatedServiceSpecification = new HashSet<>();
-
-	@JsonProperty("serviceTestSpecRelationship")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<ServiceTestSpecRelationship> serviceTestSpecRelationship = new HashSet<>();
-
-	@JsonProperty("specCharacteristic")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<CharacteristicSpecification> specCharacteristic = new HashSet<>();
-
-	@JsonProperty("targetEntitySchema")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private TargetEntitySchema targetEntitySchema = null;
-
-	@JsonProperty("testMeasureDefinition")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<TestMeasureDefinition> testMeasureDefinition = new HashSet<>();
-
-	
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		if ( uuid != null ) {
-			id = uuid;			
-		} 
-		return id;
-	}
-
-	
-
-	public ServiceTestSpecification version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Entity specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Entity specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceTestSpecification attachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ServiceTestSpecification addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new HashSet<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Attachments that may be of relevance to this specification, such as picture,
-	 * document, media
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Attachments that may be of relevance to this specification, such as picture, document, media")
-	@Valid
-	public Set<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(Set<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ServiceTestSpecification constraint(Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public ServiceTestSpecification addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new HashSet<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of constraint references applied to this specification
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "This is a list of constraint references applied to this specification")
-	@Valid
-	public Set<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint( Set<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public ServiceTestSpecification entitySpecRelationship(
-			Set<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-		return this;
-	}
-
-	public ServiceTestSpecification addEntitySpecRelationshipItem(
-			EntitySpecificationRelationship entitySpecRelationshipItem) {
-		if (this.entitySpecRelationship == null) {
-			this.entitySpecRelationship = new HashSet<>();
-		}
-		this.entitySpecRelationship.add(entitySpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Relationship to another entity specification, might be dependency,
-	 * substitution, etc.
-	 * 
-	 * @return entitySpecRelationship
-	 **/
-	@Schema(description = "Relationship to another entity specification, might be dependency, substitution, etc.")
-	@Valid
-	public Set<EntitySpecificationRelationship> getEntitySpecRelationship() {
-		return entitySpecRelationship;
-	}
-
-	public void setEntitySpecRelationship( Set<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-	}
-
-	public ServiceTestSpecification relatedParty( Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceTestSpecification addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new HashSet<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Parties who manage or otherwise have an interest in this entity specification
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "Parties who manage or otherwise have an interest in this entity specification")
-	@Valid
-	public Set<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty( Set<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-	
-	
-	public ServiceTestSpecification isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether an EntitySpecification represents a single
-	 * EntitySpecification (false), or a bundle of EntitySpecifications (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether an EntitySpecification represents a single EntitySpecification (false), or a bundle of EntitySpecifications (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ServiceTestSpecification relatedServiceSpecification(
-			Set<ServiceSpecificationRef> relatedServiceSpecification) {
-		this.relatedServiceSpecification = relatedServiceSpecification;
-		return this;
-	}
-
-	public ServiceTestSpecification addRelatedServiceSpecificationItem(
-			ServiceSpecificationRef relatedServiceSpecificationItem) {
-		if (this.relatedServiceSpecification == null) {
-			this.relatedServiceSpecification = new HashSet<>();
-		}
-		this.relatedServiceSpecification.add(relatedServiceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * The related service specification may relate to more than one service
-	 * specification.
-	 * 
-	 * @return relatedServiceSpecification
-	 **/
-	@Schema(description = "The related service specification may relate to more than one service specification.")
-	@Valid
-	public Set<ServiceSpecificationRef> getRelatedServiceSpecification() {
-		return relatedServiceSpecification;
-	}
-
-	public void setRelatedServiceSpecification( Set<ServiceSpecificationRef> relatedServiceSpecification) {
-		this.relatedServiceSpecification = relatedServiceSpecification;
-	}
-
-	public ServiceTestSpecification serviceTestSpecRelationship(
-			Set<ServiceTestSpecRelationship> serviceTestSpecRelationship) {
-		this.serviceTestSpecRelationship = serviceTestSpecRelationship;
-		return this;
-	}
-
-	public ServiceTestSpecification addServiceTestSpecRelationshipItem(
-			ServiceTestSpecRelationship serviceTestSpecRelationshipItem) {
-		if (this.serviceTestSpecRelationship == null) {
-			this.serviceTestSpecRelationship = new HashSet<>();
-		}
-		this.serviceTestSpecRelationship.add(serviceTestSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service test specifications related to this specification e.g.
-	 * dependency, substitution
-	 * 
-	 * @return serviceTestSpecRelationship
-	 **/
-	@Schema(description = "A list of service test specifications related to this specification e.g. dependency, substitution")
-	@Valid
-	public Set<ServiceTestSpecRelationship> getServiceTestSpecRelationship() {
-		return serviceTestSpecRelationship;
-	}
-
-	public void setServiceTestSpecRelationship( Set<ServiceTestSpecRelationship> serviceTestSpecRelationship) {
-		this.serviceTestSpecRelationship = serviceTestSpecRelationship;
-	}
-
-	public ServiceTestSpecification specCharacteristic(Set<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-		return this;
-	}
-
-	public ServiceTestSpecification addSpecCharacteristicItem(CharacteristicSpecification specCharacteristicItem) {
-		if (this.specCharacteristic == null) {
-			this.specCharacteristic = new HashSet<>();
-		}
-		this.specCharacteristic.add(specCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * List of characteristics that the entity can take
-	 * 
-	 * @return specCharacteristic
-	 **/
-	@Schema(description = "List of characteristics that the entity can take")
-	@Valid
-	public Set<CharacteristicSpecification> getSpecCharacteristic() {
-		return specCharacteristic;
-	}
-
-	public void setSpecCharacteristic(Set<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-	}
-
-	public ServiceTestSpecification targetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-		return this;
-	}
-
-	/**
-	 * Get targetEntitySchema
-	 * 
-	 * @return targetEntitySchema
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TargetEntitySchema getTargetEntitySchema() {
-		return targetEntitySchema;
-	}
-
-	public void setTargetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-	}
-
-	public ServiceTestSpecification testMeasureDefinition(Set<TestMeasureDefinition> testMeasureDefinition) {
-		this.testMeasureDefinition = testMeasureDefinition;
-		return this;
-	}
-
-	public ServiceTestSpecification addTestMeasureDefinitionItem(TestMeasureDefinition testMeasureDefinitionItem) {
-		if (this.testMeasureDefinition == null) {
-			this.testMeasureDefinition = new HashSet<>();
-		}
-		this.testMeasureDefinition.add(testMeasureDefinitionItem);
-		return this;
-	}
-
-	/**
-	 * A list of definitions for the measurements for the test defined by this
-	 * specification
-	 * 
-	 * @return testMeasureDefinition
-	 **/
-	@Schema(description = "A list of definitions for the measurements for the test defined by this specification")
-	@Valid
-	public Set<TestMeasureDefinition> getTestMeasureDefinition() {
-		return testMeasureDefinition;
-	}
-
-	public void setTestMeasureDefinition( Set<TestMeasureDefinition> testMeasureDefinition) {
-		this.testMeasureDefinition = testMeasureDefinition;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceTestSpecification serviceTestSpecification = (ServiceTestSpecification) o;
-		return Objects.equals(this.id, serviceTestSpecification.id)
-				&& Objects.equals(this.href, serviceTestSpecification.href)
-				&& Objects.equals(this.description, serviceTestSpecification.description)
-				&& Objects.equals(this.isBundle, serviceTestSpecification.isBundle)
-				&& Objects.equals(this.lastUpdate, serviceTestSpecification.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceTestSpecification.lifecycleStatus)
-				&& Objects.equals(this.name, serviceTestSpecification.name)
-				&& Objects.equals(this.version, serviceTestSpecification.version)
-				&& Objects.equals(this.attachment, serviceTestSpecification.attachment)
-				&& Objects.equals(this.constraint, serviceTestSpecification.constraint)
-				&& Objects.equals(this.entitySpecRelationship, serviceTestSpecification.entitySpecRelationship)
-				&& Objects.equals(this.relatedParty, serviceTestSpecification.relatedParty)
-				&& Objects.equals(this.relatedServiceSpecification,
-						serviceTestSpecification.relatedServiceSpecification)
-				&& Objects.equals(this.serviceTestSpecRelationship,
-						serviceTestSpecification.serviceTestSpecRelationship)
-				&& Objects.equals(this.specCharacteristic, serviceTestSpecification.specCharacteristic)
-				&& Objects.equals(this.targetEntitySchema, serviceTestSpecification.targetEntitySchema)
-				&& Objects.equals(this.testMeasureDefinition, serviceTestSpecification.testMeasureDefinition)
-				&& Objects.equals(this.validFor, serviceTestSpecification.validFor)
-				&& Objects.equals(this.baseType, serviceTestSpecification.baseType)
-				&& Objects.equals(this.schemaLocation, serviceTestSpecification.schemaLocation)
-				&& Objects.equals(this.type, serviceTestSpecification.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(id, href, description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment, constraint, entitySpecRelationship, relatedParty, relatedServiceSpecification, serviceTestSpecRelationship, specCharacteristic, targetEntitySchema, testMeasureDefinition, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceTestSpecification {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    entitySpecRelationship: ").append(toIndentedString(entitySpecRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    relatedServiceSpecification: ").append(toIndentedString(relatedServiceSpecification))
-				.append("\n");
-		sb.append("    serviceTestSpecRelationship: ").append(toIndentedString(serviceTestSpecRelationship))
-				.append("\n");
-		sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-		sb.append("    targetEntitySchema: ").append(toIndentedString(targetEntitySchema)).append("\n");
-		sb.append("    testMeasureDefinition: ").append(toIndentedString(testMeasureDefinition)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEvent.java
deleted file mode 100644
index 6d43d337d96460237ddbf16b7edc575119c61ce5..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEvent.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationAttributeValueChangeEvent   {
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  @JsonProperty("fieldPath")
-  private String fieldPath = null;
-
-  @JsonProperty("event")
-  private ServiceTestSpecificationAttributeValueChangeEventPayload event = null;
-
-  public ServiceTestSpecificationAttributeValueChangeEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent fieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-    return this;
-  }
-
-  /**
-   * The path identifying the object field concerned by this notification.
-   * @return fieldPath
-  **/
-  @Schema(description = "The path identifying the object field concerned by this notification.")
-  
-    public String getFieldPath() {
-    return fieldPath;
-  }
-
-  public void setFieldPath(String fieldPath) {
-    this.fieldPath = fieldPath;
-  }
-
-  public ServiceTestSpecificationAttributeValueChangeEvent event(ServiceTestSpecificationAttributeValueChangeEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecificationAttributeValueChangeEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestSpecificationAttributeValueChangeEventPayload event) {
-    this.event = event;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationAttributeValueChangeEvent serviceTestSpecificationAttributeValueChangeEvent = (ServiceTestSpecificationAttributeValueChangeEvent) o;
-    return Objects.equals(this.eventId, serviceTestSpecificationAttributeValueChangeEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestSpecificationAttributeValueChangeEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestSpecificationAttributeValueChangeEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestSpecificationAttributeValueChangeEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestSpecificationAttributeValueChangeEvent.domain) &&
-        Objects.equals(this.title, serviceTestSpecificationAttributeValueChangeEvent.title) &&
-        Objects.equals(this.description, serviceTestSpecificationAttributeValueChangeEvent.description) &&
-        Objects.equals(this.priority, serviceTestSpecificationAttributeValueChangeEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestSpecificationAttributeValueChangeEvent.timeOcurred) &&
-        Objects.equals(this.fieldPath, serviceTestSpecificationAttributeValueChangeEvent.fieldPath) &&
-        Objects.equals(this.event, serviceTestSpecificationAttributeValueChangeEvent.event);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred, fieldPath, event);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationAttributeValueChangeEvent {\n");
-    
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("    fieldPath: ").append(toIndentedString(fieldPath)).append("\n");
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEventPayload.java
deleted file mode 100644
index 09a2fca2bf433bd149bfc0f9601a7496fd679e05..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationAttributeValueChangeEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationAttributeValueChangeEventPayload   {
-  @JsonProperty("serviceTestSpecification")
-  private ServiceTestSpecification serviceTestSpecification = null;
-
-  public ServiceTestSpecificationAttributeValueChangeEventPayload serviceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-    return this;
-  }
-
-  /**
-   * Get serviceTestSpecification
-   * @return serviceTestSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecification getServiceTestSpecification() {
-    return serviceTestSpecification;
-  }
-
-  public void setServiceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationAttributeValueChangeEventPayload serviceTestSpecificationAttributeValueChangeEventPayload = (ServiceTestSpecificationAttributeValueChangeEventPayload) o;
-    return Objects.equals(this.serviceTestSpecification, serviceTestSpecificationAttributeValueChangeEventPayload.serviceTestSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTestSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationAttributeValueChangeEventPayload {\n");
-    
-    sb.append("    serviceTestSpecification: ").append(toIndentedString(serviceTestSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreate.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreate.java
deleted file mode 100644
index 0e1eccc913b1f71123a54fad8a723a6a98ec9dd7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreate.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The service test specification describes the service test in terms of parameters to be configured and  measures to be taken. Skipped properties: id,href
- */
-@Schema(description = "The service test specification describes the service test in terms of parameters to be configured and  measures to be taken. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationCreate extends ServiceTestSpecificationUpdate  {
- 
-
-  @JsonProperty("validFor")
-  private TimePeriod validFor = null;
-
-
-  public ServiceTestSpecificationCreate validFor(TimePeriod validFor) {
-    this.validFor = validFor;
-    return this;
-  }
-
-  /**
-   * Get validFor
-   * @return validFor
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public TimePeriod getValidFor() {
-    return validFor;
-  }
-
-  public void setValidFor(TimePeriod validFor) {
-    this.validFor = validFor;
-  }
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationCreate serviceTestSpecificationCreate = (ServiceTestSpecificationCreate) o;
-    return Objects.equals(this.description, serviceTestSpecificationCreate.description) &&
-        Objects.equals(this.isBundle, serviceTestSpecificationCreate.isBundle) &&
-        Objects.equals(this.lastUpdate, serviceTestSpecificationCreate.lastUpdate) &&
-        Objects.equals(this.lifecycleStatus, serviceTestSpecificationCreate.lifecycleStatus) &&
-        Objects.equals(this.name, serviceTestSpecificationCreate.name) &&
-        Objects.equals(this.version, serviceTestSpecificationCreate.version) &&
-        Objects.equals(this.attachment, serviceTestSpecificationCreate.attachment) &&
-        Objects.equals(this.constraint, serviceTestSpecificationCreate.constraint) &&
-        Objects.equals(this.entitySpecRelationship, serviceTestSpecificationCreate.entitySpecRelationship) &&
-        Objects.equals(this.relatedParty, serviceTestSpecificationCreate.relatedParty) &&
-        Objects.equals(this.relatedServiceSpecification, serviceTestSpecificationCreate.relatedServiceSpecification) &&
-        Objects.equals(this.serviceTestSpecRelationship, serviceTestSpecificationCreate.serviceTestSpecRelationship) &&
-        Objects.equals(this.specCharacteristic, serviceTestSpecificationCreate.specCharacteristic) &&
-        Objects.equals(this.targetEntitySchema, serviceTestSpecificationCreate.targetEntitySchema) &&
-        Objects.equals(this.testMeasureDefinition, serviceTestSpecificationCreate.testMeasureDefinition) &&
-        Objects.equals(this.validFor, serviceTestSpecificationCreate.validFor) &&
-        Objects.equals(this.baseType, serviceTestSpecificationCreate.baseType) &&
-        Objects.equals(this.schemaLocation, serviceTestSpecificationCreate.schemaLocation) &&
-        Objects.equals(this.type, serviceTestSpecificationCreate.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment, constraint, entitySpecRelationship, relatedParty, relatedServiceSpecification, serviceTestSpecRelationship, specCharacteristic, targetEntitySchema, testMeasureDefinition, validFor, baseType, schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationCreate {\n");
-    
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-    sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-    sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    version: ").append(toIndentedString(version)).append("\n");
-    sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-    sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-    sb.append("    entitySpecRelationship: ").append(toIndentedString(entitySpecRelationship)).append("\n");
-    sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-    sb.append("    relatedServiceSpecification: ").append(toIndentedString(relatedServiceSpecification)).append("\n");
-    sb.append("    serviceTestSpecRelationship: ").append(toIndentedString(serviceTestSpecRelationship)).append("\n");
-    sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-    sb.append("    targetEntitySchema: ").append(toIndentedString(targetEntitySchema)).append("\n");
-    sb.append("    testMeasureDefinition: ").append(toIndentedString(testMeasureDefinition)).append("\n");
-    sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-    sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEvent.java
deleted file mode 100644
index e76bd2c21938c8c8d8d6dc302b752e7f1f2e4f27..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEvent.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationCreateEvent   {
-  @JsonProperty("event")
-  private ServiceTestSpecificationCreateEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ServiceTestSpecificationCreateEvent event(ServiceTestSpecificationCreateEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecificationCreateEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestSpecificationCreateEventPayload event) {
-    this.event = event;
-  }
-
-  public ServiceTestSpecificationCreateEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestSpecificationCreateEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestSpecificationCreateEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestSpecificationCreateEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestSpecificationCreateEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestSpecificationCreateEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestSpecificationCreateEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestSpecificationCreateEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestSpecificationCreateEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationCreateEvent serviceTestSpecificationCreateEvent = (ServiceTestSpecificationCreateEvent) o;
-    return Objects.equals(this.event, serviceTestSpecificationCreateEvent.event) &&
-        Objects.equals(this.eventId, serviceTestSpecificationCreateEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestSpecificationCreateEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestSpecificationCreateEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestSpecificationCreateEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestSpecificationCreateEvent.domain) &&
-        Objects.equals(this.title, serviceTestSpecificationCreateEvent.title) &&
-        Objects.equals(this.description, serviceTestSpecificationCreateEvent.description) &&
-        Objects.equals(this.priority, serviceTestSpecificationCreateEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestSpecificationCreateEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationCreateEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEventPayload.java
deleted file mode 100644
index 1ad1ae957498bb2c333f83975ec140962b799c33..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationCreateEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationCreateEventPayload   {
-  @JsonProperty("serviceTestSpecification")
-  private ServiceTestSpecification serviceTestSpecification = null;
-
-  public ServiceTestSpecificationCreateEventPayload serviceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-    return this;
-  }
-
-  /**
-   * Get serviceTestSpecification
-   * @return serviceTestSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecification getServiceTestSpecification() {
-    return serviceTestSpecification;
-  }
-
-  public void setServiceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationCreateEventPayload serviceTestSpecificationCreateEventPayload = (ServiceTestSpecificationCreateEventPayload) o;
-    return Objects.equals(this.serviceTestSpecification, serviceTestSpecificationCreateEventPayload.serviceTestSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTestSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationCreateEventPayload {\n");
-    
-    sb.append("    serviceTestSpecification: ").append(toIndentedString(serviceTestSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEvent.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEvent.java
deleted file mode 100644
index b1847616acce11682050d93c6da75f6009c2e548..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEvent.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The notification data structure
- */
-@Schema(description = "The notification data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationDeleteEvent   {
-  @JsonProperty("event")
-  private ServiceTestSpecificationDeleteEventPayload event = null;
-
-  @JsonProperty("eventId")
-  private String eventId = null;
-
-  @JsonProperty("eventTime")
-  private OffsetDateTime eventTime = null;
-
-  @JsonProperty("eventType")
-  private String eventType = null;
-
-  @JsonProperty("correlationId")
-  private String correlationId = null;
-
-  @JsonProperty("domain")
-  private String domain = null;
-
-  @JsonProperty("title")
-  private String title = null;
-
-  @JsonProperty("description")
-  private String description = null;
-
-  @JsonProperty("priority")
-  private String priority = null;
-
-  @JsonProperty("timeOcurred")
-  private OffsetDateTime timeOcurred = null;
-
-  public ServiceTestSpecificationDeleteEvent event(ServiceTestSpecificationDeleteEventPayload event) {
-    this.event = event;
-    return this;
-  }
-
-  /**
-   * Get event
-   * @return event
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecificationDeleteEventPayload getEvent() {
-    return event;
-  }
-
-  public void setEvent(ServiceTestSpecificationDeleteEventPayload event) {
-    this.event = event;
-  }
-
-  public ServiceTestSpecificationDeleteEvent eventId(String eventId) {
-    this.eventId = eventId;
-    return this;
-  }
-
-  /**
-   * The identifier of the notification.
-   * @return eventId
-  **/
-  @Schema(description = "The identifier of the notification.")
-  
-    public String getEventId() {
-    return eventId;
-  }
-
-  public void setEventId(String eventId) {
-    this.eventId = eventId;
-  }
-
-  public ServiceTestSpecificationDeleteEvent eventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-    return this;
-  }
-
-  /**
-   * Time of the event occurrence.
-   * @return eventTime
-  **/
-  @Schema(description = "Time of the event occurrence.")
-  
-    @Valid
-    public OffsetDateTime getEventTime() {
-    return eventTime;
-  }
-
-  public void setEventTime(OffsetDateTime eventTime) {
-    this.eventTime = eventTime;
-  }
-
-  public ServiceTestSpecificationDeleteEvent eventType(String eventType) {
-    this.eventType = eventType;
-    return this;
-  }
-
-  /**
-   * The type of the notification.
-   * @return eventType
-  **/
-  @Schema(description = "The type of the notification.")
-  
-    public String getEventType() {
-    return eventType;
-  }
-
-  public void setEventType(String eventType) {
-    this.eventType = eventType;
-  }
-
-  public ServiceTestSpecificationDeleteEvent correlationId(String correlationId) {
-    this.correlationId = correlationId;
-    return this;
-  }
-
-  /**
-   * The correlation id for this event.
-   * @return correlationId
-  **/
-  @Schema(description = "The correlation id for this event.")
-  
-    public String getCorrelationId() {
-    return correlationId;
-  }
-
-  public void setCorrelationId(String correlationId) {
-    this.correlationId = correlationId;
-  }
-
-  public ServiceTestSpecificationDeleteEvent domain(String domain) {
-    this.domain = domain;
-    return this;
-  }
-
-  /**
-   * The domain of the event.
-   * @return domain
-  **/
-  @Schema(description = "The domain of the event.")
-  
-    public String getDomain() {
-    return domain;
-  }
-
-  public void setDomain(String domain) {
-    this.domain = domain;
-  }
-
-  public ServiceTestSpecificationDeleteEvent title(String title) {
-    this.title = title;
-    return this;
-  }
-
-  /**
-   * The title of the event.
-   * @return title
-  **/
-  @Schema(description = "The title of the event.")
-  
-    public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public ServiceTestSpecificationDeleteEvent description(String description) {
-    this.description = description;
-    return this;
-  }
-
-  /**
-   * An explnatory of the event.
-   * @return description
-  **/
-  @Schema(description = "An explnatory of the event.")
-  
-    public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public ServiceTestSpecificationDeleteEvent priority(String priority) {
-    this.priority = priority;
-    return this;
-  }
-
-  /**
-   * A priority.
-   * @return priority
-  **/
-  @Schema(description = "A priority.")
-  
-    public String getPriority() {
-    return priority;
-  }
-
-  public void setPriority(String priority) {
-    this.priority = priority;
-  }
-
-  public ServiceTestSpecificationDeleteEvent timeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-    return this;
-  }
-
-  /**
-   * The time the event occured.
-   * @return timeOcurred
-  **/
-  @Schema(description = "The time the event occured.")
-  
-    @Valid
-    public OffsetDateTime getTimeOcurred() {
-    return timeOcurred;
-  }
-
-  public void setTimeOcurred(OffsetDateTime timeOcurred) {
-    this.timeOcurred = timeOcurred;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationDeleteEvent serviceTestSpecificationDeleteEvent = (ServiceTestSpecificationDeleteEvent) o;
-    return Objects.equals(this.event, serviceTestSpecificationDeleteEvent.event) &&
-        Objects.equals(this.eventId, serviceTestSpecificationDeleteEvent.eventId) &&
-        Objects.equals(this.eventTime, serviceTestSpecificationDeleteEvent.eventTime) &&
-        Objects.equals(this.eventType, serviceTestSpecificationDeleteEvent.eventType) &&
-        Objects.equals(this.correlationId, serviceTestSpecificationDeleteEvent.correlationId) &&
-        Objects.equals(this.domain, serviceTestSpecificationDeleteEvent.domain) &&
-        Objects.equals(this.title, serviceTestSpecificationDeleteEvent.title) &&
-        Objects.equals(this.description, serviceTestSpecificationDeleteEvent.description) &&
-        Objects.equals(this.priority, serviceTestSpecificationDeleteEvent.priority) &&
-        Objects.equals(this.timeOcurred, serviceTestSpecificationDeleteEvent.timeOcurred);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(event, eventId, eventTime, eventType, correlationId, domain, title, description, priority, timeOcurred);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationDeleteEvent {\n");
-    
-    sb.append("    event: ").append(toIndentedString(event)).append("\n");
-    sb.append("    eventId: ").append(toIndentedString(eventId)).append("\n");
-    sb.append("    eventTime: ").append(toIndentedString(eventTime)).append("\n");
-    sb.append("    eventType: ").append(toIndentedString(eventType)).append("\n");
-    sb.append("    correlationId: ").append(toIndentedString(correlationId)).append("\n");
-    sb.append("    domain: ").append(toIndentedString(domain)).append("\n");
-    sb.append("    title: ").append(toIndentedString(title)).append("\n");
-    sb.append("    description: ").append(toIndentedString(description)).append("\n");
-    sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
-    sb.append("    timeOcurred: ").append(toIndentedString(timeOcurred)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEventPayload.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEventPayload.java
deleted file mode 100644
index c6bd5b0ef1ec3ad646c314ee1d01329696fe0648..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationDeleteEventPayload.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.springframework.validation.annotation.Validated;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The event data structure
- */
-@Schema(description = "The event data structure")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationDeleteEventPayload   {
-  @JsonProperty("serviceTestSpecification")
-  private ServiceTestSpecification serviceTestSpecification = null;
-
-  public ServiceTestSpecificationDeleteEventPayload serviceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-    return this;
-  }
-
-  /**
-   * Get serviceTestSpecification
-   * @return serviceTestSpecification
-  **/
-  @Schema(description = "")
-  
-    @Valid
-    public ServiceTestSpecification getServiceTestSpecification() {
-    return serviceTestSpecification;
-  }
-
-  public void setServiceTestSpecification(ServiceTestSpecification serviceTestSpecification) {
-    this.serviceTestSpecification = serviceTestSpecification;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ServiceTestSpecificationDeleteEventPayload serviceTestSpecificationDeleteEventPayload = (ServiceTestSpecificationDeleteEventPayload) o;
-    return Objects.equals(this.serviceTestSpecification, serviceTestSpecificationDeleteEventPayload.serviceTestSpecification);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(serviceTestSpecification);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ServiceTestSpecificationDeleteEventPayload {\n");
-    
-    sb.append("    serviceTestSpecification: ").append(toIndentedString(serviceTestSpecification)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationRef.java
deleted file mode 100644
index 7f91da2295c70c2f082cfe29542e3ad7bc1bd39b..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationRef.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-
-/**
- * The service test specification used by the service test.
- */
-@Schema(description = "The service test specification used by the service test.")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMServiceTestSpecificationRef")
-@Table(name = "STMServiceTestSpecificationRef")
-public class ServiceTestSpecificationRef extends BaseRootEntity {
-	@JsonProperty("id")
-	private String id = null;
-
-	@JsonProperty("version")
-	private String version = null;
-
-	@JsonProperty("@referredType")
-	private String _atReferredType = null;
-
-
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public ServiceTestSpecificationRef href(String href) {
-		this.href = href;
-		return this;
-	}
-
-	/**
-	 * Hyperlink to access a service test specification.
-	 * 
-	 * @return href
-	 **/
-	@Schema(description = "Hyperlink to access a service test specification.")
-
-	public String getHref() {
-		return href;
-	}
-
-	public void setHref(String href) {
-		this.href = href;
-	}
-
-	public ServiceTestSpecificationRef version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Version of a service test specification
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Version of a service test specification ")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	
-
-	public ServiceTestSpecificationRef _atReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-		return this;
-	}
-
-	/**
-	 * The actual type of the target instance when needed for disambiguation.
-	 * 
-	 * @return _atReferredType
-	 **/
-	@Schema(description = "The actual type of the target instance when needed for disambiguation.")
-
-	public String getAtReferredType() {
-		return _atReferredType;
-	}
-
-	public void setAtReferredType(String _atReferredType) {
-		this._atReferredType = _atReferredType;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceTestSpecificationRef serviceTestSpecificationRef = (ServiceTestSpecificationRef) o;
-		return Objects.equals(this.id, serviceTestSpecificationRef.id)
-				&& Objects.equals(this.href, serviceTestSpecificationRef.href)
-				&& Objects.equals(this.version, serviceTestSpecificationRef.version)
-				&& Objects.equals(this.baseType, serviceTestSpecificationRef.baseType)
-				&& Objects.equals(this.schemaLocation, serviceTestSpecificationRef.schemaLocation)
-				&& Objects.equals(this.type, serviceTestSpecificationRef.type)
-				&& Objects.equals(this._atReferredType, serviceTestSpecificationRef._atReferredType);
-	}
-
-//	@Override
-//	public int hashCode() {
-//		return Objects.hash(id, href, version, baseType, schemaLocation, type, _atReferredType);
-//	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceTestSpecificationRef {\n");
-
-		sb.append("    id: ").append(toIndentedString(id)).append("\n");
-		sb.append("    href: ").append(toIndentedString(href)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("    _atReferredType: ").append(toIndentedString(_atReferredType)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationUpdate.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationUpdate.java
deleted file mode 100644
index e780bb8196162e3fa212b98267c977ac83527670..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestSpecificationUpdate.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.AttachmentRefOrValue;
-import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * The service test specification describes the service test in terms of
- * parameters to be configured and measures to be taken. Skipped properties:
- * id,href,validFor
- */
-@Schema(description = "The service test specification describes the service test in terms of parameters to be configured and  measures to be taken. Skipped properties: id,href,validFor")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestSpecificationUpdate {
-	@JsonProperty("description")
-	protected String description = null;
-
-	@JsonProperty("isBundle")
-	protected Boolean isBundle = null;
-
-	protected OffsetDateTime lastUpdate = null;
-
-	@JsonProperty("lifecycleStatus")
-	protected String lifecycleStatus = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	@JsonProperty("version")
-	protected String version = null;
-
-	@JsonProperty("attachment")
-	@Valid
-	protected List<AttachmentRefOrValue> attachment = null;
-
-	@JsonProperty("constraint")
-	@Valid
-	protected List<ConstraintRef> constraint = null;
-
-	@JsonProperty("entitySpecRelationship")
-	@Valid
-	protected List<EntitySpecificationRelationship> entitySpecRelationship = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("relatedServiceSpecification")
-	@Valid
-	protected List<ServiceSpecificationRef> relatedServiceSpecification = null;
-
-	@JsonProperty("serviceTestSpecRelationship")
-	@Valid
-	protected List<ServiceTestSpecRelationship> serviceTestSpecRelationship = null;
-
-	@JsonProperty("specCharacteristic")
-	@Valid
-	protected List<CharacteristicSpecification> specCharacteristic = null;
-
-	@JsonProperty("targetEntitySchema")
-	protected TargetEntitySchema targetEntitySchema = null;
-
-	@JsonProperty("testMeasureDefinition")
-	@Valid
-	protected List<TestMeasureDefinition> testMeasureDefinition = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ServiceTestSpecificationUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of a service test specification.
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of a service test specification.")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceTestSpecificationUpdate isBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-		return this;
-	}
-
-	/**
-	 * isBundle determines whether an EntitySpecification represents a single
-	 * EntitySpecification (false), or a bundle of EntitySpecifications (true).
-	 * 
-	 * @return isBundle
-	 **/
-	@Schema(description = "isBundle determines whether an EntitySpecification represents a single EntitySpecification (false), or a bundle of EntitySpecifications (true).")
-
-	public Boolean isIsBundle() {
-		return isBundle;
-	}
-
-	public void setIsBundle(Boolean isBundle) {
-		this.isBundle = isBundle;
-	}
-
-	public ServiceTestSpecificationUpdate lastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-		return this;
-	}
-
-	/**
-	 * Date and time of the last update of this REST resource
-	 * 
-	 * @return lastUpdate
-	 **/
-	@Schema(description = "Date and time of the last update of this REST resource")
-
-	@Valid
-	public OffsetDateTime getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(OffsetDateTime lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	@JsonProperty("lastUpdate")
-	public String getLastUpdateStr() {
-		if (this.lastUpdate != null) {
-			return this.lastUpdate.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public ServiceTestSpecificationUpdate lifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-		return this;
-	}
-
-	/**
-	 * Used to indicate the current lifecycle status of this catalog item
-	 * 
-	 * @return lifecycleStatus
-	 **/
-	@Schema(description = "Used to indicate the current lifecycle status of this catalog item")
-
-	public String getLifecycleStatus() {
-		return lifecycleStatus;
-	}
-
-	public void setLifecycleStatus(String lifecycleStatus) {
-		this.lifecycleStatus = lifecycleStatus;
-	}
-
-	public ServiceTestSpecificationUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * Name given to this REST resource
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "Name given to this REST resource")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceTestSpecificationUpdate version(String version) {
-		this.version = version;
-		return this;
-	}
-
-	/**
-	 * Entity specification version
-	 * 
-	 * @return version
-	 **/
-	@Schema(description = "Entity specification version")
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public ServiceTestSpecificationUpdate attachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addAttachmentItem(AttachmentRefOrValue attachmentItem) {
-		if (this.attachment == null) {
-			this.attachment = new ArrayList<>();
-		}
-		this.attachment.add(attachmentItem);
-		return this;
-	}
-
-	/**
-	 * Attachments that may be of relevance to this specification, such as picture,
-	 * document, media
-	 * 
-	 * @return attachment
-	 **/
-	@Schema(description = "Attachments that may be of relevance to this specification, such as picture, document, media")
-	@Valid
-	public List<AttachmentRefOrValue> getAttachment() {
-		return attachment;
-	}
-
-	public void setAttachment(List<AttachmentRefOrValue> attachment) {
-		this.attachment = attachment;
-	}
-
-	public ServiceTestSpecificationUpdate constraint(List<ConstraintRef> constraint) {
-		this.constraint = constraint;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addConstraintItem(ConstraintRef constraintItem) {
-		if (this.constraint == null) {
-			this.constraint = new ArrayList<>();
-		}
-		this.constraint.add(constraintItem);
-		return this;
-	}
-
-	/**
-	 * This is a list of constraint references applied to this specification
-	 * 
-	 * @return constraint
-	 **/
-	@Schema(description = "This is a list of constraint references applied to this specification")
-	@Valid
-	public List<ConstraintRef> getConstraint() {
-		return constraint;
-	}
-
-	public void setConstraint(List<ConstraintRef> constraint) {
-		this.constraint = constraint;
-	}
-
-	public ServiceTestSpecificationUpdate entitySpecRelationship(
-			List<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addEntitySpecRelationshipItem(
-			EntitySpecificationRelationship entitySpecRelationshipItem) {
-		if (this.entitySpecRelationship == null) {
-			this.entitySpecRelationship = new ArrayList<>();
-		}
-		this.entitySpecRelationship.add(entitySpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * Relationship to another entity specification, might be dependency,
-	 * substitution, etc.
-	 * 
-	 * @return entitySpecRelationship
-	 **/
-	@Schema(description = "Relationship to another entity specification, might be dependency, substitution, etc.")
-	@Valid
-	public List<EntitySpecificationRelationship> getEntitySpecRelationship() {
-		return entitySpecRelationship;
-	}
-
-	public void setEntitySpecRelationship(List<EntitySpecificationRelationship> entitySpecRelationship) {
-		this.entitySpecRelationship = entitySpecRelationship;
-	}
-
-	public ServiceTestSpecificationUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Parties who manage or otherwise have an interest in this entity specification
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "Parties who manage or otherwise have an interest in this entity specification")
-	@Valid
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceTestSpecificationUpdate relatedServiceSpecification(
-			List<ServiceSpecificationRef> relatedServiceSpecification) {
-		this.relatedServiceSpecification = relatedServiceSpecification;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addRelatedServiceSpecificationItem(
-			ServiceSpecificationRef relatedServiceSpecificationItem) {
-		if (this.relatedServiceSpecification == null) {
-			this.relatedServiceSpecification = new ArrayList<>();
-		}
-		this.relatedServiceSpecification.add(relatedServiceSpecificationItem);
-		return this;
-	}
-
-	/**
-	 * The related service specification may relate to more than one service
-	 * specification.
-	 * 
-	 * @return relatedServiceSpecification
-	 **/
-	@Schema(description = "The related service specification may relate to more than one service specification.")
-	@Valid
-	public List<ServiceSpecificationRef> getRelatedServiceSpecification() {
-		return relatedServiceSpecification;
-	}
-
-	public void setRelatedServiceSpecification(List<ServiceSpecificationRef> relatedServiceSpecification) {
-		this.relatedServiceSpecification = relatedServiceSpecification;
-	}
-
-	public ServiceTestSpecificationUpdate serviceTestSpecRelationship(
-			List<ServiceTestSpecRelationship> serviceTestSpecRelationship) {
-		this.serviceTestSpecRelationship = serviceTestSpecRelationship;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addServiceTestSpecRelationshipItem(
-			ServiceTestSpecRelationship serviceTestSpecRelationshipItem) {
-		if (this.serviceTestSpecRelationship == null) {
-			this.serviceTestSpecRelationship = new ArrayList<>();
-		}
-		this.serviceTestSpecRelationship.add(serviceTestSpecRelationshipItem);
-		return this;
-	}
-
-	/**
-	 * A list of service test specifications related to this specification e.g.
-	 * dependency, substitution
-	 * 
-	 * @return serviceTestSpecRelationship
-	 **/
-	@Schema(description = "A list of service test specifications related to this specification e.g. dependency, substitution")
-	@Valid
-	public List<ServiceTestSpecRelationship> getServiceTestSpecRelationship() {
-		return serviceTestSpecRelationship;
-	}
-
-	public void setServiceTestSpecRelationship(List<ServiceTestSpecRelationship> serviceTestSpecRelationship) {
-		this.serviceTestSpecRelationship = serviceTestSpecRelationship;
-	}
-
-	public ServiceTestSpecificationUpdate specCharacteristic(List<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addSpecCharacteristicItem(
-			CharacteristicSpecification specCharacteristicItem) {
-		if (this.specCharacteristic == null) {
-			this.specCharacteristic = new ArrayList<>();
-		}
-		this.specCharacteristic.add(specCharacteristicItem);
-		return this;
-	}
-
-	/**
-	 * List of characteristics that the entity can take
-	 * 
-	 * @return specCharacteristic
-	 **/
-	@Schema(description = "List of characteristics that the entity can take")
-	@Valid
-	public List<CharacteristicSpecification> getSpecCharacteristic() {
-		return specCharacteristic;
-	}
-
-	public void setSpecCharacteristic(List<CharacteristicSpecification> specCharacteristic) {
-		this.specCharacteristic = specCharacteristic;
-	}
-
-	public ServiceTestSpecificationUpdate targetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-		return this;
-	}
-
-	/**
-	 * Get targetEntitySchema
-	 * 
-	 * @return targetEntitySchema
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TargetEntitySchema getTargetEntitySchema() {
-		return targetEntitySchema;
-	}
-
-	public void setTargetEntitySchema(TargetEntitySchema targetEntitySchema) {
-		this.targetEntitySchema = targetEntitySchema;
-	}
-
-	public ServiceTestSpecificationUpdate testMeasureDefinition(List<TestMeasureDefinition> testMeasureDefinition) {
-		this.testMeasureDefinition = testMeasureDefinition;
-		return this;
-	}
-
-	public ServiceTestSpecificationUpdate addTestMeasureDefinitionItem(
-			TestMeasureDefinition testMeasureDefinitionItem) {
-		if (this.testMeasureDefinition == null) {
-			this.testMeasureDefinition = new ArrayList<>();
-		}
-		this.testMeasureDefinition.add(testMeasureDefinitionItem);
-		return this;
-	}
-
-	/**
-	 * A list of definitions for the measurements for the test defined by this
-	 * specification
-	 * 
-	 * @return testMeasureDefinition
-	 **/
-	@Schema(description = "A list of definitions for the measurements for the test defined by this specification")
-	@Valid
-	public List<TestMeasureDefinition> getTestMeasureDefinition() {
-		return testMeasureDefinition;
-	}
-
-	public void setTestMeasureDefinition(List<TestMeasureDefinition> testMeasureDefinition) {
-		this.testMeasureDefinition = testMeasureDefinition;
-	}
-
-	public ServiceTestSpecificationUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceTestSpecificationUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceTestSpecificationUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class Extensible name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceTestSpecificationUpdate serviceTestSpecificationUpdate = (ServiceTestSpecificationUpdate) o;
-		return Objects.equals(this.description, serviceTestSpecificationUpdate.description)
-				&& Objects.equals(this.isBundle, serviceTestSpecificationUpdate.isBundle)
-				&& Objects.equals(this.lastUpdate, serviceTestSpecificationUpdate.lastUpdate)
-				&& Objects.equals(this.lifecycleStatus, serviceTestSpecificationUpdate.lifecycleStatus)
-				&& Objects.equals(this.name, serviceTestSpecificationUpdate.name)
-				&& Objects.equals(this.version, serviceTestSpecificationUpdate.version)
-				&& Objects.equals(this.attachment, serviceTestSpecificationUpdate.attachment)
-				&& Objects.equals(this.constraint, serviceTestSpecificationUpdate.constraint)
-				&& Objects.equals(this.entitySpecRelationship, serviceTestSpecificationUpdate.entitySpecRelationship)
-				&& Objects.equals(this.relatedParty, serviceTestSpecificationUpdate.relatedParty)
-				&& Objects.equals(this.relatedServiceSpecification,
-						serviceTestSpecificationUpdate.relatedServiceSpecification)
-				&& Objects.equals(this.serviceTestSpecRelationship,
-						serviceTestSpecificationUpdate.serviceTestSpecRelationship)
-				&& Objects.equals(this.specCharacteristic, serviceTestSpecificationUpdate.specCharacteristic)
-				&& Objects.equals(this.targetEntitySchema, serviceTestSpecificationUpdate.targetEntitySchema)
-				&& Objects.equals(this.testMeasureDefinition, serviceTestSpecificationUpdate.testMeasureDefinition)
-				&& Objects.equals(this.baseType, serviceTestSpecificationUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceTestSpecificationUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceTestSpecificationUpdate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(description, isBundle, lastUpdate, lifecycleStatus, name, version, attachment, constraint,
-				entitySpecRelationship, relatedParty, relatedServiceSpecification, serviceTestSpecRelationship,
-				specCharacteristic, targetEntitySchema, testMeasureDefinition, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceTestSpecificationUpdate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    isBundle: ").append(toIndentedString(isBundle)).append("\n");
-		sb.append("    lastUpdate: ").append(toIndentedString(lastUpdate)).append("\n");
-		sb.append("    lifecycleStatus: ").append(toIndentedString(lifecycleStatus)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    version: ").append(toIndentedString(version)).append("\n");
-		sb.append("    attachment: ").append(toIndentedString(attachment)).append("\n");
-		sb.append("    constraint: ").append(toIndentedString(constraint)).append("\n");
-		sb.append("    entitySpecRelationship: ").append(toIndentedString(entitySpecRelationship)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    relatedServiceSpecification: ").append(toIndentedString(relatedServiceSpecification))
-				.append("\n");
-		sb.append("    serviceTestSpecRelationship: ").append(toIndentedString(serviceTestSpecRelationship))
-				.append("\n");
-		sb.append("    specCharacteristic: ").append(toIndentedString(specCharacteristic)).append("\n");
-		sb.append("    targetEntitySchema: ").append(toIndentedString(targetEntitySchema)).append("\n");
-		sb.append("    testMeasureDefinition: ").append(toIndentedString(testMeasureDefinition)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestUpdate.java b/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestUpdate.java
deleted file mode 100644
index a0f2c5febf9e8e92f82e714aedfe8cabfbf7a0d7..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/ServiceTestUpdate.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.etsi.osl.tmf.common.model.service.ServiceRef;
-import org.etsi.osl.tmf.prm669.model.RelatedParty;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.Valid;
-
-/**
- * A service test is an entity that exists for a controlled test invocation on a
- * service. The service test is executed according to a schedule and contains
- * service test configuration parameters that are to be applied at execution
- * time, and service test measures that result. Skipped properties: id,href
- */
-@Schema(description = "A service test is an entity that exists for a controlled test invocation on a service. The service  test is executed according to a schedule and contains service test configuration parameters that are to be  applied at execution time, and service test measures that result. Skipped properties: id,href")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-public class ServiceTestUpdate {
-	@JsonProperty("description")
-	protected String description = null;
-
-	protected OffsetDateTime endDateTime = null;
-
-	@JsonProperty("mode")
-	protected String mode = null;
-
-	@JsonProperty("name")
-	protected String name = null;
-
-	protected OffsetDateTime startDateTime = null;
-
-	@JsonProperty("state")
-	protected String state = null;
-
-	@JsonProperty("characteristic")
-	@Valid
-	protected List<Characteristic> characteristic = null;
-
-	@JsonProperty("relatedParty")
-	@Valid
-	protected List<RelatedParty> relatedParty = null;
-
-	@JsonProperty("relatedService")
-	protected ServiceRef relatedService = null;
-
-	@JsonProperty("testMeasure")
-	@Valid
-	protected List<TestMeasure> testMeasure = null;
-
-	@JsonProperty("testSpecification")
-	protected ServiceTestSpecificationRef testSpecification = null;
-
-	@JsonProperty("validFor")
-	protected TimePeriod validFor = null;
-
-	@JsonProperty("@baseType")
-	protected String baseType = null;
-
-	@JsonProperty("@schemaLocation")
-	protected String schemaLocation = null;
-
-	@JsonProperty("@type")
-	protected String type = null;
-
-	public ServiceTestUpdate description(String description) {
-		this.description = description;
-		return this;
-	}
-
-	/**
-	 * Description of the service test
-	 * 
-	 * @return description
-	 **/
-	@Schema(description = "Description of the service test")
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public ServiceTestUpdate endDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-		return this;
-	}
-
-	/**
-	 * The end date and time of the service test
-	 * 
-	 * @return endDateTime
-	 **/
-	@Schema(description = "The end date and time of the service test")
-
-	@Valid
-	public OffsetDateTime getEndDateTime() {
-		return endDateTime;
-	}
-
-	public void setEndDateTime(OffsetDateTime endDateTime) {
-		this.endDateTime = endDateTime;
-	}
-
-	@JsonProperty("endDateTime")
-	public String getEndDateStr() {
-		if (this.endDateTime != null) {
-			return this.endDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	public ServiceTestUpdate mode(String mode) {
-		this.mode = mode;
-		return this;
-	}
-
-	/**
-	 * An indication of whether the service test is running in \"PROACTIVE\" or
-	 * \"ONDEMAND\" mode
-	 * 
-	 * @return mode
-	 **/
-	@Schema(description = "An indication of whether the service test is running in  \"PROACTIVE\" or \"ONDEMAND\" mode")
-
-	public String getMode() {
-		return mode;
-	}
-
-	public void setMode(String mode) {
-		this.mode = mode;
-	}
-
-	public ServiceTestUpdate name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * The name of the service test
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "The name of the service test")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public ServiceTestUpdate startDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-		return this;
-	}
-
-	/**
-	 * The start date and time of the service test.
-	 * 
-	 * @return startDateTime
-	 **/
-	@Schema(description = "The start date and time of the service test.")
-
-	@Valid
-	public OffsetDateTime getStartDateTime() {
-		return startDateTime;
-	}
-
-	public void setStartDateTime(OffsetDateTime startDateTime) {
-		this.startDateTime = startDateTime;
-	}
-	
-
-	@JsonProperty("startDateTime")
-	public String getStartDateTimeStr() {
-		if (this.startDateTime != null) {
-			return this.startDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-
-	public ServiceTestUpdate state(String state) {
-		this.state = state;
-		return this;
-	}
-
-	/**
-	 * The actual state the service test is in
-	 * 
-	 * @return state
-	 **/
-	@Schema(description = "The actual state the service test is in")
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-
-	public ServiceTestUpdate characteristic(List<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-		return this;
-	}
-
-	public ServiceTestUpdate addCharacteristicItem(Characteristic characteristicItem) {
-		if (this.characteristic == null) {
-			this.characteristic = new ArrayList<>();
-		}
-		this.characteristic.add(characteristicItem);
-		return this;
-	}
-
-	/**
-	 * List of characteristics with values that define the test run
-	 * 
-	 * @return characteristic
-	 **/
-	@Schema(description = "List of characteristics with values that define the test run")
-	@Valid
-	public List<Characteristic> getCharacteristic() {
-		return characteristic;
-	}
-
-	public void setCharacteristic(List<Characteristic> characteristic) {
-		this.characteristic = characteristic;
-	}
-
-	public ServiceTestUpdate relatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-		return this;
-	}
-
-	public ServiceTestUpdate addRelatedPartyItem(RelatedParty relatedPartyItem) {
-		if (this.relatedParty == null) {
-			this.relatedParty = new ArrayList<>();
-		}
-		this.relatedParty.add(relatedPartyItem);
-		return this;
-	}
-
-	/**
-	 * Party related to the test
-	 * 
-	 * @return relatedParty
-	 **/
-	@Schema(description = "Party related to the test")
-	@Valid
-	public List<RelatedParty> getRelatedParty() {
-		return relatedParty;
-	}
-
-	public void setRelatedParty(List<RelatedParty> relatedParty) {
-		this.relatedParty = relatedParty;
-	}
-
-	public ServiceTestUpdate relatedService(ServiceRef relatedService) {
-		this.relatedService = relatedService;
-		return this;
-	}
-
-	/**
-	 * Get relatedService
-	 * 
-	 * @return relatedService
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ServiceRef getRelatedService() {
-		return relatedService;
-	}
-
-	public void setRelatedService(ServiceRef relatedService) {
-		this.relatedService = relatedService;
-	}
-
-	public ServiceTestUpdate testMeasure(List<TestMeasure> testMeasure) {
-		this.testMeasure = testMeasure;
-		return this;
-	}
-
-	public ServiceTestUpdate addTestMeasureItem(TestMeasure testMeasureItem) {
-		if (this.testMeasure == null) {
-			this.testMeasure = new ArrayList<>();
-		}
-		this.testMeasure.add(testMeasureItem);
-		return this;
-	}
-
-	/**
-	 * The results of the test in terms of the measured metrics
-	 * 
-	 * @return testMeasure
-	 **/
-	@Schema(description = "The results of the test in terms of the measured metrics")
-	@Valid
-	public List<TestMeasure> getTestMeasure() {
-		return testMeasure;
-	}
-
-	public void setTestMeasure(List<TestMeasure> testMeasure) {
-		this.testMeasure = testMeasure;
-	}
-
-	public ServiceTestUpdate testSpecification(ServiceTestSpecificationRef testSpecification) {
-		this.testSpecification = testSpecification;
-		return this;
-	}
-
-	/**
-	 * Get testSpecification
-	 * 
-	 * @return testSpecification
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public ServiceTestSpecificationRef getTestSpecification() {
-		return testSpecification;
-	}
-
-	public void setTestSpecification(ServiceTestSpecificationRef testSpecification) {
-		this.testSpecification = testSpecification;
-	}
-
-	public ServiceTestUpdate validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	public ServiceTestUpdate baseType(String baseType) {
-		this.baseType = baseType;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the super-class
-	 * 
-	 * @return baseType
-	 **/
-	@Schema(description = "When sub-classing, this defines the super-class")
-
-	public String getAtBaseType() {
-		return baseType;
-	}
-
-	public void setAtBaseType(String baseType) {
-		this.baseType = baseType;
-	}
-
-	public ServiceTestUpdate schemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-		return this;
-	}
-
-	/**
-	 * A URI to a JSON-Schema file that defines additional attributes and
-	 * relationships
-	 * 
-	 * @return schemaLocation
-	 **/
-	@Schema(description = "A URI to a JSON-Schema file that defines additional attributes and relationships")
-
-	public String getAtSchemaLocation() {
-		return schemaLocation;
-	}
-
-	public void setAtSchemaLocation(String schemaLocation) {
-		this.schemaLocation = schemaLocation;
-	}
-
-	public ServiceTestUpdate type(String type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * When sub-classing, this defines the sub-class Extensible name
-	 * 
-	 * @return type
-	 **/
-	@Schema(description = "When sub-classing, this defines the sub-class Extensible name")
-
-	public String getAtType() {
-		return type;
-	}
-
-	public void setAtType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		ServiceTestUpdate serviceTestUpdate = (ServiceTestUpdate) o;
-		return Objects.equals(this.description, serviceTestUpdate.description)
-				&& Objects.equals(this.endDateTime, serviceTestUpdate.endDateTime)
-				&& Objects.equals(this.mode, serviceTestUpdate.mode)
-				&& Objects.equals(this.name, serviceTestUpdate.name)
-				&& Objects.equals(this.startDateTime, serviceTestUpdate.startDateTime)
-				&& Objects.equals(this.state, serviceTestUpdate.state)
-				&& Objects.equals(this.characteristic, serviceTestUpdate.characteristic)
-				&& Objects.equals(this.relatedParty, serviceTestUpdate.relatedParty)
-				&& Objects.equals(this.relatedService, serviceTestUpdate.relatedService)
-				&& Objects.equals(this.testMeasure, serviceTestUpdate.testMeasure)
-				&& Objects.equals(this.testSpecification, serviceTestUpdate.testSpecification)
-				&& Objects.equals(this.validFor, serviceTestUpdate.validFor)
-				&& Objects.equals(this.baseType, serviceTestUpdate.baseType)
-				&& Objects.equals(this.schemaLocation, serviceTestUpdate.schemaLocation)
-				&& Objects.equals(this.type, serviceTestUpdate.type);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(description, endDateTime, mode, name, startDateTime, state, characteristic, relatedParty,
-				relatedService, testMeasure, testSpecification, validFor, baseType, schemaLocation, type);
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class ServiceTestUpdate {\n");
-
-		sb.append("    description: ").append(toIndentedString(description)).append("\n");
-		sb.append("    endDateTime: ").append(toIndentedString(endDateTime)).append("\n");
-		sb.append("    mode: ").append(toIndentedString(mode)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    startDateTime: ").append(toIndentedString(startDateTime)).append("\n");
-		sb.append("    state: ").append(toIndentedString(state)).append("\n");
-		sb.append("    characteristic: ").append(toIndentedString(characteristic)).append("\n");
-		sb.append("    relatedParty: ").append(toIndentedString(relatedParty)).append("\n");
-		sb.append("    relatedService: ").append(toIndentedString(relatedService)).append("\n");
-		sb.append("    testMeasure: ").append(toIndentedString(testMeasure)).append("\n");
-		sb.append("    testSpecification: ").append(toIndentedString(testSpecification)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/TargetEntitySchema.java b/src/main/java/org/etsi/osl/tmf/stm653/model/TargetEntitySchema.java
deleted file mode 100644
index 225a8ded33a9fa859ac855d78c673e9d639ad6d6..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/TargetEntitySchema.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * The reference object to the schema and type of target entity which is described by a specification
- */
-@Schema(description = "The reference object to the schema and type of target entity which is described by a specification")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-
-@Entity(name = "STMTargetEntitySchema")
-@Table(name = "STMTargetEntitySchema")
-public class TargetEntitySchema  extends BaseRootEntity  {
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation = null;
-
-  @JsonProperty("@type")
-  private String type = null;
-
-  public TargetEntitySchema schemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-    return this;
-  }
-
-  /**
-   * This field provides a link to the schema describing the target entity
-   * @return schemaLocation
-  **/
-  @Schema(description = "This field provides a link to the schema describing the target entity")
-      @NotNull
-
-    public String getAtSchemaLocation() {
-    return schemaLocation;
-  }
-
-  public void setAtSchemaLocation(String schemaLocation) {
-    this.schemaLocation = schemaLocation;
-  }
-
-  public TargetEntitySchema type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Class type of the target entity
-   * @return type
-  **/
-  @Schema(description = "Class type of the target entity")
-      @NotNull
-
-    public String getAtType() {
-    return type;
-  }
-
-  public void setAtType(String type) {
-    this.type = type;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TargetEntitySchema targetEntitySchema = (TargetEntitySchema) o;
-    return Objects.equals(this.schemaLocation, targetEntitySchema.schemaLocation) &&
-        Objects.equals(this.type, targetEntitySchema.type);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(schemaLocation, type);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TargetEntitySchema {\n");
-    
-    sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasure.java b/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasure.java
deleted file mode 100644
index 3afd3efa52c260e19794618fee14e9b3bdfc050d..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasure.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.time.OffsetDateTime;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootEntity;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A TestMeasure specifies a measure of a specific aspect of a product, service,
- * or resource test, such as lost packets or connectivity status
- */
-@Schema(description = "A TestMeasure specifies a measure of a specific aspect of a product, service, or resource test, such as lost packets or connectivity status")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMTestMeasure")
-@Table(name = "STMTestMeasure")
-public class TestMeasure extends BaseRootEntity {
-	@JsonProperty("accuracy")
-	private Float accuracy = null;
-
-	private OffsetDateTime captureDateTime = null;
-
-	@JsonProperty("captureMethod")
-	private String captureMethod = null;
-
-	@JsonProperty("metricDescription")
-	private String metricDescription = null;
-
-	@JsonProperty("metricHref")
-	private String metricHref = null;
-
-	@JsonProperty("metricName")
-	private String metricName = null;
-
-	@JsonProperty("unitOfMeasure")
-	private String unitOfMeasure = null;
-
-	@JsonProperty("ruleViolation")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<MeasureThresholdRuleViolation> ruleViolation = new HashSet<>();
-
-	@JsonProperty("value")
-	@OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Characteristic value = null;
-
-	public TestMeasure accuracy(Float accuracy) {
-		this.accuracy = accuracy;
-		return this;
-	}
-
-	/**
-	 * The number of digits of accuracy captured for associated Metrics
-	 * 
-	 * @return accuracy
-	 **/
-	@Schema(description = "The number of digits of accuracy captured for associated Metrics")
-
-	public Float getAccuracy() {
-		return accuracy;
-	}
-
-	public void setAccuracy(Float accuracy) {
-		this.accuracy = accuracy;
-	}
-
-	public TestMeasure captureDateTime(OffsetDateTime captureDateTime) {
-		this.captureDateTime = captureDateTime;
-		return this;
-	}
-
-	/**
-	 * The date and time that the metric was captured
-	 * 
-	 * @return captureDateTime
-	 **/
-	@Schema(description = "The date and time that the metric was captured")
-
-	@Valid
-	public OffsetDateTime getCaptureDateTime() {
-		return captureDateTime;
-	}
-
-	public void setCaptureDateTime(OffsetDateTime captureDateTime) {
-		this.captureDateTime = captureDateTime;
-	}
-
-	public TestMeasure captureMethod(String captureMethod) {
-		this.captureMethod = captureMethod;
-		return this;
-	}
-
-	@JsonProperty("captureDateTime")
-	public String getcaptureDateTimeStr() {
-		if (this.captureDateTime != null) {
-			return this.captureDateTime.toString();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * The method used to capture the Metrics (This may be replaced by a set of
-	 * entities similar to the Performance Monitoring Ref)
-	 * 
-	 * @return captureMethod
-	 **/
-	@Schema(description = "The method used to capture the Metrics (This may be replaced by a set of entities similar to the Performance Monitoring Ref)")
-
-	public String getCaptureMethod() {
-		return captureMethod;
-	}
-
-	public void setCaptureMethod(String captureMethod) {
-		this.captureMethod = captureMethod;
-	}
-
-	public TestMeasure metricDescription(String metricDescription) {
-		this.metricDescription = metricDescription;
-		return this;
-	}
-
-	/**
-	 * Brief description of the metric
-	 * 
-	 * @return metricDescription
-	 **/
-	@Schema(description = "Brief description of the metric")
-
-	public String getMetricDescription() {
-		return metricDescription;
-	}
-
-	public void setMetricDescription(String metricDescription) {
-		this.metricDescription = metricDescription;
-	}
-
-	public TestMeasure metricHref(String metricHref) {
-		this.metricHref = metricHref;
-		return this;
-	}
-
-	/**
-	 * Hyperlink to access a metric for detail information
-	 * 
-	 * @return metricHref
-	 **/
-	@Schema(description = "Hyperlink to access a metric for detail information")
-
-	public String getMetricHref() {
-		return metricHref;
-	}
-
-	public void setMetricHref(String metricHref) {
-		this.metricHref = metricHref;
-	}
-
-	public TestMeasure metricName(String metricName) {
-		this.metricName = metricName;
-		return this;
-	}
-
-	/**
-	 * The name of the metric
-	 * 
-	 * @return metricName
-	 **/
-	@Schema(description = "The name of the metric")
-
-	public String getMetricName() {
-		return metricName;
-	}
-
-	public void setMetricName(String metricName) {
-		this.metricName = metricName;
-	}
-
-	public TestMeasure unitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * The unit of measure for the metric values, such as meters, cubic yards,
-	 * kilograms [ISO 1000].
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "The unit of measure for the metric values, such as meters, cubic yards, kilograms [ISO 1000].")
-
-	public String getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	public TestMeasure ruleViolation(Set<MeasureThresholdRuleViolation> ruleViolation) {
-		this.ruleViolation = ruleViolation;
-		return this;
-	}
-
-	public TestMeasure addRuleViolationItem(MeasureThresholdRuleViolation ruleViolationItem) {
-		if (this.ruleViolation == null) {
-			this.ruleViolation = new HashSet<>();
-		}
-		this.ruleViolation.add(ruleViolationItem);
-		return this;
-	}
-
-	/**
-	 * A list of rules that were violated in this test measure
-	 * 
-	 * @return ruleViolation
-	 **/
-	@Schema(description = "A list of rules that were violated in this test measure")
-	@Valid
-	public Set<MeasureThresholdRuleViolation> getRuleViolation() {
-		return ruleViolation;
-	}
-
-	public void setRuleViolation(Set<MeasureThresholdRuleViolation> ruleViolation) {
-		this.ruleViolation = ruleViolation;
-	}
-
-	public TestMeasure value(Characteristic value) {
-		this.value = value;
-		return this;
-	}
-
-	/**
-	 * Get value
-	 * 
-	 * @return value
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Characteristic getValue() {
-		return value;
-	}
-
-	public void setValue(Characteristic value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		TestMeasure testMeasure = (TestMeasure) o;
-		return Objects.equals(this.accuracy, testMeasure.accuracy)
-				&& Objects.equals(this.captureDateTime, testMeasure.captureDateTime)
-				&& Objects.equals(this.captureMethod, testMeasure.captureMethod)
-				&& Objects.equals(this.metricDescription, testMeasure.metricDescription)
-				&& Objects.equals(this.metricHref, testMeasure.metricHref)
-				&& Objects.equals(this.metricName, testMeasure.metricName)
-				&& Objects.equals(this.unitOfMeasure, testMeasure.unitOfMeasure)
-				&& Objects.equals(this.ruleViolation, testMeasure.ruleViolation)
-				&& Objects.equals(this.value, testMeasure.value) && Objects.equals(this.baseType, testMeasure.baseType)
-				&& Objects.equals(this.schemaLocation, testMeasure.schemaLocation)
-				&& Objects.equals(this.type, testMeasure.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(accuracy, captureDateTime, captureMethod, metricDescription, metricHref, metricName, unitOfMeasure, ruleViolation, value, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class TestMeasure {\n");
-
-		sb.append("    accuracy: ").append(toIndentedString(accuracy)).append("\n");
-		sb.append("    captureDateTime: ").append(toIndentedString(captureDateTime)).append("\n");
-		sb.append("    captureMethod: ").append(toIndentedString(captureMethod)).append("\n");
-		sb.append("    metricDescription: ").append(toIndentedString(metricDescription)).append("\n");
-		sb.append("    metricHref: ").append(toIndentedString(metricHref)).append("\n");
-		sb.append("    metricName: ").append(toIndentedString(metricName)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    ruleViolation: ").append(toIndentedString(ruleViolation)).append("\n");
-		sb.append("    value: ").append(toIndentedString(value)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}
diff --git a/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasureDefinition.java b/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasureDefinition.java
deleted file mode 100644
index f9353415c709931d00c106550f46e4b3b08eb79f..0000000000000000000000000000000000000000
--- a/src/main/java/org/etsi/osl/tmf/stm653/model/TestMeasureDefinition.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*-
- * ========================LICENSE_START=================================
- * org.etsi.osl.tmf.api
- * %%
- * Copyright (C) 2019 - 2021 openslice.io
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================LICENSE_END==================================
- */
-package org.etsi.osl.tmf.stm653.model;
-
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;
-import org.etsi.osl.tmf.common.model.TimePeriod;
-import org.springframework.validation.annotation.Validated;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.Valid;
-
-/**
- * A TestMeasureDefinition specifies a measure of a specific aspect of a
- * product, service, or resource test, such as lost packets or connectivity
- * status
- */
-@Schema(description = "A TestMeasureDefinition specifies a measure of a specific aspect of a product, service, or resource test, such as lost packets or connectivity status")
-@Validated
-@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-02-08T11:50:07.226173200+02:00[Europe/Athens]")
-
-@Entity(name = "STMTestMeasureDefinition")
-@Table(name = "STMTestMeasureDefinition")
-public class TestMeasureDefinition extends BaseRootNamedEntity {
-	@JsonProperty("captureFrequency")
-	private String captureFrequency = null;
-
-	@JsonProperty("captureMethod")
-	private String captureMethod = null;
-
-	@JsonProperty("metricDescription")
-	private String metricDescription = null;
-
-	@JsonProperty("metricHref")
-	private String metricHref = null;
-
-	@JsonProperty("metricName")
-	private String metricName = null;
-
-	@JsonProperty("unitOfMeasure")
-	private String unitOfMeasure = null;
-
-	@JsonProperty("valueType")
-	private String valueType = null;
-
-	@JsonProperty("capturePeriod")
-	private Duration capturePeriod = null;
-
-	@JsonProperty("thresholdRule")
-	@Valid
-	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
-	private Set<MetricDefMeasureThresholdRule> thresholdRule = null;
-
-	@JsonProperty("validFor")
-	private TimePeriod validFor = null;
-
-	public TestMeasureDefinition captureFrequency(String captureFrequency) {
-		this.captureFrequency = captureFrequency;
-		return this;
-	}
-
-	/**
-	 * The frequency of capture for the metric. Note: This may be replaced by a set
-	 * of entities similar to the Performance Monitoring
-	 * 
-	 * @return captureFrequency
-	 **/
-	@Schema(description = "The frequency of capture for the metric. Note: This may be replaced by a set of entities similar to the Performance Monitoring")
-
-	public String getCaptureFrequency() {
-		return captureFrequency;
-	}
-
-	public void setCaptureFrequency(String captureFrequency) {
-		this.captureFrequency = captureFrequency;
-	}
-
-	public TestMeasureDefinition captureMethod(String captureMethod) {
-		this.captureMethod = captureMethod;
-		return this;
-	}
-
-	/**
-	 * The method used to capture the Metric. Note: This may be replaced by a set of
-	 * entities similar to the Performance Monitoring
-	 * 
-	 * @return captureMethod
-	 **/
-	@Schema(description = "The method used to capture the Metric. Note: This may be replaced by a set of entities similar to the Performance Monitoring")
-
-	public String getCaptureMethod() {
-		return captureMethod;
-	}
-
-	public void setCaptureMethod(String captureMethod) {
-		this.captureMethod = captureMethod;
-	}
-
-	public TestMeasureDefinition metricDescription(String metricDescription) {
-		this.metricDescription = metricDescription;
-		return this;
-	}
-
-	/**
-	 * Brief description of the metric
-	 * 
-	 * @return metricDescription
-	 **/
-	@Schema(description = "Brief description of the metric")
-
-	public String getMetricDescription() {
-		return metricDescription;
-	}
-
-	public void setMetricDescription(String metricDescription) {
-		this.metricDescription = metricDescription;
-	}
-
-	public TestMeasureDefinition metricHref(String metricHref) {
-		this.metricHref = metricHref;
-		return this;
-	}
-
-	/**
-	 * Hyperlink to access a metric for detail information
-	 * 
-	 * @return metricHref
-	 **/
-	@Schema(description = "Hyperlink to access a metric for detail information")
-
-	public String getMetricHref() {
-		return metricHref;
-	}
-
-	public void setMetricHref(String metricHref) {
-		this.metricHref = metricHref;
-	}
-
-	public TestMeasureDefinition metricName(String metricName) {
-		this.metricName = metricName;
-		return this;
-	}
-
-	/**
-	 * The name of a metric that in the test measure
-	 * 
-	 * @return metricName
-	 **/
-	@Schema(description = "The name of a metric that in the test measure")
-
-	public String getMetricName() {
-		return metricName;
-	}
-
-	public void setMetricName(String metricName) {
-		this.metricName = metricName;
-	}
-
-	public TestMeasureDefinition name(String name) {
-		this.name = name;
-		return this;
-	}
-
-	/**
-	 * The name of the TestMeasureDefinition
-	 * 
-	 * @return name
-	 **/
-	@Schema(description = "The name of the TestMeasureDefinition")
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public TestMeasureDefinition unitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-		return this;
-	}
-
-	/**
-	 * Name of a service test specification
-	 * 
-	 * @return unitOfMeasure
-	 **/
-	@Schema(description = "Name of a service test specification")
-
-	public String getUnitOfMeasure() {
-		return unitOfMeasure;
-	}
-
-	public void setUnitOfMeasure(String unitOfMeasure) {
-		this.unitOfMeasure = unitOfMeasure;
-	}
-
-	public TestMeasureDefinition valueType(String valueType) {
-		this.valueType = valueType;
-		return this;
-	}
-
-	/**
-	 * A kind of value that the Metric value can take on, such as numeric, text, and
-	 * so forth
-	 * 
-	 * @return valueType
-	 **/
-	@Schema(description = "A kind of value that the Metric value can take on, such as numeric, text, and so forth")
-
-	public String getValueType() {
-		return valueType;
-	}
-
-	public void setValueType(String valueType) {
-		this.valueType = valueType;
-	}
-
-	public TestMeasureDefinition capturePeriod(Duration capturePeriod) {
-		this.capturePeriod = capturePeriod;
-		return this;
-	}
-
-	/**
-	 * Get capturePeriod
-	 * 
-	 * @return capturePeriod
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public Duration getCapturePeriod() {
-		return capturePeriod;
-	}
-
-	public void setCapturePeriod(Duration capturePeriod) {
-		this.capturePeriod = capturePeriod;
-	}
-
-	public TestMeasureDefinition thresholdRule(Set<MetricDefMeasureThresholdRule> thresholdRule) {
-		this.thresholdRule = thresholdRule;
-		return this;
-	}
-
-	public TestMeasureDefinition addThresholdRuleItem(MetricDefMeasureThresholdRule thresholdRuleItem) {
-		if (this.thresholdRule == null) {
-			this.thresholdRule = new HashSet<>();
-		}
-		this.thresholdRule.add(thresholdRuleItem);
-		return this;
-	}
-
-	/**
-	 * The rule(s) associated with the measure threshold
-	 * 
-	 * @return thresholdRule
-	 **/
-	@Schema(description = "The rule(s) associated with the measure threshold")
-	@Valid
-	public Set<MetricDefMeasureThresholdRule> getThresholdRule() {
-		return thresholdRule;
-	}
-
-	public void setThresholdRule(Set<MetricDefMeasureThresholdRule> thresholdRule) {
-		this.thresholdRule = thresholdRule;
-	}
-
-	public TestMeasureDefinition validFor(TimePeriod validFor) {
-		this.validFor = validFor;
-		return this;
-	}
-
-	/**
-	 * Get validFor
-	 * 
-	 * @return validFor
-	 **/
-	@Schema(description = "")
-
-	@Valid
-	public TimePeriod getValidFor() {
-		return validFor;
-	}
-
-	public void setValidFor(TimePeriod validFor) {
-		this.validFor = validFor;
-	}
-
-	@Override
-	public boolean equals(java.lang.Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		TestMeasureDefinition testMeasureDefinition = (TestMeasureDefinition) o;
-		return Objects.equals(this.captureFrequency, testMeasureDefinition.captureFrequency)
-				&& Objects.equals(this.captureMethod, testMeasureDefinition.captureMethod)
-				&& Objects.equals(this.metricDescription, testMeasureDefinition.metricDescription)
-				&& Objects.equals(this.metricHref, testMeasureDefinition.metricHref)
-				&& Objects.equals(this.metricName, testMeasureDefinition.metricName)
-				&& Objects.equals(this.name, testMeasureDefinition.name)
-				&& Objects.equals(this.unitOfMeasure, testMeasureDefinition.unitOfMeasure)
-				&& Objects.equals(this.valueType, testMeasureDefinition.valueType)
-				&& Objects.equals(this.capturePeriod, testMeasureDefinition.capturePeriod)
-				&& Objects.equals(this.thresholdRule, testMeasureDefinition.thresholdRule)
-				&& Objects.equals(this.validFor, testMeasureDefinition.validFor)
-				&& Objects.equals(this.baseType, testMeasureDefinition.baseType)
-				&& Objects.equals(this.schemaLocation, testMeasureDefinition.schemaLocation)
-				&& Objects.equals(this.type, testMeasureDefinition.type);
-	}
-
-//  @Override
-//  public int hashCode() {
-//    return Objects.hash(captureFrequency, captureMethod, metricDescription, metricHref, metricName, name, unitOfMeasure, valueType, capturePeriod, thresholdRule, validFor, baseType, schemaLocation, type);
-//  }
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append("class TestMeasureDefinition {\n");
-
-		sb.append("    captureFrequency: ").append(toIndentedString(captureFrequency)).append("\n");
-		sb.append("    captureMethod: ").append(toIndentedString(captureMethod)).append("\n");
-		sb.append("    metricDescription: ").append(toIndentedString(metricDescription)).append("\n");
-		sb.append("    metricHref: ").append(toIndentedString(metricHref)).append("\n");
-		sb.append("    metricName: ").append(toIndentedString(metricName)).append("\n");
-		sb.append("    name: ").append(toIndentedString(name)).append("\n");
-		sb.append("    unitOfMeasure: ").append(toIndentedString(unitOfMeasure)).append("\n");
-		sb.append("    valueType: ").append(toIndentedString(valueType)).append("\n");
-		sb.append("    capturePeriod: ").append(toIndentedString(capturePeriod)).append("\n");
-		sb.append("    thresholdRule: ").append(toIndentedString(thresholdRule)).append("\n");
-		sb.append("    validFor: ").append(toIndentedString(validFor)).append("\n");
-		sb.append("    baseType: ").append(toIndentedString(baseType)).append("\n");
-		sb.append("    schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");
-		sb.append("    type: ").append(toIndentedString(type)).append("\n");
-		sb.append("}");
-		return sb.toString();
-	}
-
-	/**
-	 * Convert the given object to string with each line indented by 4 spaces
-	 * (except the first line).
-	 */
-	private String toIndentedString(java.lang.Object o) {
-		if (o == null) {
-			return "null";
-		}
-		return o.toString().replace("\n", "\n    ");
-	}
-}