diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 839cb879c47bac02062c1b0a6f2e31a7c7a959e6..be16f50718a635e09977f3ffbac5fab21275eebc 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-11-05 { reference "CR-1443"; } 
   revision 2024-08-19 { reference "CR-1337 CR-1352"; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2024-04-04 { reference CR-1139; }
@@ -94,29 +95,39 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       uses types3gpp:PLMNId;
     } 
 
-    leaf-list x2BlockList {
-      type string;
+    list x2BlockList {
       description "List of nodes to which X2 connections are prohibited.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GeNBIdGrp;
     }
 
-    leaf-list x2AllowList {
-      type string;
+    list x2AllowList {
       description "List of nodes to which X2 connections are enforced.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GeNBIdGrp;
     }
 
-    leaf-list xnBlockList {
-      type string;
+    list xnBlockList {
       description "List of nodes to which Xn connections are prohibited.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GgNBIdGrp;
     }
 
-    leaf-list xnAllowList {
-      type string;
+    list xnAllowList {
       description "List of nodes to which X2 connections are enforced.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GgNBIdGrp;
     }
 
-    leaf-list xnHOBlockList {
-      type string;
+    list xnHOBlockList {
       description "List of nodes to which handovers over  Xn are prohibited.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GgNBIdGrp;
     }
 
     leaf configurable5QISetRef {
@@ -125,9 +136,11 @@ module _3gpp-nr-nrm-gnbcucpfunction {
         supports (is associated to).";
     }
 
-    leaf-list x2HOBlockList {
-      type string;
+    list x2HOBlockList {
       description "List of nodes to which handovers over X2 are prohibited.";
+      key idx;
+      leaf idx {type uint32;}
+      uses GeNBIdGrp;
     }
 
     leaf dynamic5QISetRef {
@@ -220,6 +233,39 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     }
   }
 
+  grouping GgNBIdGrp {
+    description "Represents the properties of a global gNB ID (GgNBId).";  
+
+    uses types3gpp:PLMNId;
+
+    leaf gnbIdLength {
+      type int32 {range "22..32";}
+		  mandatory true;
+      description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+    }
+
+    leaf gnbId {
+      description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
+        is part of the NR Cell Identifier (NCI) of the gNB cells.";
+      reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
+      mandatory true;
+      type int64 { range "0..4294967295"; }
+    }
+  }
+   
+  grouping GeNBIdGrp {
+    description "Represents the properties of a global eNB ID (GeNBId).";  
+    uses types3gpp:PLMNId;
+    
+    leaf enbId {
+      description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB
+        cells.";
+      reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413.";
+      mandatory true;
+      type int32 {range "0..4194303";}
+    }
+  }
+
   augment "/me3gpp:ManagedElement" {
 
     list GNBCUCPFunction {