diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang
index 75786fb27af3923b91782746359c9cd448eb42fc..e78863dec45599ec60d1b8e0a229632a422f33cd 100755
--- a/yang-models/_3gpp-5g-common-yang-types.yang
+++ b/yang-models/_3gpp-5g-common-yang-types.yang
@@ -3,17 +3,18 @@ module _3gpp-5g-common-yang-types {
   namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";
   prefix "types5g3gpp";
   
-  import ietf-yang-types { prefix yang; }
+
   import _3gpp-common-yang-types { prefix types3gpp; }
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The model defines common types for 5G networks and 
     network slicing.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-10-06 { reference CR-1389; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
@@ -76,27 +77,6 @@ module _3gpp-5g-common-yang-types {
       d) For a 5G SA (Stand Alone), it has a non-null value.";
   }
   
-  grouping SNssai {
-    description 
-      "Single Network Slice Selection Assistance Information(S-NSSAI)";
-    reference "3GPP TS 23.003";
-  
-    leaf sd {
-      description "Slice Differentiator
-        If not needed, the value can be set to ff:ff:ff.";
-      type yang:hex-string {
-        length 8;
-      }
-      reference "3GPP TS 23.003";
-    }
-    
-    leaf sst {
-      type uint8;
-      description "Slice/Service Type.
-         Values 0 to 127 belong to standardized SST range and are defined in 
-         3GPP TS 23.501. Values 128 to 255 belong to operator-specific range.";
-    }
-  }
     
   grouping PlmnIdNid {
     description "Represents the SCP domain specific information as defined 
@@ -120,7 +100,7 @@ module _3gpp-5g-common-yang-types {
       comprised of an SST (Slice/Service type) and an optional 
       SD (Slice Differentiator) field";
     uses types3gpp:PLMNId;
-    uses SNssai;
+    uses types3gpp:SNssai;
   }
 
   typedef CommModelType {
diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
index 58ece735b655411f76a9c28422358c38268e97bd..a4ce535e2d90053a63e603a31217489aace20d48 100755
--- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang
@@ -5,18 +5,19 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
   prefix gtpUPathQMCtrl3gpp;
   
   import _3gpp-common-managed-element { prefix me3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the capabilities and properties for control 
     of GTP-U path QoS monitoring defined in 3GPP TS 23.501.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2020-09-30 { reference "CR-0393"; }
@@ -70,7 +71,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
       description "The S-NSSAIs for which the the GTP-U path QoS monitoring is 
         to be performed.";
       reference "3GPP TS 23.003";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
      }
      
     leaf-list monitoredDSCPs {
diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
index e951d0cf2e7821f0d6e307db3da79ab005fcdf0e..9985b8e1cf61431620ee26d46e301b80e836f91a 100755
--- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
+++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang
@@ -7,8 +7,7 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl {
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
-
+  import _3gpp-common-yang-types { prefix types3gpp; }
   organization "3gpp SA5";  
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the capabilities and properties for control 
@@ -19,6 +18,7 @@ in 3GPP TS 23.501.
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2023-09-24 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
   revision 2020-08-03 { reference "CR-0321"; }
@@ -63,7 +63,7 @@ in 3GPP TS 23.501.
        per UE is to be performed.";
       reference "3GPP TS 23.003";
       key "sd sst";
-           uses types5g3gpp:SNssai;}
+           uses types3gpp:SNssai;}
      
     leaf-list qFMonitored5QIs {
       description "The 5QIs for which the QoS monitoring per QoS flow 
diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang
index b28a1a52179696bd6ca57b02c45a3c4d303cf8a2..9cfa036173ea4cf43e8eaf6eb82d05a0024d5e1c 100755
--- a/yang-models/_3gpp-5gc-nrm-amffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang
@@ -10,7 +10,7 @@ module _3gpp-5gc-nrm-amffunction {
   import ietf-inet-types { prefix inet; }
   import ietf-yang-types { prefix yang; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;}
+  import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; }
   import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
 
   organization "3gpp SA5";
@@ -20,6 +20,7 @@ module _3gpp-5gc-nrm-amffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
   
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2024-10-06 { reference CR-1389; }
   revision 2024-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; } 
@@ -236,7 +237,7 @@ module _3gpp-5gc-nrm-amffunction {
       key idx;
       unique "sst sd";
       leaf idx { type uint32; }
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
   }
   
diff --git a/yang-models/_3gpp-5gc-nrm-amfregion.yang b/yang-models/_3gpp-5gc-nrm-amfregion.yang
index f44940dac5113e4e07c949c76da0e2164d07c2a0..f1b85d44d7db295ddcb7cab59e45f645f0450957 100755
--- a/yang-models/_3gpp-5gc-nrm-amfregion.yang
+++ b/yang-models/_3gpp-5gc-nrm-amfregion.yang
@@ -13,10 +13,11 @@ module _3gpp-5gc-nrm-amfregion {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AMF Region which consists one or
     multiple AMF Sets.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
@@ -57,7 +58,7 @@ module _3gpp-5gc-nrm-amfregion {
       //conditional support only if the network slicing feature is supported.
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     leaf aMFRegionId {
diff --git a/yang-models/_3gpp-5gc-nrm-amfset.yang b/yang-models/_3gpp-5gc-nrm-amfset.yang
index 9473afee3fec86eabc21c7af67455943287243a5..e9a16136f65af5f5eb288034f50682a1b0bedcd2 100755
--- a/yang-models/_3gpp-5gc-nrm-amfset.yang
+++ b/yang-models/_3gpp-5gc-nrm-amfset.yang
@@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-amfset {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
@@ -56,7 +57,7 @@ module _3gpp-5gc-nrm-amfset {
       //conditional support only if the network slicing feature is supported.
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     leaf aMFRegion {
diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang
index fec93a992b19aa759b837ad63150e5ea8292deeb..c62337c47ff158232998116299db1db38d5c1e29 100755
--- a/yang-models/_3gpp-5gc-nrm-neffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang
@@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-neffunction {
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-yang-extensions { prefix yext3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
   
   organization "3gpp SA5";
@@ -21,6 +20,7 @@ module _3gpp-5gc-nrm-neffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557 ; }
   revision 2024-05-18 { reference CR-1273 ; } 
   revision 2024-04-12 { reference CR-1218 ; } 
   revision 2023-09-18 { reference CR-1103 ; }
@@ -55,7 +55,7 @@ module _3gpp-5gc-nrm-neffunction {
       min-elements 1;
       key idx;
       leaf idx { type uint32 ; }
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list dnnInfoList{
@@ -290,7 +290,7 @@ module _3gpp-5gc-nrm-neffunction {
         An S-NSSAI has an SST (Slice/Service type) and an optional SD
         (Slice Differentiator) field.";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
 
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-nfprofile.yang
index 15dc5e0a1b9c10f942fe333f4f00e11d5da889a5..0cc63e3d6a1c83dc5eea3d7cd2a1b4d9cdba0215 100755
--- a/yang-models/_3gpp-5gc-nrm-nfprofile.yang
+++ b/yang-models/_3gpp-5gc-nrm-nfprofile.yang
@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "NF profile class.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
   
+  revision 2025-08-25 { reference CR-1557 ; } 
   revision 2024-04-12 { reference CR-1218 ; } 
   revision 2023-11-18 { reference CR-1103 ; }
   revision 2023-09-18 { reference CR-1043 ; } 
@@ -40,16 +41,7 @@ module _3gpp-5gc-nrm-nfprofile {
       mandatory true;
       type NFStatus;
     }
-    
-    leaf heartBeatTimer {
-      description "Time in seconds expected between 2 consecutive
-                   heart-beat messages from an NF Instance to the NRF.
-                   It may be included in the registration request.
-                   When present in the request it shall contain the
-                   heartbeat time proposed by the NF service consumer.";
-      type uint16;
-    }
-    
+     
     list plmnList {
       description "PLMN(s) of the Network Function.
         This IE shall be present if this information
@@ -70,27 +62,7 @@ module _3gpp-5gc-nrm-nfprofile {
       key "sst sd";
       uses Snssai;
     }
-    
-    list perPlmnSnssaiList {
-      description "This IE may be included when the list of
-       S-NSSAIs supported by the NF for each PLMN it is supporting
-        is different. When present, this IE shall include the S-NSSAIs
-         supported by the Network Function for each PLMN supported by
-          the Network Function. When present, this IE shall
-           override sNssais IE.";
-      min-elements 1;
-      key idx; 
-      leaf idx { type uint32; }
-      uses PlmnSnssai;
-    }
-    
-    leaf-list nsiList {
-      description "NSI identities of the Network Function.
-                   If not provided, the NF can serve any NSI.";
-                   min-elements 1;
-      type string;
-    }
-    
+       
     leaf fqdn {
       description "FQDN of the Network Function. For AMF, the
        FQDN registered with the NRF shall be that of the AMF Name.";
@@ -103,83 +75,7 @@ module _3gpp-5gc-nrm-nfprofile {
         for inter-PLMN routing is specified.";
       type inet:domain-name;
     }
-    
-    leaf-list ipv4Addresses {
-      description "IPv4 address(es) of the Network Function.";
-      min-elements 1;
-      type inet:ipv4-address;
-    }
-    
-    leaf-list ipv6Addresses {
-      description "IPv6 address(es) of the Network Function.";
-      min-elements 1;
-      type inet:ipv6-address;
-    }
-    
-    list allowedPlmns {
-      description "PLMNs allowed to access the NF instance.
-                   If not provided, any PLMN is allowed to access the NF.";
-      
-      min-elements 1;
-      key "mcc mnc";
-      uses types3gpp:PLMNId;
-    }
-    
-    leaf-list allowedNfTypes {
-      description "Type of the NFs allowed to access the NF instance.
-                   If not provided, any NF type is allowed to access the NF.";
-      min-elements 1;
-      type types3gpp:NfType;
-    }
-    
-    leaf-list allowedNfDomains {
-      description "Pattern representing the NF domain names allowed 
-      to access the NF instance. If not provided, 
-      any NF domain is allowed to access the NF.";
-      min-elements 1;
-      type string;
-    }
-    
-    list allowedNssais { 
-      description "S-NSSAI of the allowed slices to access the NF instance.
-                   If not provided, any slice is allowed to access the NF.";
-      min-elements 1;
-      key "sst sd";
-      uses Snssai;
-    }
-    
-    leaf priority {
-      description "Priority (relative to other NFs of the same type)
-       in the range of 0-65535, to be used for NF selection;
-                   lower values indicate a higher priority.
-                    If priority is also present in the nfServiceList
-                     parameters,
-                   those will have precedence over this value. 
-                   The NRF may overwrite the received priority value
-                    when exposing
-                   an NFProfile with the Nnrf_NFDiscovery service.";
-      type uint16;
-    }
-    
-    leaf capacity {
-      description "Static capacity information in the range of 0-65535,
-       expressed as a weight relative to other NF instances of
-        the same type; if capacity is also present in the nfServiceList
-         parameters, those will have precedence over this value.";
-      type uint16;
-    }
-    
-    leaf load {
-      description "Dynamic load information, ranged from 0 to 100,
-       indicates the current load percentage of the NF.";
-      type types3gpp:Load;
-    }
-    
-    leaf locality {
-      description "Operator defined information about the location
-       of the NF instance (e.g. geographic location, data center).";
-      type string;
-    }
+
     
     grouping udrInfo {
       
diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang
index 82cf61e877afc9c176cef6aa8af3b5df98617b2b..2dfd8ea5d8cc66331e1cd2764d42a39585988da4 100755
--- a/yang-models/_3gpp-5gc-nrm-nfservice.yang
+++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang
@@ -7,7 +7,6 @@ module _3gpp-5gc-nrm-nfservice {
   import _3gpp-common-yang-types { prefix types3gpp; }
   import ietf-yang-types { prefix yang; }
   import ietf-inet-types { prefix inet; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -16,6 +15,7 @@ module _3gpp-5gc-nrm-nfservice {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-01-25 { reference CR-0454 ; }
   revision 2020-11-05 { reference CR-0412 ; }
@@ -133,7 +133,7 @@ module _3gpp-5gc-nrm-nfservice {
       min-elements 1;
       //optional support
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     leaf priority {
diff --git a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
index 2c8c1a4fb08a95567e2143ae740828119f1a1e8c..b7fdcfd3998b0e5b11b4f0feff5f1deeeec2f2bb 100755
--- a/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-ngeirfunction.yang
@@ -49,7 +49,7 @@ module _3gpp-5gc-nrm-ngeirfunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
index 25507c96a06d34749cc73e19bfcd27090210c93f..bb4f311161d62f84291fa8fab8e336f2742c85b0 100755
--- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
@@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-nrffunction {
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
   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";
@@ -20,6 +19,7 @@ module _3gpp-5gc-nrm-nrffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -66,7 +66,7 @@ module _3gpp-5gc-nrm-nrffunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list nFProfileList {
diff --git a/yang-models/_3gpp-5gc-nrm-nssffunction.yang b/yang-models/_3gpp-5gc-nrm-nssffunction.yang
index 315ae9ebcb5fe386566487b0defd21c051c147e8..ec22c27b5ee2dd3577b81ec3c953be9ce416322c 100755
--- a/yang-models/_3gpp-5gc-nrm-nssffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nssffunction.yang
@@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-nssffunction {
   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; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NSSF function in 5GC. For more 
     information about the NSSF, see 3GPP TS 23.501.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-nssffunction {
       
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     leaf-list cNSIIdList {
diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index a5256f4c745a525022cda8b95b9a94592bb6c3bc..8c39bda67f4cb5060b08cfad2066bce6c1aac89c 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-08-06 { reference CR-1130; } 
   revision 2024-04-12 { reference CR-1218; } 
   revision 2023-09-18 { reference CR-1043; } 
@@ -100,7 +101,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
         supporting.";
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list trackingAreaList {
@@ -257,7 +258,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
       leaf idx {
         type string;
       }
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     leaf-list cNSIId {
@@ -291,7 +292,6 @@ module _3gpp-5gc-nrm-nwdaffunction {
       key "idx";
       leaf idx { type uint32; }
       uses types3gpp:PLMNId;
-      uses types5g3gpp:SNssai;
     }
     
     leaf sBIFQDN {
diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
index 673c13acc2eb11880d4c3a42dcaace31ff520599..39c04624bfd91c1a3587ba533267364703c22d00 100755
--- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
@@ -19,6 +19,7 @@ module _3gpp-5gc-nrm-pcffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -58,7 +59,7 @@ module _3gpp-5gc-nrm-pcffunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang
index ca37a43d4c235d3cd8fa4b866f4f5c4e03a38fe8..3434b290c77a7166bfab3bd5604276b6ac7a9f24 100755
--- a/yang-models/_3gpp-5gc-nrm-smffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang
@@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-smffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -61,7 +62,7 @@ module _3gpp-5gc-nrm-smffunction {
                    (Slice Differentiator) field.";
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
index 319015d161e6b5a43788d8085889afe7453c88d9..4cb9781030ff40b7827571661464a1c9f20a9d52 100755
--- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
@@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-udmfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDM function in 5GC. For more 
     information about the UDM, see 3GPP TS 23.501.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -56,7 +57,7 @@ module _3gpp-5gc-nrm-udmfunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
index 1118fd1431dbcd7d2f73380054494f9fe96194fa..c8524d627071fdafe4311792f11b0da3e623e1d7 100755
--- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
@@ -9,16 +9,16 @@ module _3gpp-5gc-nrm-udrfunction {
   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; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the UDR function in 5GC. For more information 
     about the UDR, see 3GPP TS 23.501.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-udrfunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-udsffunction.yang b/yang-models/_3gpp-5gc-nrm-udsffunction.yang
index 553ca7d5aa35cc2a288da7e5de96d66b71323d9f..fb11ce46db9cc169edb71a43455ae2c060ee2f66 100755
--- a/yang-models/_3gpp-5gc-nrm-udsffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udsffunction.yang
@@ -9,7 +9,6 @@ module _3gpp-5gc-nrm-udsffunction {
   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; }
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -19,6 +18,7 @@ module _3gpp-5gc-nrm-udsffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2020-11-08 { reference CR-0412 ; }
@@ -56,7 +56,7 @@ module _3gpp-5gc-nrm-udsffunction {
       //optional support
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang
index 0c4a89df44c48865d6feb192e050397147fd531a..460f26a1d9b9fb30d66a04967b7e1c8a051c3fd0 100755
--- a/yang-models/_3gpp-5gc-nrm-upffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang
@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-upffunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "UPFFunction derived from basic ManagedFunction.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -52,7 +53,7 @@ module _3gpp-5gc-nrm-upffunction {
                   (Slice Differentiator) field.";
       reference "3GPP TS 23.003";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list managedNFProfile {
diff --git a/yang-models/_3gpp-common-managed-function.yang b/yang-models/_3gpp-common-managed-function.yang
index ea4390cc348f5167fb4501fdb3fcbd70c2a9d8a3..efa2a1f3a9508e7d4de7a17e8657abd5c99a4f1f 100755
--- a/yang-models/_3gpp-common-managed-function.yang
+++ b/yang-models/_3gpp-common-managed-function.yang
@@ -13,7 +13,7 @@ module _3gpp-common-managed-function {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "The module defines a base class/grouping for major 3GPP 
     functions.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference 
     "3GPP TS 28.622 
@@ -24,6 +24,7 @@ module _3gpp-common-managed-function {
     3GPP TS 28.620 
     Umbrella Information Model (UIM)";
 
+  revision 2025-08-06 { reference CR-0550; }
   revision 2024-02-24 { reference CR-0346; } 
   revision 2023-09-18 { reference CR-0271; } 
   revision 2023-04-26 { reference CR-0250; }
@@ -118,7 +119,7 @@ module _3gpp-common-managed-function {
 
     leaf administrativeState  {
       type types3gpp:BasicAdministrativeState;
-      mandatory true;
+      default LOCKED;
       description "Permission to use or prohibition against using the instance";
     }
 
diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang
index a1c17734b7a65ca18bb540ca9c97b91f717e7831..31f7e901edc1fd9533023de9f319cce3e31c2080 100755
--- a/yang-models/_3gpp-common-measurements.yang
+++ b/yang-models/_3gpp-common-measurements.yang
@@ -56,6 +56,7 @@ module _3gpp-common-measurements {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2025-08-06 { reference CR-0550; }
   revision 2025-05-18 { reference CR-0531; }
   revision 2025-02-05 { reference CR-0460; }
   revision 2025-01-28 { reference CR-0511; } 
@@ -103,12 +104,6 @@ module _3gpp-common-measurements {
         group of vendor specific performance metrics.";
     }
 
-    leaf thresholdLevel {
-      type uint64;
-      mandatory true;
-      description "Number (key) for a single threshold in the threshold list
-        applicable to the monitored performance metric.";
-    }
 
     leaf thresholdDirection {
       type enumeration {
@@ -248,7 +243,7 @@ module _3gpp-common-measurements {
     description "Represents the attributes of the IOC PerfMetricJob";
 
     leaf administrativeState {
-      default UNLOCKED;
+      default LOCKED;
       type types3gpp:BasicAdministrativeState ;
       description "Enable or disables production of the metrics";
     }
@@ -339,7 +334,7 @@ module _3gpp-common-measurements {
         to monitor.";
 
     leaf administrativeState {
-      default UNLOCKED;
+      default LOCKED;
       type types3gpp:BasicAdministrativeState ;
       description "Enables or disables the ThresholdMonitor.";
     }
diff --git a/yang-models/_3gpp-common-qmcjob.yang b/yang-models/_3gpp-common-qmcjob.yang
index 9ae62e2144a9c410553de03eb57f14a0b269bcda..c450b1cb16554759abd4c4bf9e6d69a522993aec 100644
--- a/yang-models/_3gpp-common-qmcjob.yang
+++ b/yang-models/_3gpp-common-qmcjob.yang
@@ -7,7 +7,6 @@ module _3gpp-common-qmcjob {
   import _3gpp-common-subnetwork { prefix subnet3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-yang-extensions { prefix yext3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-trace { prefix trace3gpp; }
   import ietf-inet-types { prefix inet; }
@@ -27,6 +26,7 @@ module _3gpp-common-qmcjob {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2024-11-05 { reference "CR-0470"; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-02-14 { reference "CR-0234"; }
@@ -111,7 +111,7 @@ module _3gpp-common-qmcjob {
         Assistance Information).  A Network Slice end to end is identified by
         S-NSSAI.";
       key "sd sst";
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
 
     leaf qMCConfigFile {
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 460ea4b21b417a4178973eb99b3604e698991fb7..d9543ce95a5eddcbed43553b4e4ef69f04d673d9 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,6 +25,7 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2025-06-24 { reference "CR-0550" ; }
   revision 2025-05-06 { reference "CR-0531 CR-0535" ; }
   revision 2025-02-06 { reference "CR-0503 CR-0507" ; }
   revision 2025-02-05 { reference "CR-0460" ; }
@@ -225,10 +226,13 @@ module _3gpp-common-trace {
       uses types3gpp:PLMNId;  // mcc+mnc
       
       leaf traceId {
-        type string;
+        type string {
+          pattern "[0-9a-fA-F]{6}";
+        }
         mandatory true;
         description "An identifier, which identifies the Trace 
-          (together with MCC and MNC). This is a 3 byte Octet String.";
+          (together with MCC and MNC). This is a 3 byte Octet String,
+          expressed in hexadecimal form e.g., '1a7b3d').";
       }
   }
   
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index e8bd963e1b98c392c1b151e0c49371b99b0c10a9..8a1ac529493b75eb200cf5c5ba65c58d7a4c68a3 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -16,6 +16,7 @@ module _3gpp-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2025-02-18 { reference CR-0511; } 
   revision 2025-02-06 { reference CR-0507; } 
   revision 2024-05-18 { reference CR-0359; } 
@@ -116,7 +117,27 @@ module _3gpp-common-yang-types {
       yext3gpp:inVariant;
     }
   }  
+  grouping SNssai {
+    description 
+      "Single Network Slice Selection Assistance Information(S-NSSAI)";
+    reference "3GPP TS 23.003";
   
+    leaf sd {
+      description "Slice Differentiator
+        If not needed, the value can be set to ff:ff:ff.";
+      type yang:hex-string {
+        length 8;
+      }
+      reference "3GPP TS 23.003";
+    }
+    
+    leaf sst {
+      type uint8;
+      description "Slice/Service Type.
+         Values 0 to 127 belong to standardized SST range and are defined in 
+         3GPP TS 23.501. Values 128 to 255 belong to operator-specific range.";
+    }
+  }  
   grouping ProcessMonitorGrp {
     description "Provides attributes to monitor the progress of processes 
       with specific purpose and limited lifetime running on MnS producers. 
@@ -333,7 +354,43 @@ module _3gpp-common-yang-types {
       enum OFF;
     }
   }
-  
+  grouping SPNInfoIdGrp {
+    description "This data type represents the SNPN identification
+    consisting of MCC, MNC, and optionally NID.";
+    leaf mcc {
+      type string;
+      description "Mobile Country Code (MCC) of the SNPN.";
+    }
+
+        leaf mnc {
+            type string;
+            description "Mobile Network Code (MNC) of the SNPN.";
+        }
+
+        leaf nId {
+            type string;
+            description "Network Identifier (NID) of the SNPN.";
+        }
+    } 
+  grouping SNPNIdGrp {
+    description "This <<dataType>> represents the information of a SNPN
+     identification";
+    leaf mCC {
+      description "This is the Mobile Country Code (MCC) of the PLMN
+      identifier. See TS 23.003 [13] subclause 2.2 and 12.1";
+      type string;
+    }
+     leaf mNC {
+      description "This is the Mobile Network Code (MNC) of the PLMN
+      identifier. See TS 23.003 [13] subclause 2.2 and 12.1.";
+      type string;
+    }
+    leaf nId {
+      description "Network Identity; Shall be present if PlmnIdNid
+      identifies an SNPN";
+      type string;
+    }
+  }
   // grouping ManagedNFProfile will be removed as it is 
   //  being moved to _3gpp-5gc-nrm-nfprofile
   grouping ManagedNFProfile {
@@ -359,6 +416,14 @@ module _3gpp-common-yang-types {
       type NfType;
       description "Type of the Network Function" ;
     }
+    leaf heartBeatTimer {
+        description "Time in seconds expected between 2 consecutive
+       heart-beat messages from an NF Instance to the NRF.
+       It may be included in the registration request.
+       When present in the request it shall contain the
+       heartbeat time proposed by the NF service consumer.";
+       type uint16;
+    }
     
     leaf hostAddr {
       mandatory true;
@@ -373,6 +438,51 @@ module _3gpp-common-yang-types {
         allowed to consume NF Service(s) of NF Service Producer.";
       reference "See TS 23.501" ;
     }
+    list allowedPlmns {
+      description "PLMNs allowed to access the NF instance.
+      If not provided, any PLMN is allowed to access the NF.";
+      min-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list sNPNList {
+      key "mcc mnc nId";
+      description "SNPN(s) of the Network Function. This attributeIE shall be
+      present if the NF pertains to one or more SNPNs.";
+      reference "TS 29.510";
+      uses SPNInfoIdGrp;
+    }
+    list allowedSNPNs {
+      description "SNPNs allowed to access the NF instance.
+      The absence of this attribute in the NF profile indicates that no SNPN,
+      other than the SNPN(s) registered in the snpnList attribute of the
+      NF Profile, is allowed to access the service instance";
+      key "mCC mNC";
+      uses SNPNIdGrp;
+    }
+
+    leaf-list allowedNfTypes {
+      description "Type of the NFs allowed to access the NF instance.
+                   If not provided, any NF type is allowed to access the NF.";
+      min-elements 1;
+      type types3gpp:NfType;
+    }
+
+    leaf-list allowedNfDomains {
+      description "Pattern (regular expression according to the ECMA-262
+      dialect [75]) representing the NF domain names within the PLMN of
+      the NRF allowed to access the NF instance If not provided,
+      any NF domain is allowed to access the NF.";
+      type string;
+    }
+
+    list allowedNSSAIs {
+        description "S-NSSAI of the allowed slices to access the NF instance.
+        If not provided, any slice is allowed to access the NF.";
+      key "sst sd";
+      uses SNssai;
+    }
     
     leaf location {
       type string ;
@@ -390,28 +500,106 @@ module _3gpp-common-yang-types {
         nfServiceList parameters, those will have precedence over this value.";
       reference "TS 29.510" ;
     }
-      
-    leaf nFSrvGroupId {
+    leaf-list recoveryTime {
+      description "Timestamp when the NF was (re)started. The NRF shall notify
+      NFs subscribed to receiving notifications of changes of the NF profile,
+      if the NF recoveryTime is changed";
+      type yang:date-and-time;
+    }
+    leaf nfServicePersistence {
+      description "This parameter indicates whether the different service
+      instances of a same NF Service in the NF instance, supporting a same
+      API version, are capable to persist their resource state in shared
+      storage and therefore these resources are available after a new NF
+      service instance supporting the same API version is selected by a NF
+      Service Consumer ";
+      reference "TS 29.510";
+      type boolean;
+    }
+    leaf-list nfSetIdList {
       type string ;
-      description "This parameter defines identity of the group that is 
-        served by the NF instance.
-        May be config false or true depending on the ManagedFunction. 
-        Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo. 
-        Shall be present if ../nfType = UDM or AUSF or UDR. ";
-      reference "TS 29.510" ;
+      min-elements 1;
+      description "A NF Set Identifier is a globally unique identifier of
+      a set of equivalent and interchangeable CP NFs from a given network
+      that provide distribution, redundancy and scalability
+      (see clause 5.21.3 of 3GPP TS 23.501 [2]).An NF Set Identifier shall
+      be constructed from the MCC, MNC, NID (for SNPN), NF type and a Set ID.
+      A NF Set Identifier shall be formatted as the following string:
+      set<Set ID>.<nftype>set.5gc.mnc<MNC>.mcc<MCC> for a NF Set in a PLMN, or
+      set<Set ID>.<nftype>set.5gc.nid<NID>.mnc<MNC>.mcc<MCC> for a NF Set
+      in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN
+       of the NF.";
     }
-    
-    leaf-list supportedDataSetIds {
-      type enumeration {
-        enum SUBSCRIPTION;
-        enum POLICY;
-        enum EXPOSURE;
-        enum APPLICATION;
-      }
-      description "List of supported data sets in the UDR instance. 
-        May be present if ../nfType = UDR";
-      reference "TS 29.510" ;
+    leaf-list nfProfileChangesSupportInd {
+      description "This parameter indicates if the NF Service Consumer supports
+       or does not support receiving NF Profile Changes. It may be present in
+       the NFRegister or NFUpdate (NF Profile Complete Replacement) request and
+       shall be absent in the response (see Annex B 3GPP TS 29.510 [23]).  ";
+       max-elements 1;
+      type boolean;
+    }
+    list defaultNotificationSubscriptions {
+      description "Notification endpoints for different notification types.
+      This attribute may contain multiple default subscriptions for a same
+      notification type; in that case, those default subscriptions are used
+      as alternative notification endpoints.";
+      key notificationType;
+      min-elements 1;
+      uses types3gpp:DefaultNotificationSubscription;
+    }
+    leaf servingScope {
+      description "This parameter indicates the served geographical areas
+      of a NF instance.";
+      type string;
     }
+    leaf-list lcHSupportInd {
+      description "This parameter indicates whether the NF supports or does
+      not support Load Control based on LCI Header.";
+      reference "clause 6.3 of 3gpp TS 29.500";
+      max-elements 1;
+      type boolean;
+    }
+    leaf-list olcHSupportInd {
+      description "This parameter indicates whether the NF supports or does
+      not support Overload Control based on OCI Header .";
+      reference "clause 6.4 of 3gpp TS 29.500";
+      max-elements 1;
+      type boolean;
+    }
+    leaf-list nfSetRecoveryTimeList {
+      description "This parameter contains the recovery time of NF Set(s)
+      indicated by the NfSetId, where the NF instance belongs.";
+      type yang:date-and-time ;
+      max-elements 1;
+    }
+    leaf-list serviceSetRecoveryTimeList {
+      description "This parameter contains the recovery time of NF Service
+      Set(s) configured in the NF instance, which are indicated by the
+      NfServiceSetId";
+      type yang:date-and-time ;
+      max-elements 1;
+    }
+    leaf scpDomains {
+      description "This parameter shall carry the list of SCP domains the
+      SCP belongs to, or the SCP domain the NF (other than SCP) or the SEPP
+      belongs to..";
+      type string;
+    }
+    leaf vendorId {
+      description "Vendor ID of the NF instance, according to the
+      IANA-assigned SMI Network Management Private Enterprise Codes [77].
+      allowedValues: 6 decimal digits; if the SMI code has less than
+      6 digits, it shall be padded with leading digits 0 to complete
+      a 6-digit string value.";
+      type string;
+    }
+    leaf-list interPlmnFqdn {
+      description "If the NF needs to be discoverable by other
+       NFs in a different PLMN, then an FQDN that is used
+        for inter-PLMN routing is specified.";
+      type inet:domain-name;
+    }
+
     
     leaf-list smfServingAreas {
       type string ;
@@ -419,16 +607,7 @@ module _3gpp-common-yang-types {
         Shall be present if ../nfType = UPF";
       reference "TS 29.510" ;
     }
-    
-    leaf priority {
-      type uint16;
-      description "This parameter defines Priority (relative to other NFs 
-        of the same type) in the range of 0-65535, to be used for NF selection; 
-        lower values indicate a higher priority. If priority is also present 
-        in the nfServiceList parameters, those will have precedence over 
-        this value. Shall be present if ../nfType = AMF ";
-      reference "TS 29.510" ;
-    }
+
   }
   
   typedef usageState {
diff --git a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
index eebe52d4af8242c48fe2bb37bdd7ebfa86e3ad50..70508b134f6e24b19f192b3983a54914a32745fa 100755
--- a/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-eutranfrequency.yang
@@ -54,22 +54,22 @@ module _3gpp-nr-nrm-eutranfrequency {
     }
   } 
   
-  feature ExternalENBFunctionUnderSubNetwork {
-    description "The ExternalENBFunction shall be contained under SubNetwork";
+  feature EUtranFrequencyUnderSubNetwork {
+    description "The EUtranFrequency shall be contained under SubNetwork";
   }
   
   augment "/subnet3gpp:SubNetwork" {
-    if-feature ExternalENBFunctionUnderSubNetwork ;
-    uses EUtranFrequencyWrapper ;
+    if-feature EUtranFrequencyUnderSubNetwork ;
+    uses EUtranFrequencyWrapper;
   }
 
-  feature ExternalENBFunctionUnderEUtraNetwork {
-    description "The ExternalENBFunction shall be contained under EUtraNetwork";
+  feature EUtranFrequencyUnderEUtraNetwork {
+    description "The EUtranFrequency shall be contained under EUtraNetwork";
   }
   
-  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" 
-      + "eutranet3gpp:EUtraNetwork" {
-    if-feature ExternalENBFunctionUnderEUtraNetwork;
-    uses EUtranFrequencyWrapper ;
+  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
+        + "eutranet3gpp:EUtraNetwork" {
+    if-feature EUtranFrequencyUnderEUtraNetwork;
+    uses EUtranFrequencyWrapper;
   }
 }
\ No newline at end of file
diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
index 7dc30104915e292cc33a9fd470a9fae63145f0ad..bd045b52d19a16b42e9779d4680fb790c392baf9 100755
--- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
@@ -17,7 +17,7 @@ module _3gpp-nr-nrm-nrfrequency {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2025-04-25 { reference CR-1526 ; } 
+  revision 2025-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 { reference "Initial version"; }
diff --git a/yang-models/_3gpp-ns-nrm-serviceprofile.yang b/yang-models/_3gpp-ns-nrm-serviceprofile.yang
index 190bc24e0f2280e446f4b45e5f44f33ed42220ee..c4a18084eaa2be3ccc5da6bc528c655ee8b94e39 100755
--- a/yang-models/_3gpp-ns-nrm-serviceprofile.yang
+++ b/yang-models/_3gpp-ns-nrm-serviceprofile.yang
@@ -3,14 +3,13 @@ submodule _3gpp-ns-nrm-serviceprofile {
   belongs-to _3gpp-ns-nrm-networkslice { prefix ns3gpp; }
 
   import _3gpp-common-yang-types { prefix types3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-ns-nrm-common { prefix ns3cmn; }
 
   organization "3GPP SA5";
   contact 
     "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "A network slice instance in a 5G network.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
@@ -18,6 +17,7 @@ submodule _3gpp-ns-nrm-serviceprofile {
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2020-06-02 {
     reference "CR-0485, CR-0508";
@@ -70,7 +70,7 @@ submodule _3gpp-ns-nrm-serviceprofile {
         description "Synthetic index for the element.";
         type uint32;
       }
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
 
     list pLMNIdList {
diff --git a/yang-models/_3gpp-ns-nrm-sliceprofile.yang b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
index 8745dd815c46bb79dc4cffde7069b1fa53c853c0..d3617e32633cea9a95d5f0d3ed077cbc0b128c2d 100755
--- a/yang-models/_3gpp-ns-nrm-sliceprofile.yang
+++ b/yang-models/_3gpp-ns-nrm-sliceprofile.yang
@@ -3,7 +3,6 @@ submodule _3gpp-ns-nrm-sliceprofile {
   belongs-to _3gpp-ns-nrm-networkslicesubnet { prefix nss3gpp; }
 
   import _3gpp-common-yang-types { prefix types3gpp; }
-  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   // import _3gpp-ns-nrm-networkslice { prefix ns3gpp; }
   import _3gpp-ns-nrm-common { prefix ns3cmn3gpp; }
   
@@ -13,7 +12,7 @@ submodule _3gpp-ns-nrm-sliceprofile {
   description "Represents the properties of network slice subnet related 
     requirement that should be supported by the network slice subnet 
     instance in a 5G network.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2025 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541
     Management and orchestration; 
@@ -21,6 +20,7 @@ submodule _3gpp-ns-nrm-sliceprofile {
     Information model definitions for network slice NRM (chapter 6)
     ";
 
+  revision 2025-08-18 { reference CR-1557; }
   revision 2023-11-04 { reference CR-1129; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -959,7 +959,7 @@ submodule _3gpp-ns-nrm-sliceprofile {
         description "Synthetic index for the element.";
         type uint32;
       }
-      uses types5g3gpp:SNssai;
+      uses types3gpp:SNssai;
     }
     
     list pLMNIdList {