diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicAddressValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicAddressValue.java
index 94b74d45797dd5f4a2ac52415d01de1575b7c754..3b44ca672546da70ac3f1109c7dce72940c9de23 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicAddressValue.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicAddressValue.java
@@ -6,7 +6,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
 import jakarta.validation.Valid;
 
 
@@ -37,6 +39,7 @@ public class GeographicAddressValue extends PlaceRefOrValue {
   @JsonProperty("streetType")
   private String streetType;
   @JsonProperty("geographicSubAddress")
+  @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
   private GeographicSubAddressValue geographicSubAddress;
   @JsonProperty("city")
   private String city;
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
index 889e3185aea05e192583b86f6c4f1282ab397d9b..893daeae7079b61d5ed1113d2f2d83fa7d304a53 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
@@ -27,6 +27,7 @@ public class GeographicSite extends BaseRootEntity implements PatchGeographicSit
     @JsonProperty("status")
     private String status;
     @JsonProperty("externalIdentifier")
+    @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
     private List<ExternalIdentifier> externalIdentifier = new ArrayList<>();
     @JsonProperty("calendar")
     @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
index c7645eb9f976b6620f365eb5ce621bc48fd82372..06545f9bb5c281b517a82e147b9fca0a0b16fa1c 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java
@@ -6,20 +6,16 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 import jakarta.persistence.Entity;
+import org.etsi.osl.tmf.common.model.BaseRootEntity;
+
 /**
  * GeographicSubAddressUnit
  */
 @Entity(name = "GeographicSubAddressUnit")
 @Table(name = "GeographicSubAddressUnit")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
-public class GeographicSubAddressUnit {
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation;
-  @JsonProperty("@baseType")
-  private String baseType;
-  @JsonProperty("@type")
-  private String type;
-  @JsonProperty("subUnitNumber")
+public class GeographicSubAddressUnit extends BaseRootEntity {
+   @JsonProperty("subUnitNumber")
   private String subUnitNumber;
   @JsonProperty("subUnitType")
   private String subUnitType;
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
index acb69d2991e4f8e43f2e698cd6ab54696b502452..e1ad6e9cd2c202e1803202df55f2df27aaa6cd79 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java
@@ -11,6 +11,8 @@ import jakarta.persistence.Table;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import jakarta.persistence.Entity;
+import org.etsi.osl.tmf.common.model.BaseRootEntity;
+
 /**
  * GeographicSubAddressValue
  */
@@ -18,13 +20,7 @@ import jakarta.persistence.Entity;
 @Entity(name = "GeographicSubAddressValue")
 @Table(name = "GeographicSubAddressValue")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
-public class GeographicSubAddressValue {
-  @JsonProperty("@type")
-  private String type;
-  @JsonProperty("@baseType")
-  private String baseType;
-  @JsonProperty("@schemaLocation")
-  private String schemaLocation;
+public class GeographicSubAddressValue extends BaseRootEntity {
   @JsonProperty("buildingName")
   private String buildingName;
   @JsonProperty("levelNumber")