diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java
index a086f14f99bc1956a8f67d7d5a321266e0bfa170..2ab966ab68e7ce403d1d7eba5e9c660891e01238 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java
@@ -3,6 +3,8 @@ package org.etsi.osl.tmf.gsm674.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.persistence.Table;
+import jakarta.persistence.Entity;
 import jakarta.validation.constraints.NotNull;
 import org.etsi.osl.tmf.common.model.BaseRootEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,7 +12,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 /**
  * ExternalIdentifier
  */
-
+@Entity(name = "ExternalIdentifier")
+@Table(name = "ExternalIdentifier")
 @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 ExternalIdentifier extends BaseRootEntity {
   @JsonProperty("owner")
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 fe9529bf6889d72ab91495d4809c5d50072cd9d7..c7645eb9f976b6620f365eb5ce621bc48fd82372 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
@@ -3,12 +3,14 @@ package org.etsi.osl.tmf.gsm674.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
-
+import jakarta.persistence.Entity;
 /**
  * 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")
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 270708d999a7a57b6a87f4a7ab142ff3b63f77a6..acb69d2991e4f8e43f2e698cd6ab54696b502452 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
@@ -5,14 +5,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
 import java.util.List;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
-
+import jakarta.persistence.Entity;
 /**
  * GeographicSubAddressValue
  */
 
-
+@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")
@@ -36,6 +40,7 @@ public class GeographicSubAddressValue {
 
   @Valid
   @JsonProperty("subUnit")
+  @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
   private List<GeographicSubAddressUnit> subUnit = new ArrayList<>();
   @JsonProperty("subAddressType")
   private String subAddressType;
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
index b52f3c1bf38b98891cb7a94c051566ae94749907..f0daca2ac63b8777a9aad83a8bc7e0a7bc1bbb53 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java
@@ -8,6 +8,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 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.constraints.NotNull;
 import org.etsi.osl.tmf.common.model.BaseRootEntity;
 
@@ -26,13 +30,22 @@ import org.etsi.osl.tmf.common.model.BaseRootEntity;
         @JsonSubTypes.Type(value = PlaceRefOrValue.class, name = "PlaceRefOrValue")
 })
 
+@Table(name = "PlaceRefOrValue")
+@Entity(name = "PlaceRefOrValue")
 @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 PlaceRefOrValue extends BaseRootEntity {
 
+    @JsonProperty("geographicAddress")
+    @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+    private GeographicAddressValue geographicAddressValue;
     public PlaceRefOrValue() {
         super();
     }
 
+    public PlaceRefOrValue(GeographicAddressValue geographicAddressValue) {
+        this.geographicAddressValue = geographicAddressValue;
+    }
+
     /**
      * Constructor with only required parameters
      */
@@ -102,21 +115,16 @@ public class PlaceRefOrValue extends BaseRootEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        PlaceRefOrValue placeRefOrValue = (PlaceRefOrValue) o;
-        return Objects.equals(this.type, placeRefOrValue.type) &&
-                Objects.equals(this.baseType, placeRefOrValue.baseType) &&
-                Objects.equals(this.schemaLocation, placeRefOrValue.schemaLocation);
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        PlaceRefOrValue that = (PlaceRefOrValue) o;
+        return Objects.equals(geographicAddressValue, that.geographicAddressValue);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, baseType, schemaLocation);
+        return Objects.hash(geographicAddressValue);
     }
 
     @Override
@@ -126,6 +134,7 @@ public class PlaceRefOrValue extends BaseRootEntity {
         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("    geographicAddress: ").append(toIndentedString(geographicAddressValue)).append("\n");
         sb.append("}");
         return sb.toString();
     }