diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang
index 59ddcb2c3d8f01c7259d7c1def06aa58ec5da1ee..c15fa0806500dcaa3450deb9669aa1821038da9e 100755
--- a/yang-models/_3gpp-5g-common-yang-types.yang
+++ b/yang-models/_3gpp-5g-common-yang-types.yang
@@ -15,6 +15,7 @@ module _3gpp-5g-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2025-11-02 { reference CR-1658 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-03-25 { reference CR-1489 ; }
   revision 2024-11-01 { reference CR-1405; }
@@ -114,7 +115,7 @@ module _3gpp-5g-common-yang-types {
       min-elements 1;
       max-elements 1;
       key "sst sd";
-      uses types5g3gpp:SNssai;
+      uses SNssai;
     }
 
     list dnnSmfInfoList {
@@ -405,4 +406,133 @@ module _3gpp-5g-common-yang-types {
     }
   }
 
+    grouping CaraConfigurationGrp {
+    description "This data type represents the configuration used for mobile 
+    NR node (e.g., IAB-node, MWAB-node) to perform certificate enrolment procedure with
+    Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3";
+    
+    leaf caraAddress {
+      type inet:host;
+      description "IP address or FQDN of the CMP (Certificate Management Protocol) server";
+    }
+
+    leaf portNumber {
+        type inet:port-number;     
+        description "This parameter specifies the port number used by 
+        CMP (Certificate Management Protocol) server. The port for HTTP/HTTPSs 
+        transfer of CMP messages is not explicitly given in RFC 9811, therefore
+        this parameter is required. The port number is usually 
+        represented as 2 octets.";
+    }
+    
+    leaf path {
+        type inet:uri;
+        mandatory true;        
+        description "This parameter specifies the path (in ASCII string) to 
+          the CMP server directory. A CMP server may be located in an 
+          arbitrary path other than root.";
+    }
+
+    leaf subjectName {
+        type string;
+        mandatory true;        
+        description "This parameter specifies the subject name (in ASCII 
+          string) of the CA/RA. The use is described in 3GPP TS 33.310
+          clause 9.5.3.";
+    }
+
+    leaf protocol {
+        type enumeration {
+          enum HTTP;
+          enum HTTPS;
+        }
+        description "This parameter specifies the protocol (HTTP or HTTPS) 
+          to be used for certificate enrolment. The use is described in 
+          3GPP TS 33.310 clause 9.6.";
+    }
+  }
+  
+  grouping MnrOamIPConfigGrp { 
+    description "This data type includes the configutation for OAM connectivity  
+      used for mobile NR node (e.g., IAB-node, MWAB-node) to establish connection with
+      management system. The configuration attributes include: 
+      Configuration of certification authority (CA/RA) server, 
+      Configuration of security gateway (SeGW), and 
+      Configuration of software configuration server (SCS)";
+    
+    list caraConfiguration {
+      description "configuration used for mobile NR node (e.g., IAB-node, MWAB-node)
+        to perform certificate enrolment procedure as specified in TS 28.315.";
+      uses CaraConfigurationGrp;
+      max-elements 1;
+      key caraAddress; 
+    }
+
+    leaf seGwConfiguration {
+      description "this parameter specifies IP address or
+        FQDN of security gateway (SeGW) used for mobile NR 
+        node (e.g., IAB-node, MWAB-node) to establish secure connection 
+        as specified in TS 28.315.";
+      type inet:host;
+
+    }
+
+    leaf scsConfiguration {
+      description "this parameter specifies IP address or FQDN of 
+        configuration server (SCS) used for mobile NR node 
+        (e.g., IAB-node, MWAB-node) to establish connection as
+        specified in TS 28.315.";        
+      type inet:host; 
+    }
+  }
+
+  grouping LocationInfoGrp {
+    description "This data type contains location information 
+      of mobile NR node (e.g., IAB-node, MWAB-node).";
+    
+    leaf gNBId {
+      type int64 { range "0..4294967295"; }
+      description "It is either the gNB ID of the IAB-donor-CU that target IAB-DU
+      connects to or the gNB Id of the IAB-nonor-CU that serves IAB-MT, or
+      the gNBId of the gNB that serves MWAB-UE.";
+    }
+
+    list pLMNId {
+      uses types3gpp:PLMNId;
+      max-elements 1;
+      description "The PLMN ID where IAB-MT or MWAB-UE is connected to";
+      key "mcc mnc";
+    }
+
+    leaf cellLocalId {
+      type int32 { range "0..16383"; }
+      description "Identifies an NR cell where IAB-MT or MWAB-UE 
+      is connected to.";
+    }
+
+    leaf nRTAC {
+      type types5g3gpp:NRTAC;
+      description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is 
+        connected.";
+    }
+
+    list tAI {
+      uses types3gpp:TaiGrp;
+      key idx;
+      leaf idx { type string; }
+      max-elements 1; 
+      description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining
+        to the cells where IAB-MT or MWAB-UE is connected";
+    }
+    list geoArea {
+      uses types3gpp:GeoAreaGrp;
+      key idx;
+      leaf idx {type string;}
+      max-elements 1;       
+      description "It specifies geographical area of mobile NR node
+      (e.g., IAB-node or MWAB-node).";
+    }
+  }
+
+
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-iabfunction.yang b/yang-models/_3gpp-nr-nrm-iabfunction.yang
index 80004ae190bb6c58bc9579e2ff7bb6bef9e59769..07279bc88afb2ad4618f62c0ee7fae61de771cd0 100644
--- a/yang-models/_3gpp-nr-nrm-iabfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-iabfunction.yang
@@ -3,8 +3,7 @@ module _3gpp-nr-nrm-iabfunction {
   namespace "urn:3gpp:sa5:_3gpp-nr-nrm-iabfunction";
   prefix "iab3gpp";
 
-  import ietf-inet-types { prefix inet; }
-  import _3gpp-common-yang-types { prefix types3gpp; }
+
   import _3gpp-common-top { prefix top3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
@@ -17,158 +16,34 @@ module _3gpp-nr-nrm-iabfunction {
   TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310,
     IETF RFC 9811";
-
+    
+  revision 2025-11-02 { reference "CR-1658" ; }
   revision 2025-10-01 { reference "CR-1617" ; }
   revision 2025-08-15 { reference "CR-1598"; }
 
-  grouping CaraConfigurationGrp {
-    description "This data type represents the configuration used for mobile 
-    NR node (e.g., IAB-node) to perform certificate enrolment procedure with
-    Certification Authority server (CA/RA) as specified in TS 28.315 clause 5.3";
-    
-    leaf caraAddress {
-      type inet:host;
-      description "IP address or FQDN of CA/RA server";
-    }
-
-    leaf portNumber {
-        type inet:port-number;     
-        description "This parameter specifies the port number used by 
-        CMP (Certificate Management Protocol) server. The port for HTTP/HTTPSs 
-        transfer of CMP messages is not explicitly given in RFC 9811, therefore
-        this parameter is required. The port number is usually 
-        represented as 2 octets.";
-    }
-    
-    leaf path {
-        type inet:uri;
-        mandatory true;        
-        description "This parameter specifies the path (in ASCII string) to 
-          the CMP server directory. A CMP server may be located in an 
-          arbitrary path other than root.";
-    }
-
-    leaf subjectName {
-        type string;
-        mandatory true;        
-        description "This parameter specifies the subject name (in ASCII 
-          string) of the CA/RA. The use is described in 3GPP TS 33.310
-          clause 9.5.3.";
-    }
-
-    leaf protocol {
-        type enumeration {
-          enum HTTP;
-          enum HTTPS;
-        }
-        description "This parameter specifies the protocol (HTTP or HTTPS) 
-          to be used for certificate enrolment. The use is described in 
-          3GPP TS 33.310 clause 9.6.";
-    }
-  }
-  
-  grouping MnrOamIPConfigGrp { 
-    description "This data type includes the configutation for OAM connectivity  
-      used for mobile NR node (e.g., IAB-node) to establish connection with
-      management system. The configuration attributes include: 
-      Configuration of certification authority (CA/RA) server, 
-      Configuration of security gateway (SeGW), and 
-      Configuration of software configuration server (SCS)";
-    
-    list caraConfiguration {
-      description "configuration used for mobile NR node (e.g., IAB-node)
-        to perform certificate enrolment procedure as specified in TS 28.315.";
-      uses CaraConfigurationGrp;
-      max-elements 1;
-      key caraAddress; 
-    }
-
-    leaf seGwConfiguration {
-      description "configuration of security
-        gateway (SeGW) used for mobile NR node (e.g., IAB-node) to establish
-         secure connection as specified in TS 28.315.";
-      type inet:host;
-
-    }
-
-    leaf scsConfiguration {
-      description "configuration of software 
-        configuration server (SCS) used for mobile NR node (e.g., IAB-node)
-         to establish connection to SCS as specified in TS 28.315.";        
-      type inet:host; 
-    }
-  }
-
-  grouping LocationInfoGrp {
-    description "This data type contains location information 
-      of mobile NR node (e.g., IAB-node).";
-    
-    leaf gNBId {
-      type int64 { range "0..4294967295"; }
-      description "It is either the gNB ID of the IAB-donor-CU that target IAB-DU
-      connects to or the gNB Id of the IAB-nonor-CU that serves IAB-MT";
-    }
-
-    list pLMNId {
-      uses types3gpp:PLMNId;
-      max-elements 1;
-      description "The PLMN ID where IAB-MT or MWAB-UE is connected to";
-      key "mcc mnc";
-    }
-
-    leaf cellLocalId {
-      type int32 { range "0..16383"; }
-      description "Identifies an NR cell where IAB-MT or MWAB-UE 
-      is connected to.";
-    }
-
-    leaf nRTAC {
-      type types5g3gpp:NRTAC;
-      description "It is TAC pertaining to the cells where IAB-MT or MWAB-UE is 
-        connected.";
-    }
-
-    list tAI {
-      uses types3gpp:TaiGrp;
-      key idx;
-      leaf idx { type string; }
-      max-elements 1; 
-      description "It is the TAI (see subclause 9.3.3.11 in TS 38.413) pertaining
-        to the cells where IAB-MT or MWAB-UE is connected";
-    }
-    list geoArea {
-      uses types3gpp:GeoAreaGrp;
-      key idx;
-      leaf idx {type string;}
-      max-elements 1;       
-      description "It specifies geographical area of mobile NR node
-      (e.g., IAB-node or MWAB).";
-    }
-  }
-
   grouping IABGrp {
     description "IAB-node architecture is specified in TS 38.401. This IOC
      defines the configuration information for the IAB management, it is name 
      contained by SubNetwork or ManagedElement";
 
     list mnrOamIPConfig  {
-      description "It is IP configutation for OAM connectivity used IAB-node 
+      description "It is IP configutation for OAM connectivity used by 
+      a mobile NR node (e.g., IAB-node, MWAB-node)
       to establish connection with management system as specified
        in TS 28.314[x] clause 6.1.2";
 
       key id;
       leaf id { type uint32; }
-      uses MnrOamIPConfigGrp ;
+      uses types5g3gpp:MnrOamIPConfigGrp ;
     }
 
-    list locationInfo {
-      description "It is Location information of IAB-node that is used for 
-      IAB-node OAM connection and IAB configuration as specified in
-       TS 28.314 clause 6.1.2 and TS 28.531 clause 5.1.27";
+    list currentLocation {
+      description "This parameter specifies the current location 
+       of mobile NR node (e.g., IAB-node, MWAB-node).";
 
       key id;
       leaf id { type uint32; }
-      uses LocationInfoGrp;
+      uses types5g3gpp:LocationInfoGrp;
     }
   }
   
diff --git a/yang-models/_3gpp-nr-nrm-mwab.yang b/yang-models/_3gpp-nr-nrm-mwab.yang
index 9f8af2af9575b54b16c11f95b2ac6c136b62f2cc..6bb57f5cde6ac0fb0703db206ce794697309bedb 100644
--- a/yang-models/_3gpp-nr-nrm-mwab.yang
+++ b/yang-models/_3gpp-nr-nrm-mwab.yang
@@ -5,6 +5,8 @@ module _3gpp-nr-nrm-mwab {
 
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -15,10 +17,21 @@ module _3gpp-nr-nrm-mwab {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-11-02 { reference CR-1658 ; }
   revision 2025-04-25 { reference CR-1527 ; }
 
   grouping MWABGrp {
-    description "Represets the ExternalENBFunction IOC.";
+    description "Represents the MWAB IOC.";
+    
+    list mnrOamIPConfig  {
+      description "It is IP configutation for OAM connectivity used 
+        by a mobile NR node (e.g., IAB-node, MWAB-node)
+        to establish connection with management system as specified
+       in TS 28.314[x] clause 6.1.2";
+      key id;
+      leaf id { type uint32; }
+      uses types5g3gpp:MnrOamIPConfigGrp ;
+    }
 
     leaf operationalState {
       description "It indicates the operational state of the MWAB instance.
@@ -58,8 +71,16 @@ module _3gpp-nr-nrm-mwab {
       leaf idx { type uint32 ; }
       uses types3gpp:TimeWindowGrp;
     }
+    list currentLocation {
+      description "This parameter specifies the current location
+        of mobile NR node (e.g., IAB-node, MWAB-node).";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:LocationInfoGrp;
+    }
   }
 
+
   grouping MWABSubTree {
     list MWAB {
       description "MWAB provides an NR access link to UEs in proximity and