diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang
index 913f3f4f321e0d642e3ad940bcdc5d36eb980134..1a89b6cade11ecca5acddaa3a411648d5d057059 100755
--- a/yang-models/_3gpp-5g-common-yang-types.yang
+++ b/yang-models/_3gpp-5g-common-yang-types.yang
@@ -11,11 +11,12 @@ module _3gpp-5g-common-yang-types {
   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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-  revision 2026-01-07 { reference CR- ; }
+
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-11-07 { reference CR-1640 ; }
   revision 2025-11-01 { reference CR-1657 ; }
   revision 2025-07-25 { reference CR-1558 ; }
@@ -29,6 +30,31 @@ module _3gpp-5g-common-yang-types {
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2019-10-20 { reference "Initial version."; }
 
+  typedef NwdafEvent {
+    description "The detailed ENUM value for NwdafEvent see the
+      Table 5.1.6.3.4-1 in TS 29.520";
+    type union {
+      type enumeration {
+        enum SLICE_LOAD_LEVEL;
+        enum NETWORK_PERFORMANCE;
+        enum NF_LOAD;
+        enum SERVICE_EXPERIENCE;
+        enum UE_MOBILITY;
+        enum UE_COMMUNICATION;
+        enum QOS_SUSTAINABILITY;
+        enum ABNORMAL_BEHAVIOUR;
+        enum USER_DATA_CONGESTION;
+        enum NSI_LOAD_LEVEL;
+        enum DN_PERFORMANCE;
+        enum DISPERSION;
+        enum RED_TRANS_EXP;
+        enum WLAN_PERFORMANCE;
+        enum SM_CONGESTION;
+      }
+      type string;
+    }
+  }  
+  
   grouping AreaScopeGrp {
     description "This <<dataType>> defines an area scope.";
 
@@ -179,6 +205,111 @@ module _3gpp-5g-common-yang-types {
     }
   }
 
+  grouping SupiRangeGrp {
+    description "This <<dataType>> represents a range of SUPIs.";
+    leaf start {
+      description "First value identifying the start of a SUPI range.";
+      type string {
+        pattern '^[0-9]+$';
+      }
+    }
+    leaf end {
+      description "Last value identifying the end of a SUPI range.";
+      type string {
+        pattern '^[0-9]+$';
+      }
+    }
+    leaf pattern {
+      description "Pattern representing the set of SUPIs belonging to
+        this range.";
+      type string;
+    }
+  }
+
+  grouping IdentityRangeGrp {
+    description "This <<dataType>> represents a range of identities.";
+    leaf start {
+      description "First value identifying the start of an identity range.";
+      type string {
+        pattern '^[0-9]+$';
+      }
+    }
+    leaf end {
+      description "Last value identifying the end of an identity range.";
+      type string;
+    }
+    leaf pattern {
+      description "Pattern representing the set of identities belonging to
+        this range.";
+      type string;
+    }
+  }
+
+  grouping InternalGroupIdRangeGrp {
+    description "This data type represents a range of Group
+      IDs (internal group identities), either based on a
+      numeric range, or based on regular-expression
+      matching. (See TS 29.510).";
+    reference "3GPP TS 28.541 clause 5.3.132";
+
+    leaf start {
+      description "It indicates first value identifying
+        the start of an identity range, to be used when
+        the range of identities can be represented as a
+        consecutive numeric range.";
+      type string;
+    }
+
+    leaf end {
+      description "It indicates last value identifying
+        the end of an identity range, to be used when
+        the range of identities can be represented as a
+        consecutive numeric range.";
+      type string;
+    }
+
+    leaf pattern {
+      description "It indicates pattern (regular
+        expression according to the ECMA-262 dialect)
+        representing the set of identities belonging to
+        this range. An identity value is considered part
+        of the range if and only if the identity string
+        fully matches the regular expression.";
+      type string;
+    }
+  }
+
+  grouping SupportedVendorSpecificFeaturesGrp {
+    description "This <<dataType>> represents a map of Vendor-Specific features,
+      where the key of the map is the IANA-assigned SMI Network Management
+      Private Enterprise Codes and the value of each entry of the map shall be
+      a list (array) of VendorSpecificFeature objects as defined in clause 5.3.247.";
+    reference "3GPP TS 29.510 clause 5.3.247";
+
+    list supportedVendorSpecificFeatures {
+      description "It indicates a map of Vendor-Specific features, where the
+        key of the map is the IANA-assigned SMI Network Management Private
+        Enterprise Codes and the value of each entry of the map shall be
+        a list (array) of VendorSpecificFeature objects as defined
+        in the clause 5.3.247.";
+      key "enterpriseCode";
+
+      leaf enterpriseCode {
+        type uint32;
+        description "IANA-assigned SMI Network Management Private
+          Enterprise Code";
+      }
+
+      list vendorSpecificFeature {
+        key "featureName";
+        config false;
+        description "VendorSpecificFeature objects as defined
+          in the clause 5.3.247.";
+        uses VendorSpecificFeatureGrp;
+      }
+    }
+  }
+
   grouping SnssaiExtensionGrp {
     list sdRanges {
       min-elements 1;
@@ -597,6 +728,88 @@ module _3gpp-5g-common-yang-types {
     }
   }
 
+  grouping RuleSetGrp {
+    description "This data type represents list of rules specifying whether
+      access/scopes are allowed/denied for NF-Consumers.";
+    reference "3GPP TS 29.510 clause 6.2.6.2.121";
+
+    leaf priority {
+      description "It indicates the unique Priority of the rule. Lower value
+        means higher priority.";
+      mandatory true;
+      type uint32;
+    }
+
+    list plmns {
+      description "It indicates PLMNs allowed/dis-allowed to access the
+        service instance. When absent, NF-Consumers of all PLMNs are
+        assumed to match this criteria.";
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list snpns {
+      description "It indicates SNPNs allowed/dis-allowed to access the
+        service instance. When absent, NF-Consumers of all SNPNs are
+        assumed to match this criteria.";
+      key "mcc mnc";
+      uses PlmnIdNid;
+    }
+
+    leaf-list nfTypes {
+      description "It indicates type of the NFs allowed/dis-allowed to
+        access the service instance. When absent, NF-Consumers of all
+        nfTypes are assumed to match this criteria.";
+      type types3gpp:NfType;
+    }
+
+    leaf-list nfDomains {
+      description "It represents pattern (regular expression according to
+        the ECMA-262 dialect) representing the NF domain names within the
+        PLMN of the NRF allowed/dis-allowed to access the service instance.
+        When absent, NF-Consumers of all nfDomains are assumed to match
+        this criteria.";
+      type string;
+    }
+
+    list nssais {
+      description "It represents S-NSSAIs of the NF-Consumers
+        allowed/dis-allowed to access the service instance. When absent,
+        NF-Consumers of all slices are assumed to match this criteria.";
+      key idx;
+      leaf idx { type uint32; }
+      uses ExtSnssaiGrp;
+    }
+
+    leaf-list nfInstances {
+      description "It represents NF-Instance IDs of the NF-Consumers
+        allowed/dis-allowed to access the NF/NF-Service instance. When
+        absent, all the NF-Consumers are assumed to match this criteria.";
+      type string;
+    }
+
+    leaf-list scopes {
+      description "It represents list of scopes allowed or denied to the
+        NF-Consumers matching the rule. The scopes shall be any of those
+        defined in the API that defines the current service. When absent,
+        the NF-Consumer is allowed or denied full access to all the
+        resources/operations of service instance.";
+      type string;
+    }
+
+    leaf action {
+      description "It specifies whether the scopes/access mentioned are
+        allowed or denied for a specific NF-Consumer.
+        ALLOW: The NF consumer is allowed to access NF producer.
+        DENY: The NF consumer is not allowed to access NF Producer.";
+      mandatory true;
+      type enumeration {
+        enum ALLOW;
+        enum DENY;
+      }
+    }
+  }
+
   grouping LocationInfoGrp {
     description "This data type contains location information 
       of an NR mobile node (e.g., IAB-node or MWAB).";
diff --git a/yang-models/_3gpp-5gc-nrm-aanffunction.yang b/yang-models/_3gpp-5gc-nrm-aanffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..c440c94474e68d7bb5b5a1ee3c54c03dd43ac57f
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-aanffunction.yang
@@ -0,0 +1,102 @@
+module _3gpp-5gc-nrm-aanffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-aanffunction;
+  prefix aanf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the AAnF function in 5GC.
+    For more information about the AANF, see TS 33.535.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping AanfInfoGrp {
+    description "This data type represents the Specific
+      data for the AAnF.
+      (See clause 6.1.6.2.73 TS 29.510).";
+
+    leaf-list routingIndicators {
+      description "This attribute represents the List of
+        Routing Indicators supported by the AAnf
+        instance. If not provided, the AAnf can serve
+        any Routing Indicator.";
+        //optional
+      type string {
+        pattern '[0-9]{1,4}';
+      }
+    }
+  }
+
+  grouping AANFFunctionGrp {
+    description "Represents the AANFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list aanfInfo {
+      description "This attribute represents information
+        of an AAnF NF Instance.";
+        //optional
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses AanfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list AANFFunction {
+      description "5G Core AAnF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses AANFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-affunction.yang b/yang-models/_3gpp-5gc-nrm-affunction.yang
index f3ec7376253a5a241d6288455f7adb6cbb2bbd42..e193ba8cca12cf0d7f8bc3177ccbffa1b45d915d 100755
--- a/yang-models/_3gpp-5gc-nrm-affunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-affunction.yang
@@ -6,24 +6,120 @@ module _3gpp-5gc-nrm-affunction {
   
   import _3gpp-common-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-neffunction { prefix nef3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp;}
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC is defined only to describe the IOCs representing
                its interaction interface with 5GC (i.e. EP_Rx and EP_N5).
                It has no attributes defined.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2026-05-19 { reference CR-1702 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-05-15 {reference "initial revision"; }
   
+  grouping TrustAfInfoGrp {
+    description "Represent the data type TrustAfInfo.";
+    
+    list sNssaiInfoList {
+      description "It represents S-NSSAIs and DNNs supported by the trust AF.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nef3gpp:SnssaiInfoItemGrp;
+    }
+
+    leaf-list afEvents {                   
+      type enumeration {
+        enum SVC_EXPERIENCE;
+        enum UE_MOBILITY;
+        enum UE_COMM;
+        enum EXCEPTIONS;
+        enum USER_DATA_CONGESTION;
+        enum PERF_DATA;
+        enum COLLECTIVE_BEHAVIOUR;
+        enum DISPERSION;
+        enum MS_QOE_METRICS;
+        enum MS_CONSUMPTION;
+        enum MS_NET_ASSIST_INVOCATION;
+        enum MS_DYN_POLICY_INVOCATION;
+        enum MS_ACCESS_ACTIVITY;
+      }                                                    
+      description "This attribute represents list of AF Event(s) supported 
+        by the trusted AF.";   
+      reference "Clause 5.6.3.3 TS 29.517";
+    }                                                                 
+
+    leaf-list appIds {  
+      type string;
+      description "This attribute represents a list of Application ID(s) 
+        supported by the trusted AF. The absence of this attribute indicate 
+        that the AF can be selected for any Application.";
+    }
+
+    leaf-list internalGroupId {
+      type string {
+        pattern 
+          '[A-Fa-f0-9]{8}-[0-9]{3}-[0-9]{2,3}-([A-Fa-f0-9][A-Fa-f0-9]){1,10}';
+      }
+      description "This attribute represents a list of Internal Group 
+        Identifiers supported by the trusted AF.
+        If not provided, it does not imply that the AF supports all internal 
+        groups.";
+    }
+
+    leaf mappingInd {
+      type boolean;
+      default false;
+      description "This attribute indicates whether the trusted AF supports 
+        mapping between UE IP address (IPv4 address or IPv6 prefix) and UE ID 
+        (i.e. SUPI).";
+    }
+  }
+  
   grouping AFFunctionGrp {
     uses mf3gpp:ManagedFunctionGrp;
+    
+    list pLMNIdList {
+      description "List of PLMN IDs.";
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list managedNFProfile {                                            
+      key idx;                                                         
+      leaf idx { type uint32;}                                         
+      min-elements 1;                                                  
+      max-elements 1;                                                  
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;                               
+    }                                                                  
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list trustAfInfo {
+      description "Represents information of a trusted AF Instance.";
+      key idx;                                                         
+      leaf idx { type uint32;}                                         
+      max-elements 1;                                                  
+      uses TrustAfInfoGrp;                               
+     }
   }
   
   augment "/me3gpp:ManagedElement" {
diff --git a/yang-models/_3gpp-5gc-nrm-aiot.yang b/yang-models/_3gpp-5gc-nrm-aiot.yang
index be123060a171542c252449387fffffacf19cc2ff..74fed3b791a5fde66c02879f7ca33e780a6cbdca 100644
--- a/yang-models/_3gpp-5gc-nrm-aiot.yang
+++ b/yang-models/_3gpp-5gc-nrm-aiot.yang
@@ -14,11 +14,12 @@ module _3gpp-5gc-nrm-aiot {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping AIOT (Ambient power-enabled Internet 
     of Things).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 
     3GPP TS 23.369";
 
+  revision 2026-03-19 { reference "CR-1695 CR-1694"; } //common r19-20
   revision 2025-11-01 { reference CR-1640; }
 
   grouping ServedAIOTAreaIDGrp {
@@ -169,6 +170,30 @@ module _3gpp-5gc-nrm-aiot {
   
   //////////////////////////////////////////////////////////////////////
   
+  grouping AdmInfoGrp {
+    description "Represents the datatype AdmInfo";
+    
+    leaf-list deviceIdList {
+      type string;
+      description "This attribute represents a list of device IDs served by 
+        ADM as defined in TS 29.510 [23]. The format of String is specified 
+        in TS 29.510.";
+    }
+    
+    leaf devIdRegEx {
+      type string;
+      description "This attribute represents a regular expression (according to 
+        the ECMA-262 dialect) identifying the set of device IDs served by 
+        the ADM as defined in TS 29.510.";
+    }
+    
+    leaf-list afIdList {
+      type string;
+      description "This attribute represents a list of AF IDs served by ADM as 
+        defined in TS 29.510.";
+    }
+  }
+  
   grouping ADMFunctionGrp {
     description "Attributes of the IOC ADMFunction";
   
@@ -200,6 +225,16 @@ module _3gpp-5gc-nrm-aiot {
       description "This parameter defines profile for managed NF";
       reference "3gpp TS 23.501";
     }
+
+    list admInfo { 
+      description "This attribute represents ADM-specific information for 
+        management purposes. The information carried by this attribute is 
+        aligned with the ADM-related information defined in TS 29.510.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses AdmInfoGrp;
+    }
   }  
   
   feature ADMFunctionUnderManagedElement {
diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang
index 89ecbe3f33dc4a209e3971c11d6cf8ab1ea5216e..24b487a672dd3a3957a02b9b250b5d7fcdec400e 100755
--- a/yang-models/_3gpp-5gc-nrm-amffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang
@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-amffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "AMFFunction derived from basic ManagedFunction.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-05-25 { reference CR-1702 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-03-25 { reference "CR-1489 CR-1512" ; }
   revision 2024-11-01 { reference CR-1405; }
@@ -368,14 +369,14 @@ module _3gpp-5gc-nrm-amffunction {
   grouping AmfInfoGrp {
     description "Represents the data type AmfInfo.";
 
-    leaf amfRegionId {
+    leaf aMFRegionId {
       type int64;
       mandatory true;
       description "It represents the AMF Region ID, which identifies the
         region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 ";
     }
 
-    leaf amfSetId {
+    leaf aMFSetId {
       type int64;
       mandatory true;
       description "It represents the AMF Set ID, which is uniquely identifies
diff --git a/yang-models/_3gpp-5gc-nrm-ausffunction.yang b/yang-models/_3gpp-5gc-nrm-ausffunction.yang
index 3f02fd5ae2aa6421ebb22dce2ee09354264d01f4..ee443f4533b417368d5014e77ab0ec4969dece97 100755
--- a/yang-models/_3gpp-5gc-nrm-ausffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-ausffunction.yang
@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-ausffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the AUSF function in 5GC. For more
     information about the AUSF, 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 2026-03-25 { reference CR-1694 ; }
   revision 2023-09-18 { reference CR-1043 ; }
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
@@ -66,7 +67,7 @@ module _3gpp-5gc-nrm-ausffunction {
         by the PCF instance.";
       key idx;
       leaf idx { type uint32 ; }
-      uses mnfp3gpp:SupiRangeGrp;
+      uses types5g3gpp:SupiRangeGrp;
     }
 
       leaf-list routingIndicators {
diff --git a/yang-models/_3gpp-5gc-nrm-bsffunction.yang b/yang-models/_3gpp-5gc-nrm-bsffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..51551d83e39cb8ffbe9cf5e8348ef0153218a6f4
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-bsffunction.yang
@@ -0,0 +1,188 @@
+module _3gpp-5gc-nrm-bsffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-bsffunction;
+  prefix bsf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the BSF function in 5GC.
+    For more information about the BSF, see TS 23.503.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping BsfInfoGrp {
+    description "This data type represents the Specific
+      data for the BSF.
+      (See clause 6.1.6.2.21 TS 29.510).";
+
+    list ipv4AddressRanges {
+      description "This attribute represents the list of
+        ranges of IPv4 addresses handled by BSF. If not
+        provided, the BSF can serve any IPv4 address.";
+      key "start end";
+      //optional
+      uses types3gpp:Ipv4AddressRange;
+    }
+
+    leaf-list dnnList {
+      description "This attribute represents the list of
+        DNNs handled by the BSF. The DNN shall contain
+        the Network Identifier and it may additionally
+        contain an Operator Identifier. If the Operator
+        Identifier is not included, the DNN is supported
+        for all the PLMNs in the plmnList of the NF
+        Profile. If not provided, the BSF can serve
+        any DNN.";
+        //optional
+      type string;
+    }
+
+    leaf-list ipDomainList {
+      description "This attribute represents the list of
+        IPv4 address domains, as described in clause 6.2
+        of 3GPP TS 29.513, handled by the BSF. If not
+        provided, the BSF can serve any IP domain.";
+        //optional
+      type string;
+    }
+
+    list ipv6PrefixRanges {
+      description "This attribute represents the list of
+        ranges of IPv6 prefixes handled by the BSF. If
+        not provided, the BSF can serve any IPv6
+        prefix.";
+        //optional
+      key "start end";
+      uses types3gpp:Ipv6PrefixRange;
+    }
+
+    leaf rxDiamHost {
+      description "This attribute represents the Diameter
+        host of the Rx interface for the BSF.";
+      type string;
+    }
+
+    leaf rxDiamRealm {
+      description "This attribute represents the Diameter
+        realm of the Rx interface for the BSF. See
+        TS 29.571. String contains a Diameter Identity
+        (FQDN).";
+      type string;
+    }
+
+    leaf groupId {
+      description "This attribute represents the identity
+        of the BSF group that is served by the BSF
+        instance. If not provided, the BSF instance does
+        not pertain to any BSF group.";
+        //optional
+      type string;
+    }
+
+    list supiRanges {
+      description "This attribute represents list of
+        ranges of SUPIs served by the BSF instance.";
+        //optional
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:SupiRangeGrp;
+    }
+
+    list gpsiRanges {
+      description "This attribute represents list of
+        ranges of GPSIs served by the BSF instance.";
+        //optional
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+  }
+
+  grouping BSFFunctionGrp {
+    description "Represents the BSFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    leaf-list cNSIIdList {
+      description "NSI ID. NSI ID is an identifier for
+        identifying the Core Network part of a Network
+        Slice instance when multiple Network Slice
+        instances of the same Network Slice are deployed,
+        and there is a need to differentiate between them
+        in the 5GC, see clause 3.1 of TS 23.501 and
+        subclause 6.1.6.2.7 of 3GPP TS 29.531.";
+        //optional
+      type string;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list bsfInfo {
+      description "This attribute represents information
+        of a BSF NF Instance. Multiple bsfInfo may be
+        allowed when BSF provides binding service for
+        various combinations of IPv4 addresses and
+        ipDomains.";
+        //optional
+      key idx;
+      leaf idx { type uint32; }
+      uses BsfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list BSFFunction {
+      description "5G Core BSF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses BSFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-chffunction.yang b/yang-models/_3gpp-5gc-nrm-chffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..8dd71b9f0a57e95438b5df46b56ff538add37cdf
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-chffunction.yang
@@ -0,0 +1,143 @@
+module _3gpp-5gc-nrm-chffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-chffunction;
+  prefix chf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the CHF function. For more
+    information about the CHF, see TS 23.501 and
+    TS 32.240.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2025-03-25 { reference "CR-"; }
+
+  grouping ChfInfoGrp {
+    description "This data type represents the Specific
+      data for the CHF.
+      (See clause 6.1.6.2.32 TS 29.510).";
+
+    list supiRangeList {
+      description "List of ranges of SUPIs that can be
+        served by the CHF instance. If not provided,
+        the CHF can serve any SUPI.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:SupiRangeGrp;
+    }
+
+    list gpsiRangeList {
+      description "List of ranges of GPSI that can be
+        served by the CHF instance. If not provided,
+        the CHF can serve any GPSI.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+
+    list plmnRangeList {
+      description "List of ranges of PLMNs (including
+        the PLMN IDs of the CHF instance) that can be
+        served by the CHF instance. If not provided,
+        the CHF can serve any PLMN.";
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf groupId {
+      description "It represents the identity of the CHF
+        group that is served by the CHF instance. If not
+        provided, the CHF instance does not pertain to
+        any CHF group.";
+      type string;
+    }
+
+    leaf primaryChfInstance {
+      description "This attribute represents the NF
+        Instance Id of the primary CHF instance. This
+        attribute shall be absent if the
+        secondaryChfInstance is present.";
+      type string;
+    }
+
+    leaf secondaryChfInstance {
+      description "This attribute represents the NF
+        Instance Id of the secondary CHF instance.
+        This attribute shall be absent if the
+        primaryChfInstance is present.";
+      type string;
+    }
+  }
+
+  grouping CHFFunctionGrp {
+    description "Represents the CHFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list chfInfo {
+      description "This attribute represents information
+        of a CHF NF Instance.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses ChfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list CHFFunction {
+      description "5G Core CHF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses CHFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-dccffunction.yang b/yang-models/_3gpp-5gc-nrm-dccffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..476954220e960aa1fa5b35f3a19557916b5a4b65
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-dccffunction.yang
@@ -0,0 +1,151 @@
+module _3gpp-5gc-nrm-dccffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dccffunction;
+  prefix dccf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the DCCF function in 5GC.
+    For more information about the DCCF, see TS 23.501.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping DccfInfoGrp {
+    description "This data type represents the Specific
+      data for the DCCF.
+      (See clause 6.1.6.2.46 TS 29.510).";
+
+    leaf-list servingNfTypeList {
+      //optional support
+      type types3gpp:NfType;
+      description "This attribute represents the list of
+        NF type(s) from which the DCCF NF can collect
+        data. The absence of this attribute indicates
+        that the DCCF can collect data from any NF
+        type.";
+    }
+
+    leaf-list servingNfSetIdList {
+      //optional support
+      type string;
+      description "This attribute represents the list of
+        NF Set Id(s) from which the DCCF NF can collect
+        data. The absence of this attribute indicates
+        that the DCCF can collect data from any NF
+        Set.";
+    }
+
+    list taiList {
+      //optional support
+      description "This attribute represents the list of
+        TAIs the DCCF can serve. It may contain one or
+        more non-3GPP access TAIs. The absence of both
+        this attribute and the taiRangeList attribute
+        indicates that the DCCF can be selected for any
+        TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      //optional support
+      description "This attribute represents the range
+        of TAIs the DCCF can serve. It may contain one
+        or more non-3GPP access TAI ranges. The absence
+        of both this attribute and the taiList attribute
+        indicates that the DCCF can be selected for any
+        TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+  }
+
+  grouping DCCFFunctionGrp {
+    description "Represents the DCCFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    leaf-list cNSIIdList {
+      //optional support
+      description "NSI ID. NSI ID is an identifier for
+        identifying the Core Network part of a Network
+        Slice instance when multiple Network Slice
+        instances of the same Network Slice are deployed,
+        and there is a need to differentiate between them
+        in the 5GC";
+        reference " see clause 3.1 of TS 23.501 and
+        subclause 6.1.6.2.7 of 3GPP TS 29.531.";
+      type string;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF";
+      reference "(See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list dccfInfo {
+      //optional support
+      description "This attribute represents information
+        of a DCCF NF Instance.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses DccfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list DCCFFunction {
+      description "5G Core DCCF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses DCCFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-ddnmffunction.yang b/yang-models/_3gpp-5gc-nrm-ddnmffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..990b3a9c778e9eafbbd468468bd28e9e95ddcaa8
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-ddnmffunction.yang
@@ -0,0 +1,78 @@
+module _3gpp-5gc-nrm-ddnmffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-ddnmffunction;
+  prefix ddnmf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the 5G DDNMF function in
+    5GC. For more information about the 5G DDNMF, see
+    TS 23.501.
+    Copyright 2026, 3GPP Organizational Partners (ARIB,
+    ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping DDNMFFunctionGrp {
+    description "Represents the DDNMFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNId {
+      description "The PLMN identifier.";
+      key "mcc mnc";
+      min-elements 1;
+      max-elements 1;
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list DDNMFFunction {
+      description "5G Core DDNMF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses DDNMFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-easdffunction.yang b/yang-models/_3gpp-5gc-nrm-easdffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..0c86824e1fafbc2d368a70b53a9ba1c692872787
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-easdffunction.yang
@@ -0,0 +1,191 @@
+module _3gpp-5gc-nrm-easdffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-easdffunction;
+  prefix easdf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-yang-extensions { prefix yext3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the Edge Application
+    Server Discovery Function (EASDF) in 5GC which can
+    handle the DNS messages according to the instruction
+    from the SMF. For more information about the 5G
+    EASDF, see 3GPP TS 23.548.
+    Copyright 2026, 3GPP Organizational Partners (ARIB,
+    ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping DnnEasdfInfoItemGrp {
+    description "This data type represents parameters
+      supported by the EASDF per DNN.
+      (See clause 6.1.6.2.79 TS 29.510).";
+
+    leaf dnn {
+      type string;
+      mandatory true;
+      description "This attribute represents a supported
+        DNN or Wildcard DNN if the EASDF supports all
+        DNNs for the related S-NSSAI. The DNN shall
+        contain the Network Identifier and it may
+        additionally contain an Operator Identifier.
+        If the Operator Identifier is not included, the
+        DNN is supported for all the PLMNs in the
+        plmnList of the NF Profile.";
+    }
+
+    leaf-list dnaiList {
+      //optional support
+      type string;
+      min-elements 1;
+      description "List of Data network access
+        identifiers supported for this DNN.";
+    }
+  }
+
+  grouping SnssaiEasdfInfoItemGrp {
+    description "This data type represents parameters
+      supported by the EASDF per S-NSSAI.";
+      reference "(See clause 6.1.6.2.78 TS 29.510).";
+
+    list sNssai {
+      description "This attribute represents a S-NSSAI.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:SnssaiExtensionGrp;
+    }
+
+    list dnnEasdfInfoList {
+      description "This attribute represents a list of
+        parameters supported by the EASDF per DNN.";
+      min-elements 1;
+      key dnn;
+      uses DnnEasdfInfoItemGrp;
+    }
+  }
+
+  grouping EasdfInfoGrp {
+    description "This data type represents EASDF specific
+      data. (See clause 5.4.5.1 of TS 29.571).";
+
+    list sNssaiEasdfInfoList {
+      //optional support
+      description "This attribute represents a list of
+        parameters supported by the EASDF per
+        S-NSSAI.";
+      key idx;
+      leaf idx { type uint32; }
+      uses SnssaiEasdfInfoItemGrp;
+    }
+
+    leaf-list easdfN6IpAddressList {
+      //optional support
+      type inet:ip-address;
+      description "This attribute represents N6 IP
+        addresses of the EASDF.";
+    }
+
+    leaf-list upfN6IpAddressList {
+      //optional support
+      type inet:ip-address;
+      description "This attribute represents N6 IP
+        addresses of PSA UPFs.";
+    }
+  }
+
+  grouping EASDFFunctionGrp {
+    description "Represents the EASDFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNId {
+      description "It defines the PLMN of the EASDF.";
+      min-elements 1;
+      max-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    leaf serverAddr {
+      type string;
+      mandatory true;
+      description "This attribute indicates the DNS
+        server address for the PDU Session
+        (see clause 6.2.2.2 in TS 23.548).";
+    }
+
+    list easdfInfo {
+      //optional support
+      description "This attribute represents EASDF
+        specific data.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses EasdfInfoGrp;
+    }
+
+    leaf isOnboardSatellite {
+      //optional support
+      type boolean;
+      default false;
+      config false;
+      yext3gpp:inVariant;
+      description "This attribute indicates whether the
+        function is on board the satellite.";
+    }
+
+    leaf onboardSatelliteId {
+      //optional support
+      type string {
+        pattern "[0-9]{5}";
+      }
+      config false;
+      yext3gpp:inVariant;
+      description "This attribute indicates the onboard
+        satellite Id. It shall be formatted as a fixed
+        5-digit string, padding with leading digits '0'
+        to complete a 5-digit length.";
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list EASDFFunction {
+      description "5G Core EASDF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses EASDFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-ep.yang b/yang-models/_3gpp-5gc-nrm-ep.yang
index 52cd3f5b6f7d36b1624cb901c729c98415f17e3d..d9c137b591287f746b4af12ff1e926d01d8e2b66 100755
--- a/yang-models/_3gpp-5gc-nrm-ep.yang
+++ b/yang-models/_3gpp-5gc-nrm-ep.yang
@@ -8,7 +8,6 @@ module _3gpp-5gc-nrm-ep {
   import _3gpp-5gc-nrm-affunction { prefix af3gpp; }
   import _3gpp-5gc-nrm-amffunction { prefix amf3gpp; }
   import _3gpp-5gc-nrm-ausffunction { prefix ausf3gpp; }
-  import _3gpp-5gc-nrm-dnfunction { prefix dn3gpp; }
   import _3gpp-5gc-nrm-lmffunction { prefix lmf3gpp; }
   import _3gpp-5gc-nrm-n3iwffunction { prefix n3iwf3gpp; }
   import _3gpp-5gc-nrm-ngeirfunction { prefix ngeir3gpp; }
@@ -20,25 +19,306 @@ module _3gpp-5gc-nrm-ep {
   import _3gpp-5gc-nrm-smsffunction { prefix smsf3gpp; }
   import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; }
   import _3gpp-5gc-nrm-upffunction { prefix upf3gpp; }
+  import _3gpp-5gc-nrm-mbupffunction { prefix mbupf3gpp; }
+  import _3gpp-5gc-nrm-mbsmffunction { prefix mbsmf3gpp; }
+  import _3gpp-5gc-nrm-chffunction { prefix chf3gpp; }
+  import _3gpp-5gc-nrm-nsacffunction { prefix nsacf3gpp; }
+  import _3gpp-5gc-nrm-neffunction { prefix nef3gpp; }
+  import _3gpp-5gc-nrm-nssaaffunction { prefix nssaaf3gpp; }
+  import _3gpp-5gc-nrm-ddnmffunction { prefix ddnmf3gpp; }
+  import _3gpp-5gc-nrm-tsctsffunction { prefix tsctsf3gpp; }
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
   import ietf-inet-types { prefix inet; }
+  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; }
+  import _3gpp-5gc-nrm-scpfunction {prefix scp3gpp;}
+  import _3gpp-5gc-nrm-aanffunction {prefix aanf3gpp;}
+  import _3gpp-5gc-nrm-easdffunction {prefix easdf3gpp;}
+  import _3gpp-5gc-nrm-gmlcfunction {prefix gmlc3gpp;}
+
+
 
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the 5GC related endpoint
-               Information Object Classes (IOCs) that are part of the 5G Core
-               Network Resource Model.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
-    TTA, TTC). All rights reserved.";
+  Information Object Classes (IOCs) that are part of the 5G Core
+   Network Resource Model.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-04-25 { reference CR-1702; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2024-08-19 { reference CR-1314 ; }
   revision 2023-09-18 { reference CR-1043 ; }
-  revision 2019-11-18 { reference "Ericsson refactoring."; }
+  revision 2019-11-18 {reference "Ericsson refactoring."; }
   revision 2018-07-31 { reference "Initial revision"; }
 
+  // === Features for EPs under 2+ functions ===
+
+  feature EP_N2UnderAMFFunction {
+    description "EP_N2 contained under AMFFunction";
+  }
+  feature EP_N2UnderN3IWFFunction {
+    description "EP_N2 contained under N3IWFFunction";
+  }
+  feature EP_N3UnderN3IWFFunction {
+    description "EP_N3 contained under N3IWFFunction";
+  }
+  feature EP_N3UnderUPFFunction {
+    description "EP_N3 contained under UPFFunction";
+  }
+  feature EP_N4UnderSMFFunction {
+    description "EP_N4 contained under SMFFunction";
+  }
+  feature EP_N4UnderUPFFunction {
+    description "EP_N4 contained under UPFFunction";
+  }
+  feature EP_N5UnderAFFunction {
+    description "EP_N5 contained under AFFunction";
+  }
+  feature EP_N5UnderPCFFunction {
+    description "EP_N5 contained under PCFFunction";
+  }
+  feature EP_N61UnderAUSFFunction {
+    description "EP_N61 contained under AUSFFunction";
+  }
+  feature EP_N61UnderAANFFunction {
+    description "EP_N61 contained under AANFFunction";
+  }
+  feature EP_N62UnderAFFunction {
+    description "EP_N62 contained under AFFunction";
+  }
+  feature EP_N62UnderAANFFunction {
+    description "EP_N62 contained under AANFFunction";
+  }
+  feature EP_N63UnderNEFFunction {
+    description "EP_N63 contained under NEFFunction";
+  }
+  feature EP_N63UnderAANFFunction {
+    description "EP_N63 contained under AANFFunction";
+  }
+  feature EP_N6UnderUPFFunction {
+    description "EP_N6 contained under UPFFunction";
+  }
+  feature EP_N7UnderPCFFunction {
+    description "EP_N7 contained under PCFFunction";
+  }
+  feature EP_N7UnderSMFFunction {
+    description "EP_N7 contained under SMFFunction";
+  }
+  feature EP_N8UnderAMFFunction {
+    description "EP_N8 contained under AMFFunction";
+  }
+  feature EP_N8UnderUDMFunction {
+    description "EP_N8 contained under UDMFunction";
+  }
+  feature EP_N10UnderSMFFunction {
+    description "EP_N10 contained under SMFFunction";
+  }
+  feature EP_N10UnderUDMFunction {
+    description "EP_N10 contained under UDMFunction";
+  }
+  feature EP_N11UnderAMFFunction {
+    description "EP_N11 contained under AMFFunction";
+  }
+  feature EP_N11UnderSMFFunction {
+    description "EP_N11 contained under SMFFunction";
+  }
+  feature EP_N12UnderAMFFunction {
+    description "EP_N12 contained under AMFFunction";
+  }
+  feature EP_N12UnderAUSFFunction {
+    description "EP_N12 contained under AUSFFunction";
+  }
+  feature EP_N13UnderAUSFFunction {
+    description "EP_N13 contained under AUSFFunction";
+  }
+  feature EP_N13UnderUDMFunction {
+    description "EP_N13 contained under UDMFunction";
+  }
+  feature EP_N15UnderAMFFunction {
+    description "EP_N15 contained under AMFFunction";
+  }
+  feature EP_N15UnderPCFFunction {
+    description "EP_N15 contained under PCFFunction";
+  }
+  feature EP_N16UnderPCFFunction {
+    description "EP_N16 contained under PCFFunction";
+  }
+  feature EP_N16UnderSMFFunction {
+    description "EP_N16 contained under SMFFunction";
+  }
+  feature EP_N17UnderAMFFunction {
+    description "EP_N17 contained under AMFFunction";
+  }
+  feature EP_N17UnderNGEIRFunction {
+    description "EP_N17 contained under NGEIRFunction";
+  }
+  feature EP_N20UnderAMFFunction {
+    description "EP_N20 contained under AMFFunction";
+  }
+  feature EP_N20UnderSMSFFunction {
+    description "EP_N20 contained under SMSFFunction";
+  }
+  feature EP_N22UnderAMFFunction {
+    description "EP_N22 contained under AMFFunction";
+  }
+  feature EP_N22UnderNSSFFunction {
+    description "EP_N22 contained under NSSFFunction";
+  }
+  feature EP_NL1UnderAMFFunction {
+    description "EP_NL1 contained under AMFFunction";
+  }
+  feature EP_NL1UnderLMFFunction {
+    description "EP_NL1 contained under LMFFunction";
+  }
+  feature EP_NL6UnderGMLCFunction {
+    description "EP_NL6 contained under GMLCFunction";
+  }
+  feature EP_NL6UnderUDMFunction {
+    description "EP_NL6 contained under UDMFunction";
+  }
+  feature EP_NL9UnderGMLCFunction {
+    description "EP_NL9 contained under GMLCFunction";
+  }
+  feature EP_NL9UnderNWDAFFunction {
+    description "EP_NL9 contained under NWDAFFunction";
+  }
+  feature EP_N34UnderNSSFFunction {
+    description "EP_N34 contained under NSSFFunction";
+  }
+  feature EP_N34UnderNWDAFFunction {
+    description "EP_N34 contained under NWDAFFunction";
+  }
+  feature EP_NL2UnderGMLCFunction {
+    description "EP_NL2 contained under GMLCFunction";
+  }
+  feature EP_NL2UnderAMFFunction {
+    description "EP_NL2 contained under AMFFunction";
+  }
+  feature EP_N26UnderAMFFunction {
+    description "EP_N26 contained under AMFFunction";
+  }
+  feature EP_N26UnderMMEFunction {
+    description "EP_N26 contained under MMEFunction";
+  }
+  feature EP_N89UnderAMFFunction {
+    description "EP_N89 contained under AMFFunction";
+  }
+  feature EP_N89UnderTSCTSFFunction {
+    description "EP_N89 contained under TSCTSFFunction";
+  }
+  feature EP_N11mbUnderAMFFunction {
+    description "EP_N11mb contained under AMFFunction";
+  }
+  feature EP_N11mbUnderMBSMFFunction {
+    description "EP_N11mb contained under MBSMFFunction";
+  }
+  feature EP_N88UnderSMFFunction {
+    description "EP_N88 contained under SMFFunction";
+  }
+  feature EP_N88UnderEASDFFunction {
+    description "EP_N88 contained under EASDFFunction";
+  }
+  feature EP_N16mbUnderSMFFunction {
+    description "EP_N16mb contained under SMFFunction";
+  }
+  feature EP_N16mbUnderMBSMFFunction {
+    description "EP_N16mb contained under MBSMFFunction";
+  }
+  feature EP_N4mbUnderMBUPFFunction {
+    description "EP_N4mb contained under MBUPFFunction";
+  }
+  feature EP_N4mbUnderMBSMFFunction {
+    description "EP_N4mb contained under MBSMFFunction";
+  }
+  feature EP_NL3UnderGMLCFunction {
+    description "EP_NL3 contained under GMLCFunction";
+  }
+  feature EP_NL5UnderGMLCFunction {
+    description "EP_NL5 contained under GMLCFunction";
+  }
+  feature EP_NL5UnderNEFFunction {
+    description "EP_NL5 contained under NEFFunction";
+  }
+  feature EP_NL10UnderGMLCFunction {
+    description "EP_NL10 contained under GMLCFunction";
+  }
+  feature EP_NL10UnderLMFFunction {
+    description "EP_NL10 contained under LMFFunction";
+  }
+  feature EP_NL8UnderLMFFunction {
+    description "EP_NL8 contained under LMFFunction";
+  }
+  feature EP_RxUnderAFFunction {
+    description "EP_Rx contained under AFFunction";
+  }
+  feature EP_RxUnderPCFFunction {
+    description "EP_Rx contained under PCFFunction";
+  }
+  feature EP_N40UnderCHFFunction {
+    description "EP_N40 contained under CHFFunction";
+  }
+  feature EP_N40UnderSMFFunction {
+    description "EP_N40 contained under SMFFunction";
+  }
+  feature EP_N28UnderCHFFunction {
+    description "EP_N28 contained under CHFFunction";
+  }
+  feature EP_N28UnderPCFFunction {
+    description "EP_N28 contained under PCFFunction";
+  }
+  feature EP_N41UnderAMFFunction {
+    description "EP_N41 contained under AMFFunction";
+  }
+  feature EP_N41UnderCHFFunction {
+    description "EP_N41 contained under CHFFunction";
+  }
+  feature EP_N60UnderAMFFunction {
+    description "EP_N60 contained under AMFFunction";
+  }
+  feature EP_N60UnderNSACFFunction {
+    description "EP_N60 contained under NSACFFunction";
+  }
+  feature EP_N19mbUnderMBUPFFunction {
+    description "EP_N19mb contained under MBUPFFunction";
+  }
+  feature EP_N19mbUnderUPFFunction {
+    description "EP_N19mb contained under UPFFunction";
+  }
+  feature EP_N84UnderTSCTSFFunction {
+    description "EP_N84 contained under TSCTSFFunction";
+  }
+  feature EP_N84UnderPCFFunction {
+    description "EP_N84 contained under PCFFunction";
+  }
+  feature EP_N85UnderTSCTSFFunction {
+    description "EP_N85 contained under TSCTSFFunction";
+  }
+  feature EP_N85UnderNEFFunction {
+    description "EP_N85 contained under NEFFunction";
+  }
+  feature EP_N86UnderTSCTSFFunction {
+    description "EP_N86 contained under TSCTSFFunction";
+  }
+  feature EP_N86UnderAFFunction {
+    description "EP_N86 contained under AFFunction";
+  }
+  feature EP_N87UnderTSCTSFFunction {
+    description "EP_N87 contained under TSCTSFFunction";
+  }
+  feature EP_N87UnderUDMFunction {
+    description "EP_N87 contained under UDMFunction";
+  }
+  feature EP_N96UnderTSCTSFFunction {
+    description "EP_N96 contained under TSCTSFFunction";
+  }
+  feature EP_N96UnderNRFFunction {
+    description "EP_N96 contained under NRFFunction";
+  }
+  // === EP Groupings ===
+
   grouping EP_N2Grp {
     uses eprp3gpp:EP_Common;
   }
@@ -175,11 +455,9 @@ module _3gpp-5gc-nrm-ep {
   grouping EP_MAP_SMSCGrp {
     uses eprp3gpp:EP_Common;
   }
-
-  grouping EP_NLSGrp {
+  grouping EP_NL1Grp {
     uses eprp3gpp:EP_Common;
   }
-
   grouping EP_NL2Grp {
     uses eprp3gpp:EP_Common;
   }
@@ -192,286 +470,663 @@ module _3gpp-5gc-nrm-ep {
       type string;
     }
   }
+  grouping EP_N40Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N28Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N41Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N60Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N3mbGrp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N19mbGrp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N4mbGrp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Nmb9Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Nmb1Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N58Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N59Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Npc4Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Npc6Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Npc7Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL7Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL10Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N96Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_SM14Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N34Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N33Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_Npc8Grp {
+    uses eprp3gpp:EP_Common;
+  }
+ 
+  grouping EP_N84Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N85Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N63Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL5Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL9Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL3Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL6Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_NL8Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_SM13Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N61Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N62Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N42Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N11mbGrp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N88Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N16mbGrp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N86Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N87Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  grouping EP_N89Grp {
+    uses eprp3gpp:EP_Common;
+  }
+  // === Subtree groupings for EPs under 2+ functions ===
 
-  augment "/me3gpp:ManagedElement/af3gpp:AFFunction" {
-    list EP_N6 {
-      description "Represents the EP_N6 IOC.";
+  grouping EP_N2Subtree {
+    list EP_N2 {
+      description "Represents the EP_N2 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N6Grp;
-      }
+      container attributes { uses EP_N2Grp; }
     }
-
-    list EP_Rx {
-      description "Represents the EP_Rx IOC.";
+  }
+  grouping EP_N3Subtree {
+    list EP_N3 {
+      description "Represents the EP_N3 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_RxGrp;
-      }
+      container attributes { uses EP_N3Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/amf3gpp:AMFFunction" {
-    list EP_N2 {
-      description "Represents the EP_N2 IOC.";
+  grouping EP_N4Subtree {
+    list EP_N4 {
+      description "Represents the EP_N4 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N2Grp;
-      }
+      container attributes { uses EP_N4Grp; }
     }
-
+  }
+  grouping EP_N5Subtree {
+    list EP_N5 {
+      description "Represents the EP_N5 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N5Grp; }
+    }
+  }
+  grouping EP_N6Subtree {
+    list EP_N6 {
+      description "Represents the EP_N6 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N6Grp; }
+    }
+  }
+  grouping EP_N7Subtree {
+    list EP_N7 {
+      description "Represents the EP_N7 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N7Grp; }
+    }
+  }
+  grouping EP_N8Subtree {
     list EP_N8 {
       description "Represents the EP_N8 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N8Grp;
-      }
+      container attributes { uses EP_N8Grp; }
     }
-
+  }
+  grouping EP_N10Subtree {
+    list EP_N10 {
+      description "Represents the EP_N10 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N10Grp; }
+    }
+  }
+  grouping EP_N11Subtree {
     list EP_N11 {
       description "Represents the EP_N11 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N11Grp;
-      }
+      container attributes { uses EP_N11Grp; }
     }
-
+  }
+  grouping EP_N12Subtree {
     list EP_N12 {
       description "Represents the EP_N12 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N12Grp;
-      }
+      container attributes { uses EP_N12Grp; }
     }
-
-    list EP_N14 {
-      description "Represents the EP_N14 IOC.";
+  }
+  grouping EP_N13Subtree {
+    list EP_N13 {
+      description "Represents the EP_N13 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N14Grp;
-      }
+      container attributes { uses EP_N13Grp; }
     }
-
+  }
+  grouping EP_N15Subtree {
     list EP_N15 {
       description "Represents the EP_N15 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N15Grp;
-      }
+      container attributes { uses EP_N15Grp; }
     }
-
+  }
+  grouping EP_N16Subtree {
+    list EP_N16 {
+      description "Represents the EP_N16 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N16Grp; }
+    }
+  }
+  grouping EP_N17Subtree {
     list EP_N17 {
       description "Represents the EP_N17 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N17Grp;
-      }
+      container attributes { uses EP_N17Grp; }
     }
-
+  }
+  grouping EP_N20Subtree {
     list EP_N20 {
       description "Represents the EP_N20 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N20Grp;
-      }
+      container attributes { uses EP_N20Grp; }
     }
-
+  }
+  grouping EP_N22Subtree {
     list EP_N22 {
       description "Represents the EP_N22 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N22Grp;
-      }
+      container attributes { uses EP_N22Grp; }
     }
-
-    list EP_N26 {
-      description "Represents the EP_N26 IOC.";
+  }
+  grouping EP_NL1Subtree {
+    list EP_NL1 {
+      description "Represents the EP_NL1 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N26Grp;
-      }
+      container attributes { uses EP_NL1Grp; }
     }
-
-    list EP_NLS {
-      description "Represents the EP_NLS IOC.";
+  }
+  grouping EP_NL6Subtree {
+    list EP_NL6 {
+      description "Represents the EP_NL6 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_NLSGrp;
-      }
+      container attributes { uses EP_NL6Grp; }
     }
-
+  }
+  grouping EP_NL9Subtree {
+    list EP_NL9 {
+      description "Represents the EP_NL9 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_NL9Grp; }
+    }
+  }
+  grouping EP_NL2Subtree {
     list EP_NL2 {
       description "Represents the EP_NL2 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_NL2Grp;
-      }
+      container attributes { uses EP_NL2Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/ausf3gpp:AUSFFunction" {
-    list EP_N12 {
-      description "Represents the EP_N12 IOC.";
+  grouping EP_NL3Subtree {
+    list EP_NL3 {
+      description "Represents the EP_NL3 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N12Grp;
-      }
+      container attributes { uses EP_NL3Grp; }
     }
-
-    list EP_N13 {
-      description "Represents the EP_N13 IOC.";
+  }
+  grouping EP_NL5Subtree {
+    list EP_NL5 {
+      description "Represents the EP_NL5 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N13Grp;
-      }
+      container attributes { uses EP_NL5Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/dn3gpp:DNFunction" {
-    list EP_N6 {
-      description "Represents the EP_N6 IOC.";
+  grouping EP_NL10Subtree {
+    list EP_NL10 {
+      description "Represents the EP_NL10 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N6Grp;
-      }
+      container attributes { uses EP_NL10Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/lmf3gpp:LMFFunction" {
-    list EP_NLS {
-      description "Represents the EP_NLS IOC.";
+  grouping EP_NL8Subtree {
+    list EP_NL8 {
+      description "Represents the EP_NL8 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_NLSGrp;
-      }
+      container attributes { uses EP_NL8Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/n3iwf3gpp:N3IWFFunction" {
-    list EP_N2 {
-      description "Represents the EP_N2 IOC.";
+  grouping EP_N34Subtree {
+    list EP_N34 {
+      description "Represents the EP_N34 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N2Grp;
-      }
+      container attributes { uses EP_N34Grp; }
     }
-
-    list EP_N3 {
-      description "Represents the EP_N3 IOC.";
+  }
+  grouping EP_N26Subtree {
+    list EP_N26 {
+      description "Represents the EP_N26 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N3Grp;
-      }
+      container attributes { uses EP_N26Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/ngeir3gpp:NGEIRFunction" {
-    list EP_N17 {
-      description "Represents the EP_N17 IOC.";
+  grouping EP_N89Subtree {
+    list EP_N89 {
+      description "Represents the EP_N89 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N17Grp;
-      }
+      container attributes { uses EP_N89Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/nrf3gpp:NRFFunction" {
-    list EP_N27 {
-      description "Represents the EP_N27 IOC.";
+  grouping EP_N11mbSubtree {
+    list EP_N11mb {
+      description "Represents the EP_N11mb IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N26Grp;
-      }
+      container attributes { uses EP_N11mbGrp; }
     }
-
   }
-
-  augment "/me3gpp:ManagedElement/nssf3gpp:NSSFFunction" {
-    list EP_N22 {
-      description "Represents the EP_N22 IOC.";
+  grouping EP_N61Subtree {
+    list EP_N61 {
+      description "Represents the EP_N61 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N22Grp;
-      }
+      container attributes { uses EP_N61Grp; }
     }
-
-    list EP_N31 {
-      description "Represents the EP_N31 IOC.";
+  }
+  grouping EP_N62Subtree {
+    list EP_N62 {
+      description "Represents the EP_N62 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N31Grp;
-      }
+      container attributes { uses EP_N62Grp; }
     }
   }
-
-  augment "/me3gpp:ManagedElement/pcf3gpp:PCFFunction" {
-    list EP_N5 {
-      description "Represents the EP_N5 IOC.";
+  grouping EP_N63Subtree {
+    list EP_N63 {
+      description "Represents the EP_N63 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N63Grp; }
+    }
+  }
+  grouping EP_N88Subtree {
+    list EP_N88 {
+      description "Represents the EP_N88 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N88Grp; }
+    }
+  }
+  grouping EP_N16mbSubtree {
+    list EP_N16mb {
+      description "Represents the EP_N16mb IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N16mbGrp; }
+    }
+  }
+  grouping EP_N4mbSubtree {
+    list EP_N4mb {
+      description "Represents the EP_N4mb IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N4mbGrp; }
+    }
+  }
+  grouping EP_RxSubtree {
+    list EP_Rx {
+      description "Represents the EP_Rx IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N5Grp;
-      }
+      container attributes { uses EP_RxGrp; }
     }
+  }
+  grouping EP_N40Subtree {
+    list EP_N40 {
+      description "Represents the EP_N40 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N40Grp; }
+    }
+  }
+  grouping EP_N28Subtree {
+    list EP_N28 {
+      description "Represents the EP_N28 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N28Grp; }
+    }
+  }
+  grouping EP_N41Subtree {
+    list EP_N41 {
+      description "Represents the EP_N41 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N41Grp; }
+    }
+  }
+  grouping EP_N60Subtree {
+    list EP_N60 {
+      description "Represents the EP_N60 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N60Grp; }
+    }
+  }
+  grouping EP_N19mbSubtree {
+    list EP_N19mb {
+      description "Represents the EP_N19mb IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N19mbGrp; }
+    }
+  }
+  grouping EP_N84Subtree {
+    list EP_N84 {
+      description "Represents the EP_N84 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N84Grp; }
+    }
+  }
+  grouping EP_N85Subtree {
+    list EP_N85 {
+      description "Represents the EP_N85 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N85Grp; }
+    }
+  }
+  grouping EP_N86Subtree {
+    list EP_N86 {
+      description "Represents the EP_N86 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N86Grp; }
+    }
+  }
+  grouping EP_N87Subtree {
+    list EP_N87 {
+      description "Represents the EP_N87 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N87Grp; }
+    }
+  }
+  grouping EP_N96Subtree {
+    list EP_N96 {
+      description "Represents the EP_N96 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N96Grp; }
+    }
+  }
 
-    list EP_N7 {
-      description "Represents the EP_N7 IOC.";
+  // === Augments ===
+
+  augment "/me3gpp:ManagedElement/af3gpp:AFFunction" {
+    uses EP_N5Subtree {
+      if-feature EP_N5UnderAFFunction;
+    }
+    uses EP_RxSubtree {
+      if-feature EP_RxUnderAFFunction;
+    }
+    uses EP_N62Subtree {
+      if-feature EP_N62UnderAFFunction;
+    }
+    uses EP_N86Subtree {
+      if-feature EP_N86UnderAFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/amf3gpp:AMFFunction" {
+    uses EP_N2Subtree {
+      if-feature EP_N2UnderAMFFunction;
+    }
+    uses EP_N8Subtree {
+      if-feature EP_N8UnderAMFFunction;
+    }
+    uses EP_N11Subtree {
+      if-feature EP_N11UnderAMFFunction;
+    }
+    uses EP_N12Subtree {
+      if-feature EP_N12UnderAMFFunction;
+    }
+    list EP_N14 {
+      description "Represents the EP_N14 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_N14Grp; }
+    }
+    uses EP_N15Subtree {
+      if-feature EP_N15UnderAMFFunction;
+    }
+    uses EP_N17Subtree {
+      if-feature EP_N17UnderAMFFunction;
+    }
+    uses EP_N20Subtree {
+      if-feature EP_N20UnderAMFFunction;
+    }
+    uses EP_N22Subtree {
+      if-feature EP_N22UnderAMFFunction;
+    }
+    uses EP_N26Subtree {
+      if-feature EP_N26UnderAMFFunction;
+    }
+    uses EP_NL1Subtree {
+      if-feature EP_NL1UnderAMFFunction;
+    }
+    uses EP_NL2Subtree {
+      if-feature EP_NL2UnderAMFFunction;
+    }
+    uses EP_N41Subtree {
+      if-feature EP_N41UnderAMFFunction;
+    }
+    uses EP_N60Subtree {
+      if-feature EP_N60UnderAMFFunction;
+    }
+    list EP_N42 {
+      description "Represents the EP_N42 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N7Grp;
-      }
+      container attributes { uses EP_N42Grp; }
+    }
+    uses EP_N89Subtree {
+      if-feature EP_N89UnderAMFFunction;
+    }
+    uses EP_N11mbSubtree {
+      if-feature EP_N11mbUnderAMFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/ausf3gpp:AUSFFunction" {
+    uses EP_N12Subtree {
+      if-feature EP_N12UnderAUSFFunction;
+    }
+    uses EP_N13Subtree {
+      if-feature EP_N13UnderAUSFFunction;
+    }
+    uses EP_N61Subtree {
+      if-feature EP_N61UnderAUSFFunction;
     }
+  }
 
-    list EP_N15 {
-      description "Represents the EP_N15 IOC.";
+  augment "/me3gpp:ManagedElement/lmf3gpp:LMFFunction" {
+    uses EP_NL1Subtree {
+      if-feature EP_NL1UnderLMFFunction;
+    }
+    uses EP_NL8Subtree {
+      if-feature EP_NL8UnderLMFFunction;
+    }
+    list EP_NL7 {
+      description "Represents the EP_NL7 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N15Grp;
-      }
+      container attributes { uses EP_NL7Grp; }
+    }
+    uses EP_NL10Subtree {
+      if-feature EP_NL10UnderLMFFunction;
     }
+  }
 
-    list EP_N16 {
-      description "Represents the EP_N16 IOC.";
+  augment "/me3gpp:ManagedElement/n3iwf3gpp:N3IWFFunction" {
+    uses EP_N2Subtree {
+      if-feature EP_N2UnderN3IWFFunction;
+    }
+    uses EP_N3Subtree {
+      if-feature EP_N3UnderN3IWFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/ngeir3gpp:NGEIRFunction" {
+    uses EP_N17Subtree {
+      if-feature EP_N17UnderNGEIRFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/nrf3gpp:NRFFunction" {
+    list EP_N27 {
+      description "Represents the EP_N27 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N16Grp;
-      }
+      container attributes { uses EP_N27Grp; }
+    }
+    uses EP_N96Subtree {
+      if-feature EP_N96UnderNRFFunction;
     }
+    list EP_SM14 {
+      description "Represents the EP_SM14 IOC.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes { uses EP_SM14Grp; }
+    }
+  }
 
-    list EP_Rx {
-      description "Represents the EP_Rx IOC.";
+  augment "/me3gpp:ManagedElement/nssf3gpp:NSSFFunction" {
+    uses EP_N22Subtree {
+      if-feature EP_N22UnderNSSFFunction;
+    }
+    list EP_N31 {
+      description "Represents the EP_N31 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_RxGrp;
-      }
+      container attributes { uses EP_N31Grp; }
+    }
+    uses EP_N34Subtree {
+      if-feature EP_N34UnderNSSFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/pcf3gpp:PCFFunction" {
+    uses EP_N5Subtree {
+      if-feature EP_N5UnderPCFFunction;
+    }
+    uses EP_N7Subtree {
+      if-feature EP_N7UnderPCFFunction;
+    }
+    uses EP_N15Subtree {
+      if-feature EP_N15UnderPCFFunction;
+    }
+    uses EP_N16Subtree {
+      if-feature EP_N16UnderPCFFunction;
+    }
+    uses EP_RxSubtree {
+      if-feature EP_RxUnderPCFFunction;
+    }
+    uses EP_N28Subtree {
+      if-feature EP_N28UnderPCFFunction;
+    }
+    uses EP_N84Subtree {
+      if-feature EP_N84UnderPCFFunction;
     }
   }
 
@@ -480,171 +1135,314 @@ module _3gpp-5gc-nrm-ep {
       description "Represents the EP_N32 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N32Grp;
-      }
+      container attributes { uses EP_N32Grp; }
     }
+  }
 
- }
   augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" {
-    list EP_N20 {
-      description "Represents the EP_20 IOC.";
-      key id;
-      uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N20Grp;
-      }
+    uses EP_N20Subtree {
+      if-feature EP_N20UnderSMSFFunction;
     }
-
     list EP_N21 {
       description "Represents the EP_N21 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N21Grp;
-      }
+      container attributes { uses EP_N21Grp; }
     }
-
     list EP_MAP_SMSC {
       description "Represents the EP_MAP_SMSC IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_MAP_SMSCGrp;
-      }
+      container attributes { uses EP_MAP_SMSCGrp; }
     }
   }
 
   augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
-    list EP_N4 {
-      description "Represents the EP_N4 IOC.";
+    uses EP_N4Subtree {
+      if-feature EP_N4UnderSMFFunction;
+    }
+    uses EP_N7Subtree {
+      if-feature EP_N7UnderSMFFunction;
+    }
+    uses EP_N10Subtree {
+      if-feature EP_N10UnderSMFFunction;
+    }
+    uses EP_N11Subtree {
+      if-feature EP_N11UnderSMFFunction;
+    }
+    uses EP_N16Subtree {
+      if-feature EP_N16UnderSMFFunction;
+    }
+    list EP_S5C {
+      description "Represents the EP_S5C IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N4Grp;
-      }
+      container attributes { uses EP_S5CGrp; }
+    }
+    uses EP_N40Subtree {
+      if-feature EP_N40UnderSMFFunction;
     }
+    uses EP_N88Subtree {
+      if-feature EP_N88UnderSMFFunction;
+    }
+    uses EP_N16mbSubtree {
+      if-feature EP_N16mbUnderSMFFunction;
+    }
+  }
 
-    list EP_N7 {
-      description "Represents the EP_N7 IOC.";
+  augment "/me3gpp:ManagedElement/udm3gpp:UDMFunction" {
+    uses EP_N8Subtree {
+      if-feature EP_N8UnderUDMFunction;
+    }
+    uses EP_N10Subtree {
+      if-feature EP_N10UnderUDMFunction;
+    }
+    uses EP_N13Subtree {
+      if-feature EP_N13UnderUDMFunction;
+    }
+    uses EP_NL6Subtree {
+      if-feature EP_NL6UnderUDMFunction;
+    }
+    uses EP_N87Subtree {
+      if-feature EP_N87UnderUDMFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/upf3gpp:UPFFunction" {
+    uses EP_N4Subtree {
+      if-feature EP_N4UnderUPFFunction;
+    }
+    uses EP_N3Subtree {
+      if-feature EP_N3UnderUPFFunction;
+    }
+    list EP_N9 {
+      description "Represents the EP_N9 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N7Grp;
-      }
+      container attributes { uses EP_N9Grp; }
     }
-
-    list EP_N10 {
-      description "Represents the EP_N10 IOC.";
+    list EP_S5U {
+      description "Represents the EP_S5U IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N10Grp;
-      }
+      container attributes { uses EP_S5UGrp; }
     }
+    uses EP_N6Subtree {
+      if-feature EP_N6UnderUPFFunction;
+    }
+    uses EP_N19mbSubtree {
+      if-feature EP_N19mbUnderUPFFunction;
+    }
+  }
 
-    list EP_N11 {
-      description "Represents the EP_N11 IOC.";
+  augment "/me3gpp:ManagedElement/mbupf3gpp:MBUPFFunction" {
+    list EP_N3mb {
+      description "Represents the EP_N3mb IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N11Grp;
-      }
+      container attributes { uses EP_N3mbGrp; }
     }
-
-    list EP_N16 {
-      description "Represents the EP_N16 IOC.";
+    uses EP_N19mbSubtree {
+      if-feature EP_N19mbUnderMBUPFFunction;
+    }
+    uses EP_N4mbSubtree {
+      if-feature EP_N4mbUnderMBUPFFunction;
+    }
+    list EP_Nmb9 {
+      description "Represents the EP_Nmb9 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N16Grp;
-      }
+      container attributes { uses EP_Nmb9Grp; }
     }
+  }
 
-    list EP_S5C {
-    description "Represents the EP_S5C IOC.";
+  augment "/me3gpp:ManagedElement/mbsmf3gpp:MBSMFFunction" {
+    list EP_Nmb1 {
+      description "This IOC represents the Nmb1 interface
+        between MB-SMF and MBSF, which is defined in
+        TS 23.247.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_S5CGrp;
-      }
+      container attributes { uses EP_Nmb1Grp; }
+    }
+    uses EP_N11mbSubtree {
+      if-feature EP_N11mbUnderMBSMFFunction;
+    }
+    uses EP_N16mbSubtree {
+      if-feature EP_N16mbUnderMBSMFFunction;
+    }
+    uses EP_N4mbSubtree {
+      if-feature EP_N4mbUnderMBSMFFunction;
     }
   }
 
-  augment "/me3gpp:ManagedElement/udm3gpp:UDMFunction" {
-    list EP_N8 {
-      description "Represents the EP_N8 IOC.";
+  augment "/me3gpp:ManagedElement/chf3gpp:CHFFunction" {
+    uses EP_N40Subtree {
+      if-feature EP_N40UnderCHFFunction;
+    }
+    uses EP_N28Subtree {
+      if-feature EP_N28UnderCHFFunction;
+    }
+    uses EP_N41Subtree {
+      if-feature EP_N41UnderCHFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/nsacf3gpp:NSACFFunction" {
+    uses EP_N60Subtree {
+      if-feature EP_N60UnderNSACFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/nssaaf3gpp:NSSAAFFunction" {
+    list EP_N58 {
+      description "This IOC represents an end point of N58 interface
+      between NSSAAF and AMF, which is defined in TS 23.501 [2] and
+      33.501 [52].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N8Grp;
-      }
+      container attributes { uses EP_N58Grp; }
     }
-
-    list EP_N10 {
-      description "Represents the EP_N10 IOC.";
+    list EP_N59 {
+      description "This IOC represents an end point of N59 interface
+      between NSSAAF and UDM, which is defined in TS 23.501 [2] and
+      33.501 [52].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N10Grp;
-      }
+      container attributes { uses EP_N59Grp; }
     }
+  }
 
-    list EP_N13 {
-      description "Represents the EP_N13 IOC.";
+  augment "/me3gpp:ManagedElement/ddnmf3gpp:DDNMFFunction" {
+    list EP_Npc4 {
+      description "This IOC represents the Npc4 interface between the UDM
+       and 5G DDNMF, which is defined in 3GPP TS 23.304 [73].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N13Grp;
-      }
+      container attributes { uses EP_Npc4Grp; }
     }
 
-  }
-
-  augment "/me3gpp:ManagedElement/upf3gpp:UPFFunction" {
-    list EP_N4 {
-      description "Represents the EP_N4 IOC.";
+    list EP_Npc6 {
+      description "This IOC represents the Npc6 interface between the 5G DDNMF
+      in the HPLMN and the 5G DDNMF in a Local PLMN (5G ProSe Direct Discovery)
+      , which is defined in TS 23.304 [73].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N4Grp;
-      }
+      container attributes { uses EP_Npc6Grp; }
     }
 
-    list EP_N3 {
-      description "Represents the EP_N3 IOC.";
+    list EP_Npc7 {
+      description "This IOC represents the Npc7 interface between the 5G DDNMF
+      in the HPLMN and the 5G DDNMF in the VPLMN, which is defined in 
+      TS 23.304 [73].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N3Grp;
-      }
+      container attributes { uses EP_Npc7Grp; }
     }
 
-    list EP_N9 {
-      description "Represents the EP_N9 IOC.";
+    list EP_Npc8 {
+      description "This IOC represents the Npc8 interface between the PCF and 5
+      G DDNMF, which is defined in 3GPP TS 23.304 [73].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N9Grp;
-      }
+      container attributes { uses EP_Npc8Grp; }
     }
+  }
 
-    list EP_S5U {
-      description "Represents the EP_S5U IOC.";
+  augment "/me3gpp:ManagedElement/tsctsf3gpp:TSCTSFFunction" {
+    uses EP_N84Subtree {
+      if-feature EP_N84UnderTSCTSFFunction;
+    }
+    uses EP_N85Subtree {
+      if-feature EP_N85UnderTSCTSFFunction;
+    }
+    uses EP_N86Subtree {
+      if-feature EP_N86UnderTSCTSFFunction;
+    }
+    uses EP_N87Subtree {
+      if-feature EP_N87UnderTSCTSFFunction;
+    }
+    uses EP_N89Subtree {
+      if-feature EP_N89UnderTSCTSFFunction;
+    }
+    uses EP_N96Subtree {
+      if-feature EP_N96UnderTSCTSFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/nef3gpp:NEFFunction" {
+    list EP_N33 {
+      description "Represents the EP_N33 IOC.";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_S5UGrp;
-      }
+      container attributes { uses EP_N33Grp; }
+    }
+    uses EP_N85Subtree {
+      if-feature EP_N85UnderNEFFunction;
+    }
+    uses EP_N63Subtree {
+      if-feature EP_N63UnderNEFFunction;
+    }
+    uses EP_NL5Subtree {
+      if-feature EP_NL5UnderNEFFunction;
     }
+  }
 
-    list EP_EP_N6 {
-      description "Represents the EP_N6 IOC.";
+  augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" {
+    uses EP_NL9Subtree {
+      if-feature EP_NL9UnderNWDAFFunction;
+    }
+    uses EP_N34Subtree {
+      if-feature EP_N34UnderNWDAFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/gmlc3gpp:GMLCFunction" {
+    uses EP_NL9Subtree {
+      if-feature EP_NL9UnderGMLCFunction;
+    }
+    uses EP_NL2Subtree {
+      if-feature EP_NL2UnderGMLCFunction;
+    }
+    uses EP_NL3Subtree {
+      if-feature EP_NL3UnderGMLCFunction;
+    }
+    uses EP_NL5Subtree {
+      if-feature EP_NL5UnderGMLCFunction;
+    }
+    uses EP_NL6Subtree {
+      if-feature EP_NL6UnderGMLCFunction;
+    }
+    uses EP_NL10Subtree {
+      if-feature EP_NL10UnderGMLCFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/scp3gpp:SCPFunction" {
+    list EP_SM13 {
+      description "This IOC represents the SM13 interface between MNPF
+      and SCP, and it is defined in TS 23.540 [100].";
       key id;
       uses top3gpp:Top_Grp;
-      container attributes {
-        uses EP_N6Grp;
-      }
+      container attributes { uses EP_SM13Grp; }
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/aanf3gpp:AANFFunction" {
+    uses EP_N61Subtree {
+      if-feature EP_N61UnderAANFFunction;
+    }
+    uses EP_N62Subtree {
+      if-feature EP_N62UnderAANFFunction;
+    }
+    uses EP_N63Subtree {
+      if-feature EP_N63UnderAANFFunction;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement/easdf3gpp:EASDFFunction" {
+    uses EP_N88Subtree {
+      if-feature EP_N88UnderEASDFFunction;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang
index b44dd2119874ace88e19e1e485c92999f43625ed..59c3738640826a12aa878e1f9cbc4f3f247ff5f0 100644
--- a/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-gmlcfunction.yang
@@ -13,109 +13,111 @@ module _3gpp-5gc-nrm-gmlcfunction {
   organization "3GPP SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This module defines the GMLC Function IOC per 3GPP TS 28.541.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-    revision 2025-07-25 { reference CR-1558 ; }
-    revision 2025-03-25 { reference CR-1489 ; }
-    revision 2025-03-25 {
+  revision 2026-05-19 { reference "CR-1702 CR-1703" ; } // rel-19, 20 common
+  revision 2025-07-25 { reference CR-1558 ; }
+  revision 2025-03-25 { reference CR-1489 ; }
+  revision 2025-03-25 {
     description "Initial revision.";
     reference "3GPP TS 28.541";
   }
 
-    grouping GmlcInfoGrp {
-    description "Information of a GMLC NF Instance (see TS 29.510,
-    clause 6.1.6.2.41).";
+  grouping GmlcInfoGrp {
+  description "Information of a GMLC NF Instance (see TS 29.510,
+  clause 6.1.6.2.41).";
 
-        leaf servingClientTypes {
-            description "Identity of the GMLC group that is served by
-             the GMLC instance.";
-            type enumeration {
-                enum EMERGENCY_SERVICES {
-                description "External client for emergency services";
-                }
-                    enum VALUE_ADDED_SERVICES {
-                description "External client for value added services";
-                }
-                enum PLMN_OPERATOR_SERVICES {
-                description "External client for PLMN operator services";
-                }
-                enum LAWFUL_INTERCEPT_SERVICES {
-                description "External client for Lawful Intercept services";
-                }
-                enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES {
-                description "External client for PLMN Operator Broadcast
-                services";
-                }
-                enum PLMN_OPERATOR_OM {
-                 description "External client for PLMN Operator O&M";
-                }
-                enum PLMN_OPERATOR_ANONYMOUS_STATISTICS {
-                description "External client for PLMN Operator anonymous
-                statistics";
-                }
-                enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT {
-                description "External client for PLMN Operator target MS
-                service support";
-                }
-            }
+      leaf servingClientTypes {
+          description "Identity of the GMLC group that is served by
+           the GMLC instance.";
+          type enumeration {
+              enum EMERGENCY_SERVICES {
+              description "External client for emergency services";
+              }
+                  enum VALUE_ADDED_SERVICES {
+              description "External client for value added services";
+              }
+              enum PLMN_OPERATOR_SERVICES {
+              description "External client for PLMN operator services";
+              }
+              enum LAWFUL_INTERCEPT_SERVICES {
+              description "External client for Lawful Intercept services";
+              }
+              enum EXTERNAL_CLIENT_FOR_LAWFUL_INTERCEPT_SERVICES {
+              description "External client for PLMN Operator Broadcast
+              services";
+              }
+              enum PLMN_OPERATOR_OM {
+               description "External client for PLMN Operator O&M";
+              }
+              enum PLMN_OPERATOR_ANONYMOUS_STATISTICS {
+              description "External client for PLMN Operator anonymous
+              statistics";
+              }
+              enum PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT {
+              description "External client for PLMN Operator target MS
+              service support";
+              }
+          }
 
-        }
-        leaf gmlcNumbers{
-        type string{
-        pattern "^[0-9]{5,15}$";
-        }
-        description "This attribute represents each item of the array
-        shall carry an OctetString indicating the ISDN number of the GMLC in
-        international number format as described in ITU-T Rec. E.164 [94] and
-        shall be encoded as a TBCD-string.";
+      }
+      leaf gmlcNumbers{
+      type string{
+      pattern "^[0-9]{5,15}$";
+      }
+      description "This attribute represents each item of the array
+      shall carry an OctetString indicating the ISDN number of the GMLC in
+      international number format as described in ITU-T Rec. E.164 [94] and
+      shall be encoded as a TBCD-string.";
 
-        }
-    }
+      }
+  }
 
-    grouping GMLCFunctionGrp {
+  grouping GMLCFunctionGrp {
     description "GMLC Function IOC grouping.";
        uses mf3gpp:ManagedFunctionGrp;
 
-        list pLMNInfoList {
-          description "It defines the PLMN(s) of a Network Function. ";
-          key "idx";
-          leaf idx { type uint32; }
-          min-elements 1;
-          uses types3gpp:PLMNId;
-        }
-        leaf sBIFqdn {
-          type string;
-          description "FQDN of the registered NF instance in the
-           service-based interface.";
-        }
-        list managedNFProfile {
-        description "This parameter defines profile for managed NF.
-         See TS 23.501";
-        key idx;
+      list pLMNInfoList {
+        description "It defines the PLMN(s) of a Network Function. ";
+        key "idx";
         leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:ManagedNFProfileGrp;
-        }
-        list commModelList {
-          description "The attribute specifies a list of commModel which is 
-          defined as a datatype (see clause 5.3.69). It can be used by NF 
-          and NF services to interact with each other in 5G Core network ";
-          reference "see TS 23.501.";
-          key "groupId";
-          min-elements 1;
-          uses types5g3gpp:CommModel;
-        }
-        list gmlcInfo {
-          description "This attribute represents information of an GMLC NF
-          Instance.";
-          key "idx";
-          leaf idx { type uint32; }
-          max-elements 1;
-          uses GmlcInfoGrp;
-        }
-    }
+        uses types3gpp:PLMNId;
+      }
+      leaf sBIFQDN {
+        type string;
+        description "FQDN of the registered NF instance in the
+         service-based interface.";
+      }
+      list managedNFProfile {
+      description "This parameter defines profile for managed NF.
+       See TS 23.501";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses mnfp3gpp:ManagedNFProfileGrp;
+      }
+      list commModelList {
+        description "The attribute specifies a list of commModel which is 
+        defined as a datatype (see clause 5.3.69). It can be used by NF 
+        and NF services to interact with each other in 5G Core network ";
+        reference "see TS 23.501.";
+        key "groupId";
+        min-elements 1;
+        uses types5g3gpp:CommModel;
+      }
+      list gmlcInfo {
+        description "This attribute represents information of an GMLC NF
+        Instance.";
+        key "idx";
+        leaf idx { type uint32; }
+        max-elements 1;
+        uses GmlcInfoGrp;
+      }
+  }
+    
   augment "/me3gpp:ManagedElement" {
     list GMLCFunction {
       description "5G Core LMF Function defined in TS 23.501";
diff --git a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang
index a2e10ebcc6f1e1277f212a7c14b61ad68489671d..2d6d6caed02d3880994603f3317258f8e8217f24 100755
--- a/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang
+++ b/yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang
@@ -10,14 +10,16 @@ module _3gpp-5gc-nrm-managed-nfprofile {
   import _3gpp-5gc-nrm-nfservice { prefix nfs3gpp; }
   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 "NF profile class.
-Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
-TTA, TTC). All rights reserved.";
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "NF profile dataType.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
 
-revision 2025-07-25 { reference CR-1558 ; }
+  revision 2026-05-25 { reference CR-1702 ; }
+  revision 2026-03-25 { reference CR-1694 ; }
+  revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-07-25 { reference "initial revision"; }
 
     grouping SPNInfoIdGrp {
@@ -53,220 +55,10 @@ revision 2025-07-25 { reference CR-1558 ; }
             type types3gpp:NfType;
         }
     }
-    grouping SupiRangeGrp {
-    leaf start {
-        description "First value identifying the start ofa SUPI range.To be
-        used when the range of SUPI's can be represented as a numeric range
-        (e.g., IMSI ranges).";
-        type string {
-            pattern '^[0-9]+$';
-            }
-        }
-
-    leaf end {
-        description "Last value identifying the end of a SUPI range.To be
-        used when the range of SUPI's can be represented as a numeric range
-        (e.g. IMSI ranges).";
-        type string {
-            pattern '^[0-9]+$';
-            }
-        }
-
-    leaf pattern {
-        description "Pattern representing the set of SUPI's belonging to
-        this range.A SUPI value is considered part of the range if and
-        only if the SUPI string fully matches the regular expression.";
-        type string;
-        }
-    }
-
-    grouping ConditionItemGrp {
-        description "This data type represents a single condition item that
-        shall be evaluated to determine whether a discovered NF (Service)
-        Instance shall be selected.";
-
-        leaf consumerNfTypes {
-            description "It represents the NF types of the consumers for
-            which the conditions included in this ConditionItem apply.
-            If this attribute is absent, the conditions are applicable
-            to all NF consumer types.";
-            type types3gpp:NfType;
-        }
-        leaf serviceFeature {
-            description "It represents a feature number of that NF Service
-                Instance,under CANARY_RELEASE status. This attribute only
-                applies when the          selectionConditions, where this
-                ConditionItem is included, is included in a NF Service Instance
-                This condition is evaluated to <true> when the service requests
-                froma consumer of this NF Service Instance require the support
-                 of the indicated feature on the NF Service Instance.";
-            type uint32; // positive integer, 0 excluded by context
-        }
-        leaf vsServiceFeature {
-            description "It represents a Vendor-Specific feature
-                number of thatNF Service Instance, under CANARY_RELEASE
-                status. This attribute only applies when the
-                selectionConditions, where this ConditionItem is included,
-                is included in a NF Service Instance.This condition is
-                evaluated to true when the service requests from a
-                consumer of this NF Service Instance require the support
-                of the indicated Vendor-Specific feature on the NF
-                Service Instance.";
-            type uint32;
-        }
-        list supiRangeList {
-            description "It represents a set of SUPIs for which
-                the NF (Service) instance under CANARY_RELEASE status shall
-                 be selected.";
-            key idx;
-            leaf idx { type uint32; }
-            uses SupiRangeGrp;
-        }
-        list gpsiRangeList {
-            description "It represents a set of GPSIs for which the NF
-                (Service)
-                instance under CANARY_RELEASE status shall be selected";
-            min-elements 1;
-            key idx;
-            leaf idx { type uint32; }
-            uses IdentityRange;
-        }
-        list impuRangeList {
-            description "It represents a set of IMS Public Identities
-                for which the NF (Service) instance under CANARY_RELEASE
-                 status shall be selected";
-            min-elements 1;
-            key idx;
-            leaf idx { type uint32; }
-            uses IdentityRange;
-        }
-        list impiRangeList {
-            description "It represents a set of IMS Private Identities
-                for which theNF (Service) instance under
-                CANARY_RELEASE status shall be selected.";
-            min-elements 1;
-            key idx;
-            leaf idx { type uint32; }
-            uses IdentityRange;
-        }
-        leaf peiList {
-            description "It represents a set of PEIs of the UEs for
-                which the NF(Service) instance under CANARY_RELEASE status
-                shall be selected";
-            type string;
-        }
-        list taiRangeList {
-            description "It represents a set of TAIs where the
-                NF(Service) instance under CANARY_RELEASE status shall
-                be selected for a certain UE";
-            min-elements 1;
-            key idx;
-            leaf idx { type uint32; }
-            uses types5g3gpp:TaiRangeGrp;
-        }
-        leaf dnnList {
-            description " It represents a set of TAIs where the NF
-                (Service) instance under CANARY_RELEASE status shall be
-                selected for a certain UE";
-             type string;
-        }
-    }
-    grouping PlmnSnssai {
-        list plmnId {
-            description "PLMN ID for which list of supported S-NSSAI(s)
-            is provided.";
-            min-elements 1;
-            max-elements 1;
-            key "mcc mnc";
-            uses types3gpp:PLMNId;
-        }
-        list sNssaiList {
-            description "The specific list of S-NSSAIs supported
-            by the given PLMN.";
-            min-elements 1;
-            max-elements 1;
-            key "sst sd";
-            uses types5g3gpp:SNssai;
-        }
-        leaf nid {
-            description "Network Identity; Shall be present if PlmnIdNid
-            identifies an SNPN ";
-            reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4,
-            and 6.3.8 in 3GPP TS 23.501 ";
-            type string;
-        }
-    }
-
-    grouping ConditionGroupGrp {
-        description "This <<choice>> represents a group of conditions that
-        shall be evaluated to determine whether a discovered NF (Service)
-        Instanceshall be selected. (See clause 6.1.6.2.125 TS 29.510 [23]).";
-
-        choice LogicalOperator{
-          case and {
-            list and {
-              description "It represents a list of conditions where the
-              overall evaluation is true only if all the conditions
-              in the list are evaluated as true.";
-              key idx;
-              leaf idx { type uint32; }
-              uses SelectionConditionsGrp;
-            }
-
-          }
-          case or{
-            list or {
-              description "It represents a list of conditions where the
-               overall evaluation is true if at least one of the conditions
-               in the list evaluated as true";
-               key idx;
-               leaf idx { type uint32; }
-               uses SelectionConditionsGrp;
-               }
-            }
-        }
-
-    }
-
-    grouping SelectionConditionsGrp {
-        description "This data type represents the list of conditions that
-        shall be selected by an NF Service Consumer.";
-        reference "(See clause 6.1.6.2.123 TS 29.510 [23])";
-
-        list conditionItem{
-            key "id";
-            description "It represent a single condition item that shall be
-            evaluated Instance shall be selected.";
-            leaf id{
-            type string;
-            }
-            uses ConditionItemGrp;
-        }
-
-    // circular dependency for grouping "ConditionGroupGrp" introduced in
-    //stage 2
-    //    container conditionGroup{
-    //        description "It represents a group of conditions
-    //        that shall be evaluated";
-    //        uses ConditionGroupGrp;
-    //        }
-
-    }
-
-    grouping IdentityRange {
-        leaf start {
-            description "First value identifying the start of an identity range.
-            To be used when the range of identities can be represented
-            as a numeric range (e.g., MSISDN ranges).";
-            type string {
-                pattern '^[0-9]+$';
-                }
-        }
-        leaf end {type string; } // dummy
-        leaf pattern {type string; } // dummy
-    }
 
 grouping ManagedNFProfileGrp {
+    description "Represents the ManagedNFProfile <<dataType>> as defined in
+      clause 5.3.54 of 3GPP TS 28.541.";
 
     leaf nfInstanceId {
         description "String uniquely identifying a NF instance.";
@@ -371,9 +163,15 @@ grouping ManagedNFProfileGrp {
        of the NFService(s).";
       key idx;
       leaf idx { type uint32; }
-      uses PlmnSnssai;
+      uses nfs3gpp:PlmnSnssai;
+    }
+    leaf priority {
+      description "Priority (relative weight) of the NF instance, in the
+       range of 0-65535, compared to other NF instances of the same type,
+       to be used for NF selection; if capacity is also present in the
+       nfServiceList parameters, those will have precedence over this value.";
+      type uint16;
     }
-
     list allowedSNPNs {
       description "SNPNs allowed to access the NF instance.
       The absence of this attribute in the NF profile indicates that no SNPN,
@@ -405,12 +203,16 @@ grouping ManagedNFProfileGrp {
       uses types5g3gpp:SNssai;
     }
 
- //    list allowedRuleSet {
- //      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 RuleSet;?
-//    }
+    list allowedRuleSet {
+      description "It represents map of rules specifying NF-Consumers
+        allowed or denied to access the NF-Producer. It may be present
+        when the NF-Producer and the NRF support Allowed-ruleset feature
+        as specified in clause 6.1.9.";
+      reference "3GPP TS 29.510";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:RuleSetGrp;
+    }
     leaf locality {
       description "Operator defined information about the location
        of the NF instance (e.g. geographic location, data center).";
@@ -435,33 +237,37 @@ grouping ManagedNFProfileGrp {
 
     leaf load {
       description "Dynamic load information, ranged from 0 to 100,
-       indicates the current load percentage of the NF.";
+        indicates the current load percentage of the NF.";
       type types3gpp:Load;
+      config false;
     }
     leaf loadTimeStamp {
       description "It indicates the point in time in which the latest load
-      information (sent by the NF in the load attribute of the NF Profile)
-      was generated at the NF Instance.If the NF did not provide a timestamp,
-      the NRF should set it to the instant when the NRF received the message
-      where the NF provided the latest load information.";
-      type yang:date-and-time ;
+        information (sent by the NF in the load attribute of the NF Profile)
+        was generated at the NF Instance. If the NF did not provide a
+        timestamp, the NRF should set it to the instant when the NRF received
+        the message where the NF provided the latest load information.";
+      type yang:date-and-time;
+      config false;
     }
 
-    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";
+    leaf 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;
+      config false;
     }
     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 ";
+        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;
+      config false;
     }
     leaf-list nfSetIdList {
       type string ;
@@ -477,41 +283,41 @@ grouping ManagedNFProfileGrp {
       in a SNPN.At most one NF Set ID shall be indicated per PLMN-ID or SNPN
        of the NF.";
     }
-    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;
+    leaf 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.";
+      reference "Annex B 3GPP TS 29.510 [23]";
       type boolean;
+      config false;
     }
-     leaf-list nfProfilePartialUpdateChangesSupportInd {
+    leaf nfProfilePartialUpdateChangesSupportInd {
       description "It represents NF Profile Partial Update Changes Support
-      Indicator. TRUE: the NF Service Consumer supports receiving NF Profile
-      Changes in the response to an NF Profile Partial Update operation.
-      FALSE (default): the NF Service Consumer does not support receiving
-      NF Profile Changes in the response to an NF Profile Partial Update
-      operation";
-      max-elements 1;
+        Indicator. TRUE: the NF Service Consumer supports receiving NF
+        Profile Changes in the response to an NF Profile Partial Update
+        operation. FALSE (default): the NF Service Consumer does not
+        support receiving NF Profile Changes in the response to an NF
+        Profile Partial Update operation.";
       type boolean;
     }
-    leaf-list nfProfileChangesInd {
+    leaf nfProfileChangesInd {
       description "NF Profile Changes Indicator. This IE shall be absent
-       in the request to the NRF and may be included by the NRF
-       in NFRegister or NFUpdate (NF Profile Complete Replacement) response.
-                   true: the NF Profile contains NF Profile changes.
-                   false (default): complete NF Profile.";
-
+        in the request to the NRF and may be included by the NRF in
+        NFRegister or NFUpdate (NF Profile Complete Replacement) response.
+        true: the NF Profile contains NF Profile changes.
+        false (default): complete NF Profile.";
       type boolean;
-      max-elements 1;
+      config false;
     }
     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.";
+        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;
+      config false;
       uses types3gpp:DefaultNotificationSubscription;
     }
     leaf servingScope {
@@ -519,18 +325,16 @@ grouping ManagedNFProfileGrp {
       of a NF instance.";
       type string;
     }
-    leaf-list lcHSupportInd {
+    leaf 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 {
+    leaf 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 {
@@ -565,71 +369,54 @@ grouping ManagedNFProfileGrp {
       Server. It is an array of FQDN.";
       type string;
     }
-    leaf-list interPlmnFqdn {
+    leaf 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;
     }
-    list nfServices {
+    list nfServiceList {
       description "List of NF Service Instances. It shall include
-      the services produced by the NF that can be
-      discovered by other NFs.";
-      key serviceInstanceID;
+        the services produced by the NF that can be discovered by
+        other NFs.";
+      key serviceInstanceId;
       min-elements 1;
       uses nfs3gpp:NFServiceGrp;
     }
-     list supportedVendorSpecificFeatures {
-       description "It indicates a map of Vendor-Specific features, where the
-        key of the map is the IANA-assigned SMI Network Management Private
-        Enterprise Codes and the value of each entry of the map shall be
-        a list (array) of VendorSpecificFeature objects as defined
-        in the clause 5.3.247.";
-        key "enterpriseCode";
-
-        leaf enterpriseCode {
-          type uint32;
-          description "IANA-assigned SMI Network Management Private Enterprise Code";
-        }
-
-        list vendorSpecificFeature {
-          key "featureName";
-          config false;
-          description "VendorSpecificFeature objects as defined
-        in the clause 5.3.247.";
-        uses types5g3gpp:VendorSpecificFeatureGrp;
-        }      
-     }    
+    uses types5g3gpp:SupportedVendorSpecificFeaturesGrp;
 
     list selectionConditions {
-      description "Identifications of Credentials Holder or Default Credentials
-      Server. It is an array of FQDN.";
+      description "This attribute includes the conditions under which an NF
+        Instance with an NFStatus value set to CANARY_RELEASE, or with a
+        canaryRelease attribute set to true, shall be selected by an NF
+        Service Consumer.";
       leaf idx { type uint32; }
       key "idx";
-      uses SelectionConditionsGrp;
+      max-elements 1;
+      uses nfs3gpp:SelectionConditionsGrp;
     }
-    leaf-list canaryRelease {
-        description "This attribute indicates whether an NF instance whose
+    leaf canaryRelease {
+      description "This attribute indicates whether an NF instance whose
         nfStatus is set to REGISTERED is in Canary Release condition,
         i.e. it should only be selected by NF Service Consumers under the
         conditions indicated by the selectionConditions attribute.
         True: the NF is under Canary Release condition, even if the
-        nfStatus is set to REGISTERED
+        nfStatus is set to REGISTERED.
         False: the NF instance indicates its Canary Release condition
-        via the nfStatus attribute";
-        max-elements 1;
-        type boolean;
+        via the nfStatus attribute.";
+      type boolean;
+      default false;
     }
-    leaf-list exclusiveCanaryReleaseSelection {
-        description "This attribute indicates whether an NF Service
-        Consumer should only select an NF Service Producer in Canary
-        Release condition.
+    leaf exclusiveCanaryReleaseSelection {
+      description "This attribute indicates whether an NF Service Consumer
+        should only select an NF Service Producer in Canary Release
+        condition.
         True: the consumer shall only select producers in Canary Release
-        condition
+        condition.
         False: the consumer may select producers not in Canary Release
-        condition";
-        max-elements 1;
-        type boolean;
+        condition.";
+      type boolean;
+      default false;
     }
     leaf sharedProfileDataId {
         description "This attribute indicates a string uniquely identifying
@@ -641,16 +428,18 @@ grouping ManagedNFProfileGrp {
         Example: 4ace9d34-2c69-4f99-92d5-a73a3fe8e23b";
        type string;
     }
-    leaf-list shutdownTime {
+    leaf shutdownTime {
       description "It indicates the timestamp when the NF Instance is
-      planned to be shut down. This attribute may be present if the
-      nfStatus is set to UNDISCOVERABLE due to scheduled shutdown";
-      type yang:date-and-time ;
-      max-elements 1;
+        planned to be shut down. This attribute may be present if the
+        nfStatus is set to UNDISCOVERABLE due to scheduled shutdown.";
+      type yang:date-and-time;
+      config false;
     }
-    leaf supportedRcfs {
-        description "It represents a list of Resource Content Filter IDs";
-        type string;
+    leaf-list supportedRcfs {
+      description "It represents a list of Resource Content Filter IDs.";
+      type string;
+      min-elements 1;
+      config false;
     }
     leaf canaryPrecedenceOverPreferred {
       description "ManagedNFProfile.canaryPrecedenceOverPreferred  This
@@ -669,14 +458,14 @@ grouping ManagedNFProfileGrp {
         in NF Service Producers shall not be prioritized over NF Service
         Consumer preferences at NF discovery requests)";
         type boolean;
+        default false;
     }
-    typedef NFStatus {
+  }
+
+  typedef NFStatus {
     type enumeration {
       enum REGISTERED;
       enum SUSPENDED;
     }
   }
-
 }
-}
-
diff --git a/yang-models/_3gpp-5gc-nrm-mbsmffunction.yang b/yang-models/_3gpp-5gc-nrm-mbsmffunction.yang
new file mode 100644
index 0000000000000000000000000000000000000000..3dde496e8979b6623e841433a0f2c7842addeb0e
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-mbsmffunction.yang
@@ -0,0 +1,277 @@
+module _3gpp-5gc-nrm-mbsmffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-mbsmffunction;
+  prefix mbsmf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5gc-nrm-neffunction { prefix nef3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "MNNPFFunction derived from basic ManagedFunction.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-13 { reference CR-1694 ; }  // common for rel-19,20
+  
+  grouping TmgiRangeGrp {
+    description "This data type represents range of TMGIs. 
+      (See clause 6.1.6.2.86 TS 29.510).";
+    
+    leaf mbsServiceIdStart {
+      type string {
+        pattern "[A-Fa-f0-9]{6}";
+      }
+      mandatory true;
+      description "Represents the first MBS Service ID value identifying the 
+        start of a TMGI range.
+        The value shall be coded as defined for the mbsServiceId attribute of 
+        the Tmgi data type defined in 3GPP TS 29.571";
+    }
+    
+    leaf mbsServiceIdEnd {
+      type string {
+        pattern "[A-Fa-f0-9]{6}";
+      }
+      mandatory true;
+      description "Represents the last MBS Service ID value identifying the 
+        end of a TMGI range.
+        The value shall be coded as defined for the mbsServiceId attribute of 
+        the Tmgi data type defined in 3GPP TS 29.571";
+    }
+
+    list pLMNId {
+      description "The PLMN identifier.";
+      key "mcc mnc";
+      min-elements 1;
+      max-elements 1;
+      uses types3gpp:PLMNId;
+    }
+
+    leaf nId {
+      type string;
+      mandatory true;
+      description "Network Identity; Shall be present if PlmnIdNid identifies 
+        an SNPN (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in 
+        3GPP TS 23.501)";
+    }
+  }
+
+  grouping mbsSessionIdGrp {
+    description "The MBS session ID is used to identify a Multicast/Broadcast 
+      MBS Session by the 5G system on external interface towards AF and between 
+      AF and UE, and towards the UE.";
+    reference "3GPP TS 23.247 clause 6.5.1";
+    
+    choice idType {
+      mandatory true;
+      leaf mbsServiceId {
+        description "MBS Service ID - Temporary Mobile Group Identity";
+        type string {
+          pattern "[A-Fa-f0-9]{6}";
+        }
+      }
+      case Ssm {
+        leaf sourceIpAddr {
+          type inet:ipv4-address;
+          mandatory true;
+          description "sourceIpAddr";
+        }
+        leaf destIpAddr {
+          type inet:ipv4-address;
+          mandatory true;
+          description "destIpAddr";
+        }
+      }  
+    }
+    
+    leaf nid {
+      description "";
+      type string {
+        pattern "[A-Fa-f0-9]{11}";
+      }
+    }
+  }
+  
+  grouping MbsServiceAreaGrp {
+    description "This data type represents MBS Service Area Information for 
+      Location dependent MBS session. (See clause 5.9.4.15 TS 29.571).";
+    
+    list ncgiList {
+      description "Represents a list of NR cell ids with their pertaining TAIs.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:NcgiGrp;    
+    }
+    
+    list taiList {                                 
+      description "Tracking Area Identity list";   
+      key idx;                                     
+      min-elements 1;                              
+      leaf idx { type uint32; }                    
+      uses types3gpp:TaiGrp;                       
+     }                                                
+  }
+  
+  grouping MbsServiceAreaInfoGrp {
+    description "This data type represents MBS Service Area Information for 
+      Location dependent MBS session. (See clause 5.9.4.15 TS 29.571";
+    
+    leaf areaSessionId {
+      type uint16;
+      mandatory true;
+      description "This attribute represents Area Session Identifier used for 
+        MBS session with location dependent content.";
+    }
+    
+    list mbsServiceArea {
+      description "Represents Area Session Identifier used for MBS session 
+        with location dependent content.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses MbsServiceAreaGrp;
+    }
+  }
+  
+  grouping MbsSessionGrp {
+    description "This data type represents MBS Session served by an MB-SMF. 
+      (See clause 6.1.6.2.87 TS 29.510).";
+      
+    list mbsSessionId {
+      description "This attribute represents the MBS Session Identifier.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses mbsSessionIdGrp;
+    }
+
+    list mbsAreaSessions {
+      description "This attribute represents map of Area Session Id and related 
+        MBS Service Area information used for MBS session with location 
+        dependent content. The Area Session ID together with the mbsSessionId 
+        (TMGI) uniquely identifies the MBS session in a specific MBS service 
+        area.
+        For an MBS session with location dependent content, one map entry shall 
+        be registered for each MBS Service Area served by the MBS session.
+        The key of the map shall be the areaSessionId.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses MbsServiceAreaInfoGrp;
+    }
+  }
+  
+  grouping MbSmfInfoGrp {
+    description "This data type represents the specific data for the MB-SMF. 
+      (See clause 6.1.6.2.85 TS 29.510).";
+      
+    list sNssaiInfoList {
+      description "This attribute represents the list of S-NSSAIs and DNNs 
+        supported by the MB-SMF.
+        The key of the map shall be a (unique) valid JSON string per clause 7 
+        of IETF RFC 8259, with a maximum of 32 characters.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32 ; }
+      uses nef3gpp:SnssaiInfoItemGrp;
+    }
+    
+    list tmgiRangeList {
+      description "This attribute represents the list of TMGI range(s) 
+        supported by the MB-SMF
+        The key of the map shall be a (unique) valid JSON string per clause 7 
+        of IETF RFC 8259, with a maximum of 32 characters.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses TmgiRangeGrp;      
+    }
+    
+    list taiList {
+      description "This attribute represents the list of TAIs the MB-SMF can 
+        serve.
+        The absence of this attribute and the taiRangeList attribute indicates 
+        that the MB-SMF can be selected for any TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+    
+    list taiRangeList {
+      description "This attribute represents the range of TAIs the MB-SMF can 
+        serve.
+        The absence of this attribute and the taiList attribute indicates that 
+        the MB-SMF can be selected for any TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+    
+    list mbsSessionList {
+      description "This attribute represents the list of MBS sessions currently 
+        served by the MB-SMF
+        The key of the map shall be a (unique) valid JSON string per clause 7 of 
+        IETF RFC 8259, with a maximum of 32 characters.";
+      key idx;
+      leaf idx { type uint32; }
+      uses MbsSessionGrp;
+    }
+  }
+  
+  grouping MBSMFFunctionGrp {
+    description "Represents the SMFFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+    
+    list pLMNIdList {
+      description "List of PLMN IDs.";
+        key "mcc mnc";
+        uses types3gpp:PLMNId;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+    
+    list mbSmfInfo {
+      description  "This attribute represents information of an 
+        MB-SMF NF Instance";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses MbSmfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list MBSMFFunction {
+      description "This IOC represents the MB-SMF function defined in TS 23.501 
+        and TS 23.247.";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MBSMFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-5gc-nrm-mbupffunction.yang b/yang-models/_3gpp-5gc-nrm-mbupffunction.yang
new file mode 100644
index 0000000000000000000000000000000000000000..b4f51507e202d84ccccd2f128934ff5537666baa
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-mbupffunction.yang
@@ -0,0 +1,167 @@
+module _3gpp-5gc-nrm-mbupffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-mbupffunction;
+  prefix mbupf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import _3gpp-5gc-nrm-upffunction { prefix upf3gpp; }
+
+  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 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-26 { reference "CR-1702 CR-1703" ; }  // common in r19, r20
+
+  grouping MbUpfInfoGrp {
+    description "represents the data type MnpfInfoGrp.";
+
+    list sNssaiMbUpfInfoList {
+      description "This attribute represents the list of parameters supported
+        by the MB-UPF per S-NSSAI.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses upf3gpp:SnssaiUpfInfoItemGrp;
+    }
+
+    leaf-list mbSmfServingArea {
+      type string;
+      description "This attribute represents the MB-SMF service area(s) the
+        MB-UPF can serve.
+        If not provided, the MB-UPF can serve any MB-SMF service area.";
+    }
+
+    list interfaceMbUpfInfoList {
+      description "This attribute represents the list of User Plane interfaces
+        configured on the MB-UPF. When this IE is provided in the NF Discovery
+        response, the NF Service Consumer (e.g. MB-SMF) may use this information
+        for MB-UPF selection.";
+      key idx;
+      leaf idx { type uint32; }
+        uses upf3gpp:InterfaceUpfInfoItemGrp;
+    }
+
+    list taiList {
+      description "This attribute represents the list of TAIs the MB-UPF can
+        serve.
+
+        The absence of this attribute and the taiRangeList attribute indicates
+        that the MB-UPF can serve the whole MB-SMF service area defined by the
+        MbSmfServingArea attribute.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      description "This attribute represents the range of TAIs the MB-UPF can
+        serve.
+
+        The absence of this attribute and the taiList attribute indicates that
+        the MB-UPF can serve the whole MB-SMF service area defined by the
+        MbSmfServingArea attribute.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+
+    leaf priority {
+      type uint16;
+      description "This attribute represents priority (relative to other NFs
+        of the same type) in the range of 0-65535, to be used for NF selection
+        for a service request matching the attributes of the MbUpfInfo; lower
+        values indicate a higher priority.
+
+        See the precedence rules in the description of the priority attribute
+        in NFProfile, if Priority is also present in NFProfile.
+
+        The NRF may overwrite the received priority value when exposing an
+        NFProfile with the Nnrf_NFDiscovery service.";
+    }
+
+    leaf supportedPfcpFeatures {
+      type string;
+      description "Supported Packet Forwarding Control Protocol (PFCP) Features.
+        A string used to indicate the PFCP features supported by the UPF,
+        which encodes the 'UP Function Features' as specified in
+        Table 8.2.25-1 of TS 29.244 (starting from Octet 5), in hexadecimal
+        representation.
+
+        Each character in the string shall take a value of '0' to '9', 'a'
+        to 'f' or 'A' to 'F' and each two characters shall represent one octet
+        of 'UP Function Features' (starting from Octet 5, to higher octets).
+        For each two characters representing one octet, the first character
+        representing the 4 most significant bits of the octet and the second
+        character the 4 least significant bits of the octet.
+
+        The supported PFCP features shall be provisioned in addition and be
+        consistent with the existing UPF features (atsssCapability, ueIpAddrInd,
+        redundantGtpu and ipups), e.g., if the ueIpAddrInd is set to 'true',
+        then the UEIP flag shall also be set to '1' in the supported PFCP
+        features.";
+    }
+  }
+
+  grouping MBUPFFunctionGrp {
+    description "Representse the MBUPFFunction IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNIdList {
+      description "List of PLMN Identifiers.
+        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
+        Mobile Network Code (MNC).";
+
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list mbUpfInfo {
+      description "Represents information of an MNPF NF Instance";
+      key idx;
+      leaf idx { type uint32; }
+      max-elements 1;
+      uses MbUpfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list MBUPFFunction {
+      description "This IOC represents the MB-UPF function defined in
+        TS 23.501 and TS 23.247";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MBUPFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-5gc-nrm-mfaffunction.yang b/yang-models/_3gpp-5gc-nrm-mfaffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..39291ca4a3869394055293abc3babc36f6f74a41
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-mfaffunction.yang
@@ -0,0 +1,136 @@
+module _3gpp-5gc-nrm-mfaffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-mfaffunction;
+  prefix mfaf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the MFAF function in 5GC.
+    For more information about the MFAF, see TS 23.501.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping MfafInfoGrp {
+    description "This data type represents the Specific
+      data for the MFAF.
+      (See clause 6.1.6.2.75 TS 29.510).";
+
+    leaf-list servingNfTypeList {
+      //optional support
+      type types3gpp:NfType;
+      description "This attribute represents a List of
+        NF type(s) served by MFAF NF. The absence of
+        this attribute indicates that the MFAF can be
+        selected for any NF type.";
+    }
+
+    leaf-list servingNfSetIdList {
+      //optional support
+      type string;
+      description "This attribute represents a List of
+        NF Set Id(s) served by MFAF NF. The absence of
+        this attribute indicates that the MFAF can be
+        selected for any NF Set Id.";
+    }
+
+    list taiList {
+      //optional support
+      description "This attribute represents a List of
+        TAIs the MFAF can serve. It may contain one or
+        more non-3GPP access TAIs. The absence of both
+        this attribute and the taiRangeList attribute
+        indicates that the MFAF can be selected for any
+        TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      //optional support
+      description "This attribute represents the range
+        of TAIs the MFAF can serve. It may contain one
+        or more non-3GPP access TAI ranges. The absence
+        of both this attribute and the taiList attribute
+        indicates that the MFAF can be selected for any
+        TAI in the serving network.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+  }
+
+  grouping MFAFFunctionGrp {
+    description "Represents the MFAFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF";
+      reference " (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list mfafInfo {
+      //optional support
+      description "This attribute represents information
+        of an MFAF NF Instance.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses MfafInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list MFAFFunction {
+      description "5G Core MFAF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MFAFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-mnpffunction.yang b/yang-models/_3gpp-5gc-nrm-mnpffunction.yang
new file mode 100644
index 0000000000000000000000000000000000000000..5edb89fc1b104bcfd8fb0a37e00e1a20ce0e51b1
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-mnpffunction.yang
@@ -0,0 +1,84 @@
+module _3gpp-5gc-nrm-mnpffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-mnpffunction;
+  prefix mnpf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "MNNPFFunction derived from basic ManagedFunction.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-13 { reference CR-1694 ; }  // common for rel-19,20
+
+  grouping MnpfInfoGrp {
+    description "Represents the data type MnpfInfo.";
+    
+    list msisdnRanges {
+      description "Represents the list of ranges of MSISDNs whose portability 
+        status is available in the MNPF."; 
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+  }
+  
+  grouping MNPFFunctionGrp {
+    description "Represents the SMFFuntion IOC";
+    uses mf3gpp:ManagedFunctionGrp;
+    
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF (See TS 23.501)";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can be used by NF and
+        NF services to interact with each other in 5G Core network ";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+    
+    list mnpfInfo {
+      description  "This attribute represents information of an MNPF NF 
+        Instance";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses MnpfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list MNPFFunction {
+      description "MNPF NF";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses MNPFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
\ No newline at end of file
diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang
index 6f8b80c808fa35400eb36ff932da668762934cb7..bcd3d0885cee8b8ffeea7bdc95c89913e6a63c4f 100755
--- a/yang-models/_3gpp-5gc-nrm-neffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang
@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-neffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NEF function in 5GC. For more
     information about the NEF, see 3GPP TS 23.501.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-11-07 { reference CR-1640 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-03-25 { reference CR-1489 ; }
@@ -213,7 +214,7 @@ module _3gpp-5gc-nrm-neffunction {
       min-elements 1;
       key idx;
       leaf idx { type uint32 ; }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
 
     list externalGroupIdentifiersRanges {
@@ -222,7 +223,7 @@ module _3gpp-5gc-nrm-neffunction {
       min-elements 1;
       key idx;
       leaf idx { type uint32 ; }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
 
     leaf-list servedFqdnList {
diff --git a/yang-models/_3gpp-5gc-nrm-nfservice.yang b/yang-models/_3gpp-5gc-nrm-nfservice.yang
index 1d58ba5290678dcd4c7f09663ab9aa79b33c9f68..22fcf1d8fc44ed7f19dd8f3f77ce4d088d33e11e 100755
--- a/yang-models/_3gpp-5gc-nrm-nfservice.yang
+++ b/yang-models/_3gpp-5gc-nrm-nfservice.yang
@@ -8,14 +8,17 @@ module _3gpp-5gc-nrm-nfservice {
   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";
-  description "NF service class.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+  description "NF service dataType.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 29.510";
   
+  revision 2026-05-25 { reference CR-1702 ; }
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-01-25 { reference CR-1442; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-01-25 { reference CR-0454 ; }
@@ -23,8 +26,9 @@ module _3gpp-5gc-nrm-nfservice {
   revision 2019-06-17 { reference "initial revision"; }
   
   grouping NFServiceGrp {
-    description "Represents the NFService IOC";
-    leaf serviceInstanceID {
+    description "This data type represents the NF Service
+     defined in TS 29.510 [23].";
+    leaf serviceInstanceId {
       description 
         "Unique ID of the service instance within a given NF Instance.";
       mandatory true;
@@ -35,20 +39,22 @@ module _3gpp-5gc-nrm-nfservice {
       description "Name of the service instance (e.g. 'nudm-sdm').";
       mandatory true;
       type ServiceName;
+      config false;
     }
     
-    list versions { //check in review if key is ok (unique)
+    list versions {
       description "API versions supported by the NF Service and if available, 
         the corresponding retirement date of the NF Service.";
       min-elements 1;
       key "apiVersionInUri apiFullVersion";
+      config false;
       uses NFServiceVersion;
     }
     
-    leaf scheme {
+    leaf schema {
       description "URI scheme (e.g. 'http', 'https').";
       mandatory true;
-      type UriScheme;
+      type UriSchema;
     }
     
     leaf nfServiceStatus {
@@ -134,7 +140,7 @@ module _3gpp-5gc-nrm-nfservice {
       type string;
     }
     
-    list allowedNSSAI {
+    list allowedNSSAIs {
       description "S-NSSAI of the allowed slices to access the service
       instance. The absence of this attribute indicates that any slice
       is allowed to access the service instance.";
@@ -143,6 +149,18 @@ module _3gpp-5gc-nrm-nfservice {
       key "sd sst";
       uses types5g3gpp:SNssai;
     }
+
+    list allowedScopesRuleSet {
+      description "It represents map of rules specifying scopes allowed or
+        denied for NF-Consumers. This attribute may be present when the
+        NF-Producer and the NRF support Allowed-ruleset feature as specified
+        in clause 6.1.9 in TS 29.510.";
+      //optional support
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:RuleSetGrp;
+    }
+
     leaf-list allowedOperationsPerNfType {
       description "It indicates the allowed operations on resources for
       each type of NF; the key of the map is the NF Type, and the value
@@ -162,28 +180,39 @@ module _3gpp-5gc-nrm-nfservice {
     leaf allowedOperationsPerNfInstanceOverrides {
       type boolean;
       default false;
+      //optional support
       description "When it is present and set to true, indicates that
       the scopes defined in attribute allowedOperationsPerNfInstance 
       for a given NF Instance ID take precedence over the scopes defined
       in attribute allowedOperationsPerNfType for the corresponding 
       NF type of the NF Instance associated to such NF Instance ID..";
     } 
+    list sNssais {
+      description "S-NSSAIs of the Network Function. If not
+       provided, the NF can serve any S-NSSAI. When present
+        this IE represents the list of S-NSSAIs supported in
+         all the PLMNs listed in the plmnList IE.";
+      //optional support
+      min-elements 1;
+      key "sst sd";
+      uses types5g3gpp:SNssai;
+    }    
 
-    leaf-list oauth2Required {
+    leaf oauth2Required {
       type boolean;
-      max-elements 1;
+      //optional support
       description "It indicates whether the NF Service Instance requires 
-      Oauth2-based authorization";
+        Oauth2-based authorization.";
     } 
 
-    leaf-list sharedServiceDataId {
+    leaf sharedServiceDataId {
       type string;
-      max-elements 1;
+      //optional support
       description "String uniquely identifying SharedServiceData. The format
-      of the sharedServiceDataId shall be a Universally Unique Identifier 
-      (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal
-      letters should be formatted as lower-case characters by the sender,
-      and they shall be handled as case-insensitive by the receiver.";
+        of the sharedServiceDataId shall be a Universally Unique Identifier 
+        (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal
+        letters should be formatted as lower-case characters by the sender,
+        and they shall be handled as case-insensitive by the receiver.";
     } 
 
     leaf priority {
@@ -213,35 +242,345 @@ module _3gpp-5gc-nrm-nfservice {
       //optional support
       type string;
     }
+    list callbackUriPrefixList {
+      description "It indicates the optional path segment(s) used to construct
+        the prefix of the Callback URIs during the reselection of an NF
+        service consumer.";
+      //optional support
+      reference "3GPP TS 29.501 [23], clause 4.4.3.";
+      key callbackUriPrefix;
+      min-elements 1;
+      uses CallbackUriPrefixItemGrp;
+    }
+    leaf supportedFeatures {
+      description "It is a string, which indicates the features of the service
+      corresponding to the subscribed default notification, which are supported
+      by the NF (Service) instance acting as NF service consumer.";
+      reference "3GPP TS 29.571 table 5.2.2-3";
+      //optional
+      type types3gpp:SupportedFeatures;
+    }
+    uses types5g3gpp:SupportedVendorSpecificFeaturesGrp;    
+    leaf load {
+      description "Latest known load information of the NF, percentage.";
+      type types3gpp:Load;
+      config false;
+    }
+    leaf loadTimeStamp {
+      description "Timestamp of the reported load information.";
+      type yang:date-and-time;
+      config false;
+    }
+    leaf-list nfServiceSetIdList {
+      description "This attribute represents a list of NF Service Set ID.
+        At most one NF Service Set ID shall be indicated per PLMN-ID or
+        SNPN of the NF.";
+      type string;
+      min-elements 1;
+    }
+    list perPlmnSnssaiList {
+      description "It includes the S-NSSAIs supported by the Network Function
+        for each PLMN supported by the Network Function. When present, it
+        shall override sNssais IE.";
+      key idx;
+      leaf idx { type uint32; }
+      uses PlmnSnssai;
+    }
+
+    leaf canaryRelease {
+      description "This attribute indicates whether an NF instance whose
+        nfStatus is set to REGISTERED is in Canary Release condition, i.e.
+        it should only be selected by NF Service Consumers under the
+        conditions indicated by the selectionConditions attribute.
+        True: the NF is under Canary Release condition, even if the
+        nfStatus is set to REGISTERED.
+        False: the NF instance indicates its Canary Release condition
+        via the nfStatus attribute.";
+      //optional support
+      type boolean;
+      default false;
+    }
+
+    leaf exclusiveCanaryReleaseSelection {
+      description "This attribute indicates whether an NF Service Consumer
+        should only select an NF Service Producer in Canary Release condition.
+        True: the consumer shall only select producers in Canary Release
+        condition.
+        False: the consumer may select producers not in Canary Release
+        condition.";
+      //optional support
+      type boolean;
+      default false;
+    }
+
+    leaf shutdownTime {
+      description "This attribute may be present if the nfStatus is set to
+        UNDISCOVERABLE due to scheduled shutdown. When present, it shall
+        indicate the timestamp when the NF Instance is planned to be
+        shut down.";
+      //optional support
+      type yang:date-and-time;
+      config false;
+    }
+
+    leaf canaryPrecedenceOverPreferred {
+      description "This attribute indicates whether the NRF shall prioritize
+        the NF Service Producer in Canary Release condition over the
+        preferences (preferred-xxx, ext-preferred-xxx) present in NF
+        discovery requests.
+        True: NRF shall prioritize NF Service Producers in Canary Release
+        condition at NF discovery requests.
+        False: NRF shall prioritize the NF Service Producers according to
+        preferred-xxx and/or ext-preferred-xxx.";
+      //optional support
+      type boolean;
+      default false;
+    }
+
+    list perPlmnOauth2ReqList {
+      description "This attribute includes the Oauth2-based authorization
+        requirement supported by the NF Service Instance per PLMN of the
+        NF Service Consumer. This attribute may be included when the
+        Oauth2.0 authorization requirement supported by the NF Service
+        Instance for different PLMN is different. When the requester
+        PLMN Id is available in perPlmnOauth2ReqList IE, this IE shall
+        override the oauth2Required IE. If the requester PLMN ID is not
+        present in perPlmnOauth2ReqList IE, then the value of
+        oauth2Required IE shall be applicable if available.";
+      //optional support
+      key idx;
+      leaf idx { type uint32; }
+      max-elements 1;
+      uses PlmnOauth2Grp;
+    }
+
+    list selectionConditions {
+      description "This attribute includes the conditions under which an NF
+        Instance with an NFStatus value set to CANARY_RELEASE, or with a
+        canaryRelease attribute set to true, shall be selected by an NF
+        Service Consumer.";
+      //optional support
+      key idx;
+      leaf idx { type uint32; }
+      max-elements 1;
+      uses SelectionConditionsGrp;
+    }
   }
   
-  typedef SupportedFeatures {
-    type string {
-      pattern '[A-Fa-f0-9]*';
+
+
+  grouping CallbackUriPrefixItemGrp {
+    description "This <<dataType>> represents Callback URI prefix value to
+      be used for specific notification types.";
+    reference "3GPP TS 29.510 clause 6.1.6.2.127";
+
+    leaf callbackUriPrefix {
+      description "It indicates the optional path segment(s) used to
+        construct the prefix of the Callback URIs during the reselection
+        of an NF service consumer.";
+      mandatory true;
+      type inet:uri;
+      reference "3GPP TS 29.501 clause 4.4.3";
+    }
+
+    leaf-list notificationTypes {
+      description "List of notification type values using the callback
+        URI prefix of the callbackUriPrefix.";
+      type string;
+    }
+  }
+
+  grouping PlmnOauth2Grp {
+    description "This <<dataType>> represents the per PLMN Oauth2.0
+      indication.";
+    reference "3GPP TS 29.510 clause 6.1.6.2.102";
+
+    list oauth2RequiredPlmnIdList {
+      description "List of PLMN IDs for which Oauth2.0 authorization is
+        required.";
+      //optional support
+      min-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+
+    list oauth2NotRequiredPlmnIdList {
+      description "List of PLMN IDs for which Oauth2.0 authorization is
+        not required.";
+        //optional support
+      min-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+  }
+
+  grouping PlmnSnssai {
+    description "This data type represents the list of S-NSSAIs supported
+      per PLMN.";
+    list plmnId {
+      description "PLMN ID for which list of supported S-NSSAI(s)
+        is provided.";
+      min-elements 1;
+      max-elements 1;
+      key "mcc mnc";
+      uses types3gpp:PLMNId;
+    }
+    list sNssaiList {
+      description "The specific list of S-NSSAIs supported
+        by the given PLMN.";
+      min-elements 1;
+      max-elements 1;
+      key "sst sd";
+      uses types5g3gpp:SNssai;
+    }
+    leaf nid {
+      description "Network Identity; Shall be present if PlmnIdNid
+        identifies an SNPN.";
+      reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4,
+        and 6.3.8 in 3GPP TS 23.501";
+      type string;
+    }
+  }
+
+  grouping ConditionItemGrp {
+    description "This <<dataType>> represents a single condition item that
+      shall be evaluated to determine whether a discovered NF (Service)
+      Instance shall be selected.";
+    reference "3GPP TS 29.510 clause 6.1.6.2.124";
+
+    leaf-list consumerNfTypes {
+      description "It represents the NF types of the consumers for which
+        the conditions included in this ConditionItem apply. If this
+        attribute is absent, the conditions are applicable to all NF
+        consumer types.";
+      min-elements 1;
+      type types3gpp:NfType;
+    }
+    leaf serviceFeature {
+      description "It represents a feature number of that NF Service
+        Instance, under CANARY_RELEASE status.";
+      type uint32;
+    }
+    leaf vsServiceFeature {
+      description "It represents a Vendor-Specific feature number of that
+        NF Service Instance, under CANARY_RELEASE status.";
+      type uint32;
+    }
+    list supiRangeList {
+      description "It represents a set of SUPIs for which the NF (Service)
+        instance under CANARY_RELEASE status shall be selected.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses types5g3gpp:SupiRangeGrp;
+    }
+    list gpsiRangeList {
+      description "It represents a set of GPSIs for which the NF (Service)
+        instance under CANARY_RELEASE status shall be selected.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+    list impuRangeList {
+      description "It represents a set of IMS Public Identities for which
+        the NF (Service) instance under CANARY_RELEASE status shall be
+        selected.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+    list impiRangeList {
+      description "It represents a set of IMS Private Identities for which
+        the NF (Service) instance under CANARY_RELEASE status shall be
+        selected.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+    leaf-list peiList {
+      description "It represents a set of PEIs of the UEs for which the
+        NF (Service) instance under CANARY_RELEASE status shall be
+        selected.";
+      min-elements 1;
+      type string;
+    }
+    list taiRangeList {
+      description "It represents a set of TAIs where the NF (Service)
+        instance under CANARY_RELEASE status shall be selected for a
+        certain UE.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      uses types5g3gpp:TaiRangeGrp;
+    }
+    leaf-list dnnList {
+      description "It represents a set of DNNs where the NF (Service)
+        instance under CANARY_RELEASE status shall be selected.";
+      min-elements 1;
+      type string;
+    }
+  }
+
+  grouping SelectionConditionsGrp {
+    description "This <<dataType>> represents the list of conditions that
+      shall be selected by an NF Service Consumer.";
+    reference "3GPP TS 29.510 clause 6.1.6.2.123";
+
+    list conditionItem {
+      key "id";
+      description "It represent a single condition item that shall be
+        evaluated to determine whether a discovered NF (Service) Instance
+        shall be selected.";
+      leaf id { type string; }
+      uses ConditionItemGrp;
+    }
+
+    list conditionGroup {
+      description "It represents a group of conditions that shall be
+        evaluated.";
+      key idx;
+      leaf idx { type uint32; }
+      max-elements 1;
+      // Note: ConditionGroup references SelectionConditions creating a
+      // circular dependency. Inlined one level to avoid it.
+      choice LogicalOperator {
+        case and {
+          list and {
+            description "It represents a list of conditions where the
+              overall evaluation is true only if all the conditions in
+              the list are evaluated as true.";
+            key idx;
+            leaf idx { type uint32; }
+            list conditionItem {
+              key "id";
+              description "Condition item to be evaluated.";
+              leaf id { type string; }
+              uses ConditionItemGrp;
+            }
+          }
+        }
+        case or {
+          list or {
+            description "It represents a list of conditions where the
+              overall evaluation is true if at least one of the conditions
+              in the list is evaluated as true.";
+            key idx;
+            leaf idx { type uint32; }
+            list conditionItem {
+              key "id";
+              description "Condition item to be evaluated.";
+              leaf id { type string; }
+              uses ConditionItemGrp;
+            }
+          }
+        }
+      }
     }
   }
-  list supportedVendorSpecificFeatures {
-    description "It indicates a map of Vendor-Specific features, where the
-     key of the map is the IANA-assigned SMI Network Management Private
-     Enterprise Codes and the value of each entry of the map shall be
-     a list (array) of VendorSpecificFeature objects as defined
-     in the clause 5.3.247.";
-     key "enterpriseCode";
-     
-     leaf enterpriseCode {
-       type uint32;
-       description "IANA-assigned SMI Network Management Private Enterprise Code";
-     }
 
-     list vendorSpecificFeature {
-       key "featureName";
-       config false;
-       description "VendorSpecificFeature objects as defined
-      in the clause 5.3.247.";
-     uses types5g3gpp:VendorSpecificFeatureGrp;
-     }      
-  }      
-  
   grouping ipEndPoint {
     choice address {
       leaf ipv4Address {
@@ -329,7 +668,7 @@ module _3gpp-5gc-nrm-nfservice {
     }
   }
   
-  typedef UriScheme {
+  typedef UriSchema {
     type enumeration {
       enum HTTP;
       enum HTTPS;
diff --git a/yang-models/_3gpp-5gc-nrm-nrffunction.yang b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
index 0355794cd7dde57359989dba4249a475b4a959b8..145066d44b50aba2fe16eb831d31a0d10069b922 100755
--- a/yang-models/_3gpp-5gc-nrm-nrffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nrffunction.yang
@@ -23,15 +23,18 @@ module _3gpp-5gc-nrm-nrffunction {
   import _3gpp-5gc-nrm-gmlcfunction { prefix gmlc3gpp;}
   import _3gpp-5gc-nrm-lmffunction { prefix lmf3gpp;}
   import _3gpp-5gc-nrm-aiot { prefix aiot3gpp;}
+  import _3gpp-5gc-nrm-chffunction { prefix chf3gpp;}
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NRF function in 5GC.
                For more information about the NRF, see 3GPP TS 23.501 [2].
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-05-25 { reference CR-1702 ; }
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-11-01 { reference CR-1640 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-01-25 { reference CR-1442 ; }
@@ -72,47 +75,6 @@ module _3gpp-5gc-nrm-nrffunction {
       uses types3gpp:Ipv6PrefixRange;
     }
   }
-  grouping chfInfo {
-    list supiRangeList {
-      description "List of ranges of SUPIs that can be served by
-       the CHF instance. If not provided, the CHF can serve any SUPI.";
-      key "start end pattern";
-      min-elements 1;
-      uses mnfp3gpp:SupiRangeGrp;
-    }
-
-    list gpsiRangeList {
-      description "List of ranges of GPSI that can be served
-      by the CHF instance. If not provided, the CHF can serve any GPSI.";
-      key idx;
-      leaf idx { type uint32; }
-      min-elements 1;
-      uses mnfp3gpp:IdentityRange;
-    }
-
-    list plmnRangeList {
-      description "List of ranges of PLMNs (including the PLMN
-      IDs of the CHF instance) that can be served by the CHF instance.
-                   If not provided, the CHF can serve any PLMN.";
-
-      min-elements 1;
-      key "mcc mnc";
-      uses types3gpp:PLMNId;
-    }
-    leaf primaryChfInstance {
-      description "This attribute represents the NF Instance Id of the
-      primary CHF instance. This attribute shall be absent if the
-      secondaryChfInstance is present.";
-      type string;
-
-    }
-    leaf secondaryChfInstance {
-      description "This attribute represents the NF Instance Id of the
-      secondary CHF instance.This attribute shall be absent if the
-      primaryChfInstance is present.";
-      type string;
-    }
-  }
   grouping pcscfInfo  {
     description "This data type represents the information of a P-CSCF 
       NF Instance.
@@ -186,7 +148,7 @@ module _3gpp-5gc-nrm-nrffunction {
   }
   grouping HssInfoGrp {
     description " Information of an HSS NF Instance";
-    leaf groupID{
+    leaf groupId{
       description "This attribute defines the identity of the HSS group
       that is served by the HSS instance.If not provided, the HSS instance
       does not pertain to any HSS group.";
@@ -212,7 +174,7 @@ module _3gpp-5gc-nrm-nrffunction {
       description "Unique identifier for the IMSI range.";
       type string;
       }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
     list imsPublicIdentityRanges{
       description "This attribute defines the list of ranges of MSISDNs whose
@@ -223,7 +185,7 @@ module _3gpp-5gc-nrm-nrffunction {
       description "Unique identifier for the IMSI range.";
       type string;
       }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
     list msisdnRanges{
       description "This attribute defines the list of ranges of IMS Public
@@ -234,7 +196,7 @@ module _3gpp-5gc-nrm-nrffunction {
       description "Unique identifier for the IMSI range.";
       type string;
       }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
     list externalGroupIdentifiersRanges{
       description "This attribute defines the list of ranges of external
@@ -246,7 +208,7 @@ module _3gpp-5gc-nrm-nrffunction {
       description "Unique identifier for the IMSI range.";
       type string;
       }
-      uses mnfp3gpp:IdentityRange;
+      uses types5g3gpp:IdentityRangeGrp;
     }
     list hssDiameterAddress{
       description "This attribute defines the Diameter Address of the HSS ";
@@ -413,7 +375,7 @@ module _3gpp-5gc-nrm-nrffunction {
       }
 
       min-elements 1;
-      uses chfInfo;
+      uses chf3gpp:ChfInfoGrp;
     }
 
     list servedNwdafInfo {
@@ -626,8 +588,9 @@ module _3gpp-5gc-nrm-nrffunction {
     } 
     
     list internalTargetArea {
-      description "It is the (internal) target area used by NRF (as provided 
-        by NEF) to accurately locate the AIOTF instance. It is mapped to aIOTFdN. 
+      description "It is the (internal) target area used by NRF (as provided
+        by NEF) to accurately locate the AIOTF instance.
+        It is mapped to aIOTFdN. 
         It could refer to a list of AIoT Areas.";
       key idx;
       leaf idx { type uint32; }
diff --git a/yang-models/_3gpp-5gc-nrm-nsacffunction.yang b/yang-models/_3gpp-5gc-nrm-nsacffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..d323ed42b2ae8838edd8ced5b2918eb0e4718cd1
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-nsacffunction.yang
@@ -0,0 +1,276 @@
+module _3gpp-5gc-nrm-nsacffunction {
+  yang-version 1.1;
+
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nsacffunction;
+  prefix nsacf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import ietf-inet-types { prefix inet; }
+  import _3gpp-common-yang-types { prefix types3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the NSACF function in 5GC.
+    The NSACF monitors and controls the number of registered
+    UEs per network slice for the network slices that are
+    subject to Network Slice Admission Control (NSAC).
+    For more information about the NSACF, see TS 23.501
+    and TS 23.502.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-03-25 { reference "CR-"; }
+
+  grouping NsacfCapabilityGrp {
+    description "This data type represents the NSACF service
+      capability. (See TS 29.510).";
+    reference "3GPP TS 29.510";
+
+    leaf supportUeSAC {
+      type boolean;
+      description "This attribute indicates the service capability of the
+      NSACF to monitor and control the number of
+      registered UEs per network slice for the network
+      slice that is subject to NSAC.";
+    }
+
+    leaf supportPduSAC {
+      type boolean;
+      description "This attribute indicates the service capability of the
+      NSACF to monitor and control the number of
+      established PDU sessions per network slice for the
+      network slice that is subject to NSAC.";
+    }
+  }
+
+  grouping NsacfInfoGrp {
+    description "This data type represents the information
+      of an NSACF NF Instance. (see TS 29.510).";
+    reference "3GPP TS 29.510";
+
+    list nsacfCapability {
+      description "It represents the NSACF service
+        capability.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses NsacfCapabilityGrp;
+    }
+
+    list taiList {
+      description "List of TAIs.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      description "Range of TAIs.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:TaiRangeGrp;
+    }
+  }
+
+  grouping SnssaiInfoGrp {
+    description "This data type defines generic information
+      for a S-NSSAI.";
+
+    list pLMNInfo {
+      description "It represents the PLMN and S-NSSAI
+        information.";
+      min-elements 1;
+      max-elements 1;
+      key "mcc mnc sd sst";
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf administrativeState {
+      type types3gpp:BasicAdministrativeState;
+      mandatory true;
+      description "It represents the administrative state
+        of the Network Slice.";
+    }
+  }
+
+  grouping NsacfInfoSnssaiGrp {
+    description "This data type defines NSACF specific
+      information per S-NSSAI.";
+
+    list snssaiInfo {
+      description "It defines generic information for a
+        S-NSSAI. The information includes global unique
+        identifier of a Network Slice and
+        administrativeState of the Network Slice.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses SnssaiInfoGrp;
+    }
+
+    leaf isSubjectToNsac {
+      type boolean;
+      mandatory true;
+      description "It defines if the Network Slice subjects
+        to network slice admission control. The value is
+        set to False if the maxNumberofUEs attribute in
+        corresponding SliceProfile is absent.";
+    }
+
+    leaf maxNumberofUEs {
+      type uint16 {
+        range "0..65535";
+      }
+      mandatory true;
+      description "It defines the maximum number of UEs
+        which are allowed to be served by the Network
+        Slice that is subject to network slice admission
+        control.";
+    }
+
+    leaf eACMode {
+      type enumeration {
+        enum ACTIVE;
+        enum INACTIVE;
+      }
+      default INACTIVE;
+      description "It represents if early admission
+        control (EAC) mode is activated.";
+    }
+
+    leaf activeEacThreshold {
+      type uint8 {
+        range "0..100";
+      }
+      default 0;
+      description "It defines threshold in percentage
+        value of the number of the UEs registered with
+        the network slice to the maximum number of UEs
+        allowed to register with the network slice. The
+        eACMode is set to active when the number of the
+        UEs registered with the network slice is above
+        this threshold.";
+    }
+
+    leaf deactiveEacThreshold {
+      type uint8 {
+        range "0..100";
+      }
+      default 100;
+      description "It defines threshold in percentage
+        value of the number of the UEs registered with
+        the network slice to the maximum number of UEs
+        allowed to register with the network slice. The
+        eACMode is set to inactive when the number of
+        the UEs registered with the network slice is
+        below this threshold. If this attribute is
+        absent, activeEacThreshold is used to trigger
+        deactivation of eACMode.";
+    }
+
+    leaf numberofUEs {
+      type uint16 {
+        range "0..65535";
+      }
+      config false;
+      description "It represents the number of the UEs
+        registered with the network slice. This attribute
+        is updated by NSACF.";
+    }
+
+    leaf-list uEIdList {
+      type string;
+      config false;
+      description "It represents the UEs registered with
+        the network slice. This attribute is updated by
+        NSACF.";
+    }
+
+    list taiList {
+      description "Tracking Area Identity list.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    leaf maxNumberofPDUSessions {
+      type uint32;
+      mandatory true;
+      description "It defines the maximum number of
+        concurrent PDU sessions supported by the network
+        slice.";
+    }
+  }
+
+  grouping NSACFFunctionGrp {
+    description "Represents the NSACFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "List of at most six entries of PLMN
+        Identifiers, but at least one (the primary
+        PLMN Id). The PLMN Identifier is composed of a
+        Mobile Country Code (MCC) and a Mobile Network
+        Code (MNC).";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      description "This data type represents a Profile
+        definition of a Managed NF.";
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list nsacfInfoSnssaiList {
+      description "It represents a list of NSACF
+        information per SNSSAI.";
+      key idx;
+      leaf idx { type uint32; }
+      uses NsacfInfoSnssaiGrp;
+    }
+
+    list nsacfInfo {
+      description "This attribute represents the
+        information of an NSACF NF Instance.
+        (see TS 29.510).";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses NsacfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list NSACFFunction {
+      description "5G Core NSACF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NSACFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-nssaaffunction.yang b/yang-models/_3gpp-5gc-nrm-nssaaffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..f521e442978b4d59a633d68a8715d4238c5a2df8
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-nssaaffunction.yang
@@ -0,0 +1,119 @@
+module _3gpp-5gc-nrm-nssaaffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-nssaaffunction;
+  prefix nssaaf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the NSSAAF function in 5GC.
+    For more information about the NSSAAF, see TS 23.501.
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS,
+    CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-03-25 { reference "CR-"; }
+
+  grouping NssaafInfoGrp {
+    description "This data type represents the information
+      of a NSSAAF NF Instance.
+      (See clause 6.1.6.2.104 TS 29.510).";
+
+    list supiRanges {
+      description "List of ranges of SUPIs that can be
+        served by the NSSAAF instance.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:SupiRangeGrp;
+    }
+
+    list internalGroupIdentifiersRanges {
+      description "List of ranges of Internal Group
+        Identifiers that can be served by the NSSAAF
+        instance. If not provided, it does not imply
+        that the NSSAAF supports all internal groups.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:InternalGroupIdRangeGrp;
+    }
+  }
+
+  grouping NSSAAFFunctionGrp {
+    description "Represents the NSSAAFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    leaf-list cNSIIdList {
+      description "NSI ID. NSI ID is an identifier for
+        identifying the Core Network part of a Network
+        Slice instance when multiple Network Slice
+        instances of the same Network Slice are deployed,
+        and there is a need to differentiate between them
+        in the 5GC, see clause 3.1 of TS 23.501 and
+        subclause 6.1.6.2.7 of 3GPP TS 29.531.";
+      type string;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list nssaafInfo {
+      description "This attribute represents information
+        of a NSSAAF NF Instance.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses NssaafInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list NSSAAFFunction {
+      description "5G Core NSSAAF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses NSSAAFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
index c9500400d331502f18368068d32334994e9c0f13..920cb188bc240de738ce81d94c0901a5b1cca8d7 100755
--- a/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-nwdaffunction.yang
@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-nwdaffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the NWDAF function in 5GC. For more
     information about the NWDAF, see 3GPP TS 23.501.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-05-20 { reference CR-1702 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-03-25 { reference CR-1489 ; }
   revision 2024-08-07 { reference CR-1329; }
@@ -32,31 +33,6 @@ module _3gpp-5gc-nrm-nwdaffunction {
 
   revision 2019-05-15 {reference "initial revision"; }
 
-  typedef NwdafEvent {
-    description "The detailed ENUM value for NwdafEvent see the
-      Table 5.1.6.3.4-1 in TS 29.520";
-    type union {
-      type enumeration {
-        enum SLICE_LOAD_LEVEL;
-        enum NETWORK_PERFORMANCE;
-        enum NF_LOAD;
-        enum SERVICE_EXPERIENCE;
-        enum UE_MOBILITY;
-        enum UE_COMMUNICATION;
-        enum QOS_SUSTAINABILITY;
-        enum ABNORMAL_BEHAVIOUR;
-        enum USER_DATA_CONGESTION;
-        enum NSI_LOAD_LEVEL;
-        enum DN_PERFORMANCE;
-        enum DISPERSION;
-        enum RED_TRANS_EXP;
-        enum WLAN_PERFORMANCE;
-        enum SM_CONGESTION;
-      }
-      type string;
-    }
-  }
-
   grouping NwdafCapabilityGrp {
     description "This data type represents the capability supported by the
       NWDAF.";
@@ -91,7 +67,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
     reference "TS 29.510";
 
     leaf-list mlAnalyticsIds {
-      type NwdafEvent;
+      type types5g3gpp:NwdafEvent;
       ordered-by user;
       description "This attribute represents the Analytic functionalities
         (identified by nwdafEvent defined in TS 29.520 [85]) of the NWDAF
@@ -172,7 +148,7 @@ module _3gpp-5gc-nrm-nwdaffunction {
     reference "TS 29.510";
 
     leaf-list nwdafEvents {
-      type NwdafEvent;
+      type types5g3gpp:NwdafEvent;
       ordered-by user;
       description "This attribute represents the Analytic functionalities
         (identified by nwdafEvent defined in TS 29.520) of the NWDAF instance.
diff --git a/yang-models/_3gpp-5gc-nrm-pcffunction.yang b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
index a9ab6b43533518c90033bb0824679bfdffb8d317..208254ea331d7f06e292813da7dc8fcd5ef7c792 100755
--- a/yang-models/_3gpp-5gc-nrm-pcffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-pcffunction.yang
@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-pcffunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the PCF function in 5GC. For more
     information about the PCF, see 3GPP TS 23.501.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2024-05-24 { reference CR-1273 ; }
   revision 2023-09-18 { reference CR-1043 ; }
@@ -116,7 +117,7 @@ module _3gpp-5gc-nrm-pcffunction {
         key idx;
         leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:SupiRangeGrp;
+        uses types5g3gpp:SupiRangeGrp;
       }
 
       leaf rxDiamHost {
diff --git a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
index c54cbddb7a9f31b3702a899aff885f60fd885b5d..bc6dd6fc5e01e12b32d5b1ec49a2c0113f31a869 100755
--- a/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
+++ b/yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang
@@ -6,6 +6,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
 
   import _3gpp-common-managed-element { prefix me3gpp; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
   import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp; }
   import ietf-yang-types { prefix yang; }
@@ -14,11 +15,12 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the predefined PCC rules, which are
     configured to SMF and referenced by PCF.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-  revision 2025-05-01 { reference CR-xxxx ; }
+  revision 2026-03-19 { reference CR-1694 ; }
+  revision 2025-05-01 { reference CR- ; }
   revision 2025-04-25 { reference CR-1520 ; }
   revision 2025-03-25 { reference CR-1489 ; }
   revision 2023-09-18 { reference CR-1043 ; }
@@ -237,7 +239,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
     }
   }
 
-  grouping TrafficControlDataInformation {
+  grouping TrafficControlDataGrp {
     description "It specifies the traffic control data for a service
       flow of a PCC rule.";
     leaf tcId {
@@ -301,6 +303,11 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
         uses RouteToLocation;
       }
     }
+    leaf traffCorreInd {
+      type boolean;
+      default false;
+      description "It indicates the traffic correlation.";
+    }
     uses UpPathChgEvent;
     leaf steerFun {
       type enumeration {
@@ -326,6 +333,13 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
       }
       description "It indicates whether the service data flow, corresponding to the service data flow template, is allowed or not allowed.";
     }
+    list sNSSAIList {
+      description "It represents the list of S-NSSAI the managed object is 
+        supporting. The S-NSSAI is defined in 3GPP TS 23.003.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:SNssai;
+    }
   }
 
   grouping ARP {
@@ -598,7 +612,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
       list trafficControlDataInfo {
         description "The list of traffic control policy data.";
         key "tcId";
-        uses TrafficControlDataInformation;
+        uses TrafficControlDataGrp;
       }
     }
     uses ConditionData;
diff --git a/yang-models/_3gpp-5gc-nrm-smffunction.yang b/yang-models/_3gpp-5gc-nrm-smffunction.yang
index d62b1cfacb2b7cbe9c5e95da773ab144628af55f..5ef47273853cd64178c2c46816082c2f98988811 100755
--- a/yang-models/_3gpp-5gc-nrm-smffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-smffunction.yang
@@ -14,10 +14,11 @@ module _3gpp-5gc-nrm-smffunction {
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "SMFFunction derived from basic ManagedFunction.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-05-25 { reference CR-1702 ; }
   revision 2024-05-24 { reference CR-1273 ; }
   revision 2023-09-18 { reference CR-1043 ; }
   revision 2023-04-26 { reference CR-0916; }
@@ -87,7 +88,7 @@ module _3gpp-5gc-nrm-smffunction {
          those will have precedence over this value ";
          type uint16;
       }
-      leaf-list vsmfSupportInd {
+      leaf vsmfSupportInd {
         description "Used by an SMF to explicitly indicate the support of
          V-SMF capability and its preference to be selected as V-SMF.
          When present it indicate whether the V-SMF capability is supported
@@ -96,7 +97,6 @@ module _3gpp-5gc-nrm-smffunction {
          - false: V-SMF capability not supported by the SMF.
          When absent the V-SMF capability support of the SMF is not specified.";
          type boolean;
-
       }
       leaf pgwFqdnList {
         description "When present, this attribute provides additional FQDNs
@@ -105,7 +105,7 @@ module _3gpp-5gc-nrm-smffunction {
         is present.";
         type string;
       }
-      leaf-list ismfSupportInd {
+      leaf ismfSupportInd {
         description "This attribute may be used by an SMF to explicitly
         indicate the support of I-SMF capability and its preference to be
         selected as I-SMF. When present, this attribute shall indicate
@@ -114,7 +114,6 @@ module _3gpp-5gc-nrm-smffunction {
         - FALSE: I-SMF capability not supported by the SMF. Absence of this
         attribute indicates the I-SMF capability support of the SMF is not
         specified.";
-        max-elements 1;
         type boolean;
       }
       leaf-list smfOnboardingCapability {
@@ -127,7 +126,7 @@ module _3gpp-5gc-nrm-smffunction {
         type boolean;
         max-elements 1;
       }
-      leaf-list smfUPRPCapability {
+      leaf smfUPRPCapability {
         description "This attribute IE indicates the SMF supports User
         Plane Remote Provisioning (UPRP) capability. This is used for
         the case of Onboarding of UEs for SNPNs ,
diff --git a/yang-models/_3gpp-5gc-nrm-tsctsffunction.yang b/yang-models/_3gpp-5gc-nrm-tsctsffunction.yang
new file mode 100755
index 0000000000000000000000000000000000000000..14831cbc46bd49fa3a67792cd7d3efdeb1e4c59e
--- /dev/null
+++ b/yang-models/_3gpp-5gc-nrm-tsctsffunction.yang
@@ -0,0 +1,190 @@
+module _3gpp-5gc-nrm-tsctsffunction {
+  yang-version 1.1;
+  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-tsctsffunction;
+  prefix tsctsf3gpp;
+
+  import _3gpp-common-managed-function { prefix mf3gpp; }
+  import _3gpp-common-managed-element { prefix me3gpp; }
+  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
+  import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
+  import ietf-inet-types { prefix inet; }
+
+  organization "3gpp SA5";
+  contact
+    "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+  description "This IOC represents the TSCTSF function in
+    5GC. For more information about the TSCTSF, see
+    TS 23.501.
+    Copyright 2026, 3GPP Organizational Partners (ARIB,
+    ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
+    All rights reserved.";
+  reference "3GPP TS 28.541";
+
+  revision 2026-04-25 { reference CR-1702; }
+
+  grouping DnnTsctsfInfoItemGrp {
+    description "This data type represents set of
+      parameters supported by TSCTSF for a given DNN.
+      (See clause 6.1.6.2.93 TS 29.510).";
+
+    leaf dnn {
+      type string;
+      mandatory true;
+      description "It represents supported DNN or
+        Wildcard DNN if the TSCTSF supports all DNNs
+        for the related S-NSSAI. The DNN shall contain
+        the Network Identifier and it may additionally
+        contain an Operator Identifier. If the Operator
+        Identifier is not included, the DNN is supported
+        for all the PLMNs in the plmnList of the NF
+        Profile.";
+    }
+  }
+
+  grouping SnssaiTsctsfInfoItemGrp {
+    description "This data type represents set of
+      parameters supported by TSCTSF for a given
+      S-NSSAI.";
+
+    list sNssai {
+      description "This attribute represents a S-NSSAI.";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:ExtSnssaiGrp;
+    }
+
+    list dnnInfoList {
+      description "It represents list of parameters
+        supported by the TSCTSF per DNN.";
+      min-elements 1;
+      key dnn;
+      uses DnnTsctsfInfoItemGrp;
+    }
+  }
+
+  grouping TsctsfInfoGrp {
+    description "This data type represents the Specific
+      data for the TSCTSF.
+      (See clause 6.1.6.2.91 TS 29.510).";
+
+    list sNssaiInfoList {
+      //optional support
+      description "This attribute represents the
+        S-NSSAIs and DNNs supported by the TSCTSF.";
+      key idx;
+      leaf idx { type uint32; }
+      uses SnssaiTsctsfInfoItemGrp;
+    }
+
+    list externalGroupIdentifiersRanges {
+      //optional support
+      description "This attribute represents the ranges
+        of External Group Identifiers that can be served
+        by the TSCTSF. The absence of this IE indicates
+        that the TSCTSF can serve any external group
+        managed by the PLMN (or SNPN) of the TSCTSF
+        instance.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+
+    list supiRanges {
+      //optional support
+      description "This attribute represents the ranges
+        of SUPIs that can be served by the TSCTSF
+        instance.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:SupiRangeGrp;
+    }
+
+    list gpsiRanges {
+      //optional support
+      description "This attribute represents the ranges
+        of GPSIs that can be served by the TSCTSF
+        instance.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:IdentityRangeGrp;
+    }
+
+    list internalGroupIdentifiersRanges {
+      //optional support
+      description "This attribute represents the ranges
+        of Internal Group Identifiers that can be served
+        by the TSCTSF instance. The absence of this IE
+        indicates that the TSCTSF can serve any internal
+        group managed by the PLMN (or SNPN) of the
+        TSCTSF instance.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:InternalGroupIdRangeGrp;
+    }
+  }
+
+  grouping TSCTSFFunctionGrp {
+    description "Represents the TSCTSFFunction IOC.";
+    uses mf3gpp:ManagedFunctionGrp;
+
+    list pLMNInfoList {
+      description "It defines the PLMN(s) of a Network
+        Function.";
+      key "mcc mnc sd sst";
+      min-elements 1;
+      uses types5g3gpp:PLMNInfo;
+    }
+
+    leaf sBIFQDN {
+      description "The FQDN of the registered NF instance
+        in the service-based interface.";
+      type inet:domain-name;
+    }
+
+    list managedNFProfile {
+      key idx;
+      leaf idx { type uint32; }
+      min-elements 1;
+      max-elements 1;
+      description "Profile definition of a Managed NF
+        (See TS 23.501).";
+      uses mnfp3gpp:ManagedNFProfileGrp;
+    }
+
+    list commModelList {
+      min-elements 1;
+      key "groupId";
+      description "Specifies a list of commModel. It can
+        be used by NF and NF services to interact with
+        each other in 5G Core network.";
+      reference "3GPP TS 23.501";
+      uses types5g3gpp:CommModel;
+    }
+
+    list tsctsfInfo {
+      //optional support
+      description "This attribute represents information
+        of a TSCTSF NF Instance.";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses TsctsfInfoGrp;
+    }
+  }
+
+  augment "/me3gpp:ManagedElement" {
+    list TSCTSFFunction {
+      description "5G Core TSCTSF Function";
+      reference "3GPP TS 28.541";
+      key id;
+      uses top3gpp:Top_Grp;
+      container attributes {
+        uses TSCTSFFunctionGrp;
+      }
+      uses mf3gpp:ManagedFunctionContainedClasses;
+    }
+  }
+}
diff --git a/yang-models/_3gpp-5gc-nrm-udmfunction.yang b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
index 6fc1e8793f52dacddb2e6ae1831a9818775a60ae..a590214139eaaf5d7321ada2db9359d8ec2388ff 100755
--- a/yang-models/_3gpp-5gc-nrm-udmfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udmfunction.yang
@@ -16,10 +16,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 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2024-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; }
@@ -84,25 +85,28 @@ module _3gpp-5gc-nrm-udmfunction {
       list supiRanges {
         description "List of ranges of SUPI's whose profile data is
         available in the UDM instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:SupiRangeGrp;
+        uses types5g3gpp:SupiRangeGrp;
       }
 
       list gpsiRanges {
         description "List of ranges of GPSIs whose profile data is
         available in the UDM instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:IdentityRange;
+        uses types5g3gpp:IdentityRangeGrp;
       }
 
       list externalGroupIdentifiersRanges {
         description "List of ranges of external groups whose profile
          data is available in the UDM instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:IdentityRange;
+        uses types5g3gpp:IdentityRangeGrp;
       }
 
       leaf-list routingIndicators {
diff --git a/yang-models/_3gpp-5gc-nrm-udrfunction.yang b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
index 5f9ff10286ac9b87ac124febb175001c8a8c712d..79016d7fc74862b04195db9514d0da9d3d594ca2 100755
--- a/yang-models/_3gpp-5gc-nrm-udrfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-udrfunction.yang
@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-udrfunction {
   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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2026-03-25 { reference CR-1694 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2023-09-18 { reference CR-1043 ; }
   revision 2023-04-26 { reference CR-0916; }
@@ -41,25 +42,28 @@ module _3gpp-5gc-nrm-udrfunction {
       list supiRanges {
         description "List of ranges of SUPI's whose profile data
          is available in the UDR instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:SupiRangeGrp;
+        uses types5g3gpp:SupiRangeGrp;
       }
 
       list gpsiRanges {
         description "List of ranges of GPSIs whose profile data is
          available in the UDR instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:IdentityRange;
+        uses types5g3gpp:IdentityRangeGrp;
       }
 
       list externalGroupIdentifiersRanges {
         description "List of ranges of external groups whose profile
          data is available in the UDR instance.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:IdentityRange;
+        uses types5g3gpp:IdentityRangeGrp;
       }
 
       leaf-list supportedDataSets {
diff --git a/yang-models/_3gpp-5gc-nrm-upffunction.yang b/yang-models/_3gpp-5gc-nrm-upffunction.yang
index ce54974048ec977d9628a8083b630653ed925a60..37b38e512bcd5caa677b026ebf195ca26a703530 100755
--- a/yang-models/_3gpp-5gc-nrm-upffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-upffunction.yang
@@ -15,10 +15,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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-05-25 { reference CR-1702 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2024-05-24 { reference CR-1273 ; }
@@ -163,6 +164,11 @@ module _3gpp-5gc-nrm-upffunction {
         true: supported
         false: not supported";
     }
+
+    leaf dnnUpfInfoListId {
+      type uint32;
+      description "Identifier of the DNN UPF Info List.";
+    }
   }
 
   typedef UPInterfaceType {
diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index 8fbbbdf949ce04a4cae0823043b6051990e7f318..833e46ad59066ea86ad5c776a03592b055309778 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -13,7 +13,7 @@ module _3gpp-common-subscription-control {
 
   description "Defines IOCs for subscription, notification list and heartbeat 
     control.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623
       Generic Network Resource Model (NRM)
@@ -21,7 +21,8 @@ module _3gpp-common-subscription-control {
       Solution Set (SS) definitions
       3GPP TS 28.623";
 
-  revision 2025-11-07 { reference "CR-0551 CR-0586"; } //common for r19, r20
+  revision 2026-03-19 { reference "CR-0618 CR-0619"; } //common for r19, r20
+  revision 2025-11-07 { reference "CR-0551 CR-0586"; } 
   revision 2025-08-13 { reference "CR-0551 CR-0561"; }
   revision 2025-05-13 { reference "CR-0548"; }
   revision 2025-03-24 { reference "CR-0516 0518"; }
@@ -331,6 +332,7 @@ module _3gpp-common-subscription-control {
       type uint64;
       config false;
       mandatory true;
+      yext3gpp:notNotifyable;
       description "The sequence number of the last notification that was sent
         by a 'NtfSubscriptionControl' instance.";
     }
diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang
index 749340b4ace604a9acedbdf6af1266e4b8bde977..beeec4fb47a82b0292e2c4cc9d82f841c0daf0e2 100755
--- a/yang-models/_3gpp-common-trace.yang
+++ b/yang-models/_3gpp-common-trace.yang
@@ -25,6 +25,8 @@ module _3gpp-common-trace {
       Integration Reference Point (IRP);
       Information Service (IS)" ;
 
+  revision 2026-04-01 { reference "CR-0623" ; }
+  revision 2026-03-19 { reference "CR-0618" ; }
   revision 2026-02-07 { reference "CR-1682" ; }
   revision 2025-10-07 { reference "CR-0573" ; }    
   revision 2025-10-01 { reference "CR-0578" ; }
@@ -745,6 +747,75 @@ module _3gpp-common-trace {
     }
   }
 
+  grouping EventTriggerConfigGrp {
+    description "Represent the EventTriggerConfig data type. Defines the 
+      configuration parameters of trigger event used for M10 measurement in NR. 
+      For details, please refer to TS 32.422 subclause 5.10.45.";
+    
+    leaf eventType {
+      type enumeration {
+        enum eventA1 { value 0; }
+        enum eventA2 { value 1; }
+      }
+      mandatory true;
+      description "It indicates the event type. Either Event A1 or Event A2 
+        can be configured. See also clause 5.10.45 of TS 32.422.";
+    }
+    
+    leaf thresholdRAN {
+      type uint8 {
+        range 0..127;
+      }
+      mandatory true;
+      description "Threshold parameter for an event. It is used to define the 
+        entering and leaving condition of the event. For further details see 
+        RSRP-Range in TS 38.331. See also clause 5.10.45 of TS 32.422";
+    }
+    
+    leaf measurementQuantityRAN {
+      type int32;
+      mandatory true;
+      description "It indicates the measurement quantity. For further details 
+        see MeasTriggerQuantity in TS 38.331. See also clause 5.10.45 of 
+        TS 32.422";
+    }
+    
+    leaf hysteresisRAN {
+      type uint8 {
+        range 0..30;
+      }
+      mandatory true;
+      description "Hysteresis parameter for an event. It is used to define the 
+        entering and leaving condition of the event. For further details see 
+        Hysteresis in TS 38.331. See also clause 5.10.45 of TS 32.422";
+    }
+    
+    leaf timeToTriggerRAN {
+      type enumeration {
+        enum 0ms { value 0; }
+        enum 40ms { value 1; }
+        enum 64ms { value 2; }
+        enum 80ms { value 3; }
+        enum 100ms { value 4; }
+        enum 128ms { value 5; }
+        enum 160ms { value 6; }
+        enum 256ms { value 7; }
+        enum 320ms { value 8; }
+        enum 480ms { value 9; }
+        enum 512ms { value 10; }
+        enum 640ms { value 11; }
+        enum 1024ms { value 12; }
+        enum 1280ms { value 13; }
+        enum 2560ms { value 14; }
+        enum 5120ms { value 15; }
+      }
+      mandatory true;
+      description "It defines the time during which specific criteria for the 
+        event needs to be met in order to trigger an action. 
+        For further details see TimeToTrigger in TS 38.331 and clause 5.10.45 of TS 32.422.";
+    }
+  }
+  
   grouping ImmediateMdtConfigGrp {
    description "Represents the ImmediateMdtConfig dataType.
       This <<dataType>> defines the configuration parameters of
@@ -783,6 +854,8 @@ module _3gpp-common-trace {
         -measurementQuantity (conditional for 1F event reporting),
         -beamLevelMeasurement (conditional for M1 in NR),
         -excessPacketDelayThresholds (conditional for M6 UL measurement in NR).
+        -layerOneRsrpPeriodicity (conditional for M10 measurements in NR),
+        -eventTriggerConfig (conditional for event reporting for M10 measuremen
 
        For immediate MDT, the measurement reporting is dependent on the
        configured measurements:
@@ -839,7 +912,14 @@ module _3gpp-common-trace {
 
         - Measurements M8 and M9 in NR or LTE are reported according to
         configured M1 and/or M6 related UE measurement reporting.
-
+        
+        - For management based Immediate MDT M10 measurements 
+        layerOneRsrpPeriodicity in NR, the 
+        measurement is optionally triggered with periodically or event based . 
+        The parameter layerOneRsrpPeriodicity determines the interval between 
+        two successive UE measurements. If parameter eventTriggerConfig is 
+        configured, the logging is performed only at the condition indicated 
+        by eventTriggerConfigis met.
         ";
 
     leaf listOfMeasurements {
@@ -864,6 +944,7 @@ module _3gpp-common-trace {
         enum M7;
         enum M8;
         enum M9;
+        enum M10;
       }
       description "It specifies the UE measurements that shall be
         collected in an Immediate MDT job. The attribute is
@@ -1395,6 +1476,26 @@ module _3gpp-common-trace {
         measurements and applicable only for NR.";
       reference "Clause 5.10.6 of TS 32.422.";
     }
+    
+    leaf layerOneRsrpPeriodicity {
+      type enumeration {
+        enum 2 {value 0; }
+        enum 3 {value 1; }
+        enum 4 {value 2; }
+        enum 5 {value 3; }
+      }
+      description "It defines the periodicity that the UE shall use for the  
+        M10 measurements.";
+    }
+    
+    list eventTriggerConfig {
+      description "It specifies the event-triggered configuration used for M10 
+        measurements.";
+        max-elements 1;
+        key idx;
+        leaf idx { type uint32; }
+      uses EventTriggerConfigGrp;
+    }
   }
 
   grouping LoggedMdtConfigGrp {
@@ -1623,7 +1724,9 @@ module _3gpp-common-trace {
      the attribute loggedMdtConfig are applicable.
 
      The optional attribute plmnList allows to specify the PLMNs where 
-     measurements collection, status indication and log reporting is allowed.";
+     measurements collection, status indication and log reporting is allowed.
+     For NTN MDT, if the list of plmnList is included, it will only log 
+     measurements for the cells belonging to the listed PLMNs.";
 
    leaf anonymizationOfMdtData {
       when ../areaScope ;
@@ -2023,7 +2126,8 @@ module _3gpp-common-trace {
         attribute loggedMdtConfig are applicable.
         The optional attribute plmnList allows to specify the PLMNs where 
         measurements collection, status indication and log reporting is 
-        allowed.";
+        allowed. For NTN MDT, if the list of plmnList is included, it will 
+        only log measurements for the cells belonging to the listed PLMNs.";
       max-elements 1;
       uses MdtConfigGrp;
       leaf idx { type string; }
@@ -2067,7 +2171,8 @@ module _3gpp-common-trace {
       description "A TraceJob instance represents the Trace Control and
         Configuration parameters of a particular Trace Job (see TS 32.421 and
         TS 32.422 for details). It can be name-contained by SubNetwork,
-        ManagedElement, ManagedFunction.
+        ManagedElement, ManagedFunction. In case of signalling based trace 
+        activation, it shall be name-contained by the UDMFunction, see TS 28.541.
 
         To activate Trace Jobs, a MnS consumer has to create TraceJob object
         instances on the MnS producer. A MnS consumer can activate a Trace Job
@@ -2079,16 +2184,15 @@ module _3gpp-common-trace {
         4.1.2.1.2 of TS 32.422.
 
         When a MnS consumer wishes to deactivate a Trace Job, the MnS consumer
-        shall delete the corresponding TraceJob instance.
+        shall delete the corresponding TraceJob instance. For details of 
+        management Trace Job deactivation see clauses 4.1.3.8 to 4.1.3.11 a
+        nd 4.1.4.10 to 4.1.4.13  of TS 32.422
 
-        For details of management Trace Job activation/deactivation see clause
-        4.1.1.1.2 of TS 32.422.
-
-        The attribute traceReference specifies a globally unique ID and
+        The attribute traceReference specifies a globally unique ID and 
         identifies a Trace session. One Trace Session may be activated to
-        multiple Network Elements. The traceReference is populated by the
-        consumer that makes the request for a Trace Session.
-
+        multiple Network Elements. The traceReference is populated by the 
+        consumer that makes the request for a Trace Session, TS 32.422.
+        
         The jobId attribute presents the job identifier of a TraceJob instance.
         The jobId can be used to associate  multiple TraceJob instances.
         For example, it is possible to configure the same jobId value for
@@ -2103,14 +2207,15 @@ module _3gpp-common-trace {
         stream-based reporting the attribute traceReportingConsumerUri
         specifies the streaming target.
 
-        The mandatory attribute traceTarget determines the target object of
-        the TraceJob. Dependent on the network element to which the Trace
-        Session is activated different types of the target object are possible.
-        The attribute pLMNTarget defines the PLMN for which sessions shall be
-        selected in the Trace Session in case of management based activation
-        when several PLMNs are supported in the RAN.The MDT configuration may
-        include area scope defined by network slice, in which case
-        the attribute pLMNTarget is not applicable.
+        The attribute traceTarget determines the target object of the 
+        TraceJob. Dependent on the network element to which the Trace Session 
+        is activated different types of the target object are possible.
+
+        The attribute pLMNTarget defines the PLMN for which sessions shall be 
+        selected in the Trace Session in case of management based activation 
+        when several PLMNs are supported in the RAN.  The MDT configuration 
+        may include area scope defined by network slice, in which case the 
+        attribute pLMNTarget is not applicable.
 
         The attribute listOfTraceMetrics allows configuraton of which metrics
         shall be recorded.
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 51e946c7b1057ae9785d53944963425f61a8cf01..8574bf4f3dfeb1dea4b3da3fcfdaf567fa0fdec4 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -12,11 +12,11 @@ module _3gpp-common-yang-types {
   description "The model defines a YANG mapping of the top level
     information classes used for management of 5G networks and
     network slicing.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
-  // common for rel-19, rel-20
+  revision 2026-03-19 { reference "CR-0618" ; }
   revision 2025-10-07 { reference "CR-0573 CR-0582 CR-583"; }
   revision 2025-10-01 { reference "CR-0578" ; }
   revision 2025-08-31 { reference "CR-0551 CR-0556 CR-0562"; }
@@ -657,11 +657,13 @@ module _3gpp-common-yang-types {
     description "a geographical circle identified by reference location and
       associated distance radius";
 
-    leaf referenceLocation {
-      description "Reference location of the serving cell provided via NTN 
-        (quasi)-Earth fixed cell. This field is only present in an NTN cell. 
-        It is defined as ReferenceLocation-r17 in TS 38.331";
-      type string;
+    list referenceLocation {
+      description "Specifies a fixed geographic coordinate point, 
+        see TS 38.331.";
+        min-elements 1;
+        max-elements 1;
+        key "latitude longitude altitude";
+      uses GeoCoordinateGrp;
     }
 
     leaf distanceRadius {
@@ -669,6 +671,7 @@ module _3gpp-common-yang-types {
         coordinates reference point, defined by referenceLocation. Each value 
         represents 50m distance. This field is only present in an NTN cell.";
       type uint16;
+      mandatory true;
       units "50 meters";
     }
   }
@@ -698,14 +701,6 @@ module _3gpp-common-yang-types {
     reference "clause 2.10.1 of 3GPP TS 23.003";
   }
   
-    list geoCircle {
-      description "a geographical circle identified by reference location and
-        associated distance radius";
-      key idx;
-      leaf idx { type uint16; }
-      uses GeoCircleGrp;
-    }
-
   typedef AmfSetId {
     type union {
       type uint16 {
@@ -773,6 +768,46 @@ module _3gpp-common-yang-types {
       enum UDSF;
       enum BSF;
       enum CHF;
+      enum NWDAF;
+      enum PCSCF;
+      enum CBCF;
+      enum HSS;
+      enum UCMF;
+      enum SOR_AF;
+      enum SPAF;
+      enum MME;
+      enum SCSAS;
+      enum SCEF;
+      enum SCP;
+      enum NSSAAF;
+      enum ICSCF;
+      enum SCSCF;
+      enum DRA;
+      enum IMS_AS;
+      enum AANF;
+      enum 5G_DDNMF;
+      enum NSACF;
+      enum MFAF;
+      enum EASDF;
+      enum DCCF;
+      enum MB_SMF;
+      enum TSCTSF;
+      enum ADRF;
+      enum GBA_BSF;
+      enum CEF;
+      enum MB_UPF;
+      enum NSWOF;
+      enum PKMF;
+      enum MNPF;
+      enum SMS_GMSC;
+      enum SMS_IWMSC;
+      enum MBSF;
+      enum MBSTF;
+      enum PANF;
+      enum TNGF;
+      enum W_AGF;
+      enum TWIF;
+      enum TSN_AF;
     }
   }
 
@@ -791,6 +826,23 @@ module _3gpp-common-yang-types {
     }
   }
 
+  typedef SupportedFeatures {
+    type string {
+      pattern '[A-Fa-f0-9]*';
+    }
+    description "It is a string, which indicates the features of the service
+     corresponding to the subscribed default notification, which are supported
+     by the NF (Service) instance acting as NF service consumer, when it is
+     present of the attribute whose type is DefaultNotificationSubscription
+     <<datatype>>. When it is present as the attribute of an NFService 
+     instance, it indicates the supported features of the NF Service <datatype>
+     A string containing a bitmask indicating supported features in hexadecimal
+     representation. Each character in the string shall take
+     a value of 0 to 9, a to f or A to F and shall represent the support
+     of 4 features as described in table 5.2.2-3 of TS 29.571.";
+    reference "3GPP TS 29.571";
+  }
+
   typedef N1MessageClass {
     type enumeration {
       enum 5GMM;
@@ -862,14 +914,10 @@ module _3gpp-common-yang-types {
     leaf supportedFeatures {
       description "It is a string, which indicates the features of the service
       corresponding to the subscribed default notification, which are supported
-      by the NF (Service) instance acting as NF service consumer. The string
-      shall contain a bitmask indicating supported features in hexadecimal
-      representation:Each character in the string shall take a value
-      of 0 to 9, a to f or A to F ";
-      reference "shall represent the support of 4 features as described in
-      table 5.2.2-3 of TS 29.571 [61].";
+      by the NF (Service) instance acting as NF service consumer.";
+      reference "3GPP TS 29.571 table 5.2.2-3";
       //optional
-      type string;
+      type SupportedFeatures;
       config false;
     }
     leaf serviceInfoList {
diff --git a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
index 629b5dee59e84cc154718358e36c1b37cb41a486..0dc2704029cf079f9e0a6da00fbd27d8b71dab5f 100644
--- a/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
+++ b/yang-models/_3gpp-nr-nrm-ecmappingrule.yang
@@ -9,31 +9,35 @@ module _3gpp-nr-nrm-ecmappingrule {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the unified mapping rule input to support
     Energy Cost Index Mapping when Energy Cost Reporting.
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
-  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  // common for R18, R19
+  revision 2026-05-19 { reference "CR-1702 CR-1703" ; }  // common for R19, R20
+  revision 2025-05-06 { reference "CR-1526 CR-1527" ; }  
   revision 2024-08-12 { reference "CR-1336 CR-1337"; }
 
   grouping NRECMappingRuleGrp {
     description "Represents the unified mapping rule to support Energy Cost Mapping
       when Energy Cost Reporting is supported.  Can be name-contained by SubNetwork
       or ManagedElement.  It applies to all ManagedEntity contained by the parent.";
-    leaf eCMRInputMinValue {
-      type uint8;
+    leaf ecMRInputMinimumValue {
+      type uint32;
+      mandatory true;
       description "The minimum value of to be applied
         for mapping from this attribute to the energy cost.";
     }
 
-    leaf eCMRInputMaxValue {
-      type uint8;
+    leaf ecMRInputMaximumValue {
+      type uint32;
+      mandatory true;
       description "The maximum value of to be applied
         for mapping from this attribute to the energy cost.";
     }
 
-    leaf eCTimeInterval {
-      type uint8;
+    leaf ecTimeInterval {
+      type uint32;
+      mandatory true;
       description "Time interval (in seconds) that
         should be applied for collecting values of mapping
         rule attribute to be used for computing the energy cost.";
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index e2940624d4f11b192580384aeb0aee56b4edde12..0a029c4b7ba88b1c9d8785678c960cbd063971fd 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -16,10 +16,11 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBCUCPFunction Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-04-25 { reference "CR-1702" ; }
   revision 2025-05-25 { reference "CR-1527" ; }
   revision 2025-05-07 { reference "CR-1548"; }
   revision 2025-03-25 { reference "CR-1509"; }
@@ -255,6 +256,13 @@ module _3gpp-nr-nrm-gnbcucpfunction {
         enabled or disabled.";
     }
 
+    leaf dLTMControl {                                                        
+      type boolean;                                                           
+      default false;                                                          
+      description "Determines whether the LTM cell switch function is enabled 
+        or disabled.";                                                        
+    }                                                                             
+    
     list qceIdMappingInfoList {
       description "List of the mapping relationship between QoE collection entity
         identity, PLMN where QoE collection entity resides, and the IP address of
@@ -292,12 +300,6 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       uses types5g3gpp:MappedCellIdInfoGrp;
     }
 
-    leaf configurable5QISetRef {
-      type types3gpp:DistinguishedName;
-      description "DN of the Configurable5QISet that the GNBCUCPFunction
-        supports (is associated to).";
-    }
-
     leaf isOnboardSatellite {
       type boolean;
       default false;
@@ -313,6 +315,12 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       leading digits '0' to complete a 5-digit length.";
     }
 
+    leaf configurable5QISetRef {
+      type types3gpp:DistinguishedName;
+      description "DN of the Configurable5QISet that the GNBCUCPFunction
+        supports (is associated to).";
+    }
+    
     leaf dynamic5QISetRef {
       type types3gpp:DistinguishedName;
       description "DN of the Dynamic5QISet that the GNBCUCPFunction supports
@@ -386,7 +394,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
 
   grouping GeNBIdGrp {
     description "Represents the properties of a global eNB ID (GeNBId).";
-    uses types3gpp:PLMNId;
+    uses types3gpp:PLMNId;  // missing list wrapper, omitted due to BC
 
     leaf enbId {
       description "It identifies an eNB within a PLMN. The eNB ID is part of
diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
index 4238ccf3b8f8e0ec632bdd74797bccfbeb87e224..531c338b40fd0e1c4294521ac7a386168c85cd20 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
@@ -15,10 +15,11 @@ module _3gpp-nr-nrm-gnbcuupfunction {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the GNBCUUPFunction Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-04-25 { reference CR-1703; }
   revision 2024-11-01 { reference CR-1405 ; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
@@ -79,6 +80,23 @@ module _3gpp-nr-nrm-gnbcuupfunction {
       key "mcc mnc sd sst";
       uses types5g3gpp:PLMNInfo;
     }
+
+    leaf isOnboardSatellite {
+      type boolean;
+      default false;
+      config false;
+      yext3gpp:inVariant;
+      description "This attribute indicates whether the function is
+      on board the satellite.";
+    }
+    leaf onboardSatelliteId {
+      type string;
+      config false;
+      yext3gpp:inVariant;
+      description "This attribute indicates the onboard satellite Id.
+      It shall be formatted as a fixed 5-digit string, padding with
+       leading digits '0' to complete a 5-digit length.";
+    }
     
     leaf configurable5QISetRef {
       type types3gpp:DistinguishedName;
diff --git a/yang-models/_3gpp-nr-nrm-nrcelldu.yang b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
index a6b8fd775c89e35c0cffa0bc814e1cf206bc7fb6..8b2c751edb2bd9c24853db51cb52d4e68ea9437e 100755
--- a/yang-models/_3gpp-nr-nrm-nrcelldu.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcelldu.yang
@@ -19,7 +19,8 @@ module _3gpp-nr-nrm-nrcelldu {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
-  revision 2025-11-07 { reference "CR-1640 CR-1643"; } // common for r19, r20
+  revision 2026-05-19 { reference CR-1702 ; }
+  revision 2025-11-07 { reference "CR-1640 CR-1643"; }
   revision 2025-07-25 { reference CR-1558 ; }
   revision 2025-02-07 { reference CR-1442; }
   revision 2024-05-25 { reference CR-1412 ; }
@@ -340,6 +341,23 @@ module _3gpp-nr-nrm-nrcelldu {
       units MHz;
     }
 
+    leaf-list uECellBarredAccess {
+      type enumeration {
+        enum REDCAP_1RX;
+        enum REDCAP_2RX;
+        enum EREDCAP_1RX;
+        enum EREDCAP_2RX;
+      }
+      description "Represents whether the NR Cell bars access to a UE type 
+        (e.g. RedCap UE).
+        If present, a value indicates the UE type is not allowed access to 
+        the cell.
+        allowedValues: 
+        - REDCAP_1RX and REDCAP_2RX for RedCap UE(s),
+        - EREDCAP_1RX and EREDCAP_2RX for eRedCap UE(s).";
+      reference "TS 38.331";
+    }
+    
     leaf-list nRSectorCarrierRef {
       description "This attribute contains the DN of the referenced 
         NRSectorCarrier.";
@@ -356,7 +374,7 @@ module _3gpp-nr-nrm-nrcelldu {
       type types3gpp:DistinguishedName;
     }
 
-    leaf-list nRFrequencyRef {
+    leaf nRFrequencyRef {
       description "Reference to corresponding NRFrequency instance.";
       type types3gpp:DistinguishedName;
     }
diff --git a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
index 67d7643268f4e03b2019c98ed20d0373fed160f3..b89915d77bd19b0aa0797c7df5766e1d0fc64c16 100755
--- a/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-nrcellrelation.yang
@@ -12,10 +12,11 @@ module _3gpp-nr-nrm-nrcellrelation {
   organization "3GPP SA5";
   description "Defines the YANG mapping of the NRCellRelation Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-05-19 { reference CR-1702 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
   revision 2021-01-25 { reference CR-0454 ; }
@@ -127,6 +128,30 @@ module _3gpp-nr-nrm-nrcellrelation {
         changed to energy saving state.";
       type EnergySavingCoverage;
     }
+    
+    leaf isENDCAllowed {
+      type boolean;
+      mandatory true;
+      description "This indicates if EN-DC is allowed or prohibited.
+        If TRUE, the target cell is allowed to be used for EN-DC. The target 
+        cell is referenced by the NRCellRelation that contains this isENDCAllowed.
+        If FALSE, EN-DC shall not be allowed.";
+    }
+    
+    leaf isMLBAllowed {
+      type boolean;
+      mandatory true;
+      description "This indicates if mobility load balancing is allowed or 
+        prohibited from source cell to target cell.
+        If TRUE, load balancing is allowed from source cell to target cell. 
+        The source cell is identified by the name-containing NRCellCU of the 
+        NRCellRelation that contains the isMLBAllowed. The target cell is 
+        referenced by the NRCellRelation that contains this isLBAllowed. In 
+        case of isHOAllowed is FALSE, mobility load balancing is prohibited by 
+        handover from source cell to target cell.
+        If FALSE, load balancing shall be prohibited from source cell to target 
+        cell.";
+    }
   }
 
   augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
diff --git a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
index 9a80eddf1022678bc158639eda9662cf4133ea64..b7b634a2566c7a8af0b534fde6f1c3520f4325b1 100755
--- a/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfreqrelation.yang
@@ -14,10 +14,11 @@ module _3gpp-nr-nrm-nrfreqrelation {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRFreqRelation Information
     Object Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-05-19 { reference CR-1702; }
   revision 2025-11-07 { reference CR-1640; }
   revision 2025-01-25 { reference CR-1442; }
   revision 2024-02-24 { reference CR-1218; } 
@@ -205,7 +206,7 @@ module _3gpp-nr-nrm-nrfreqrelation {
       units dB;
     }
 
-    leaf tReselectionNR {
+    leaf tReselectionNr {
       description "Cell reselection timer for NR.";
       reference "TreselectionRAT for NR in 3GPP TS 38.331";
       mandatory true;
diff --git a/yang-models/_3gpp-nr-nrm-nrfrequency.yang b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
index 39f3795a7ad1f056651ca1ed06f81859e4488505..8a13796cc0491de2379e97a38cc714203de0a21e 100755
--- a/yang-models/_3gpp-nr-nrm-nrfrequency.yang
+++ b/yang-models/_3gpp-nr-nrm-nrfrequency.yang
@@ -13,11 +13,12 @@ module _3gpp-nr-nrm-nrfrequency {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the NRFrequency Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
+    Copyright 2026, 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-04-25 { reference "CR-1526 CR-1527"; } // common for r18, r19
+  revision 2026-05-19 { reference "CR-1702 CR-1703"; } // common for r19, r20
+  revision 2025-04-25 { reference "CR-1526 CR-1527"; } 
   revision 2023-09-18 { reference CR-1043 ; }
   revision 2019-10-28 { reference S5-193518 ; }
   revision 2019-06-17 { reference "Initial version"; }
@@ -32,7 +33,7 @@ module _3gpp-nr-nrm-nrfrequency {
       type uint32 { range "0.. 3279165"; }
     }
 
-    leaf ssBSubCarrierSpacing {
+    leaf ssbSubCarrierSpacing {
       description "Sub-carrier spacing of the SSB.
         Note that the allowed values of SSB used for representing data,
         by e.g. a BWP, are: 15, 30, 60 and 120 in units of kHz.";
diff --git a/yang-models/_3gpp-nr-nrm-ntnfunction.yang b/yang-models/_3gpp-nr-nrm-ntnfunction.yang
index 53095b40121a74505ca314337782a0c36b97d57e..2adb28ddc513cb8207ce5e68aaa2a4bcb5ff92a7 100644
--- a/yang-models/_3gpp-nr-nrm-ntnfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-ntnfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-ntnfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2026-05-07 { reference CR-1717; }
   revision 2026-02-02 { reference "CR-1682 CR-1683"; } //Common in r19, r20
   revision 2025-03-27 { reference CR-1512; }
   revision 2025-02-17 { reference CR-1479 ; }
@@ -114,8 +115,7 @@ module _3gpp-nr-nrm-ntnfunction {
       }
       default 0;
       units meter;
-      description "Satellite orbital parameter: semi major axis alpha, 
-        see NIMA TR 8350.2. 
+      description "Satellite orbital parameter: semi major axis alpha. 
         Step of 4.249 * 10**-3 m. 
         Actual value = 6500000 + field value * (4.249 * 10**-3).";
     }
@@ -125,8 +125,7 @@ module _3gpp-nr-nrm-ntnfunction {
         range -524288..524287;
       }
       default 0;
-      description "Satellite orbital parameter: eccentricity e, 
-        see NIMA TR 8350.2.
+      description "Satellite orbital parameter: eccentricity e.
         Step 1.431 * 10**-8. 
         Actual value = field value * (1.431 * 10**-8).";
     }
@@ -137,8 +136,7 @@ module _3gpp-nr-nrm-ntnfunction {
       }
       default 0;
       units radian;
-      description "Satellite orbital parameter: argument of periapsis omega, 
-        see NIMA TR 8350.2. 
+      description "Satellite orbital parameter: argument of periapsis omega. 
         Step of 2.341* 10**-8 rad. 
         Actual value = field value * (2.341* 10**-8).";
     }
@@ -150,7 +148,7 @@ module _3gpp-nr-nrm-ntnfunction {
       default 0;                
       units radian;
       description "Satellite orbital parameter: longitude of ascending node 
-        OMEGA, see NIMA TR 8350.2. 
+        omega. 
         Step of 2.341* 10**-8 rad.
         Actual value = field value * (2.341* 10**-8).";
     }
@@ -161,8 +159,7 @@ module _3gpp-nr-nrm-ntnfunction {
       }
       default 0;
       units radian;
-      description "Satellite orbital parameter: inclination i, 
-        see NIMA TR 8350.2. 
+      description "Satellite orbital parameter: inclination i. 
         Step of 2.341* 10**-8 rad. 
         Actual value = field value * (2.341* 10**-8).";
     }
@@ -173,8 +170,7 @@ module _3gpp-nr-nrm-ntnfunction {
       }
       default 0;
       units radian;
-      description "Satellite orbital parameter: Mean anomaly M at epoch time, 
-        see NIMA TR 8350.2. 
+      description "Satellite orbital parameter: Mean anomaly M at epoch time. 
         Step of 2.341* 10**-8 rad. 
         Actual value = field value * (2.341* 10**-8).";
     }
@@ -213,7 +209,7 @@ module _3gpp-nr-nrm-ntnfunction {
       
       list orbital {
         description "It indicates ephemeris is in orbital parameter ephemeris 
-          format, as specified in NIMA TR 8350.2";
+          format.";
         max-elements 1;
         key idx;
         leaf idx { type uint32; }
diff --git a/yang-models/_3gpp-nr-nrm-rimrsset.yang b/yang-models/_3gpp-nr-nrm-rimrsset.yang
index 69caf25eaaa639fd3a8d3571450cbe2b17d05eb8..b04141ccd81a35f03f5ff3374750a21bd2d2e2e7 100755
--- a/yang-models/_3gpp-nr-nrm-rimrsset.yang
+++ b/yang-models/_3gpp-nr-nrm-rimrsset.yang
@@ -11,10 +11,11 @@ module _3gpp-nr-nrm-rimrsset {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "Defines the YANG mapping of the RimRSSet Information Object
     Class (IOC) that is part of the NR Network Resource Model (NRM).
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2026-05-19 { reference "CR-1702 CR-1703"; } // rel-19, 20 common
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2021-10-28 { reference CR-0607 ; }
   
@@ -59,11 +60,15 @@ module _3gpp-nr-nrm-rimrsset {
         network (N_f^RIM ) (see 38.211 subclause 7.4.1.6).";
     }
 
-    leaf-list rimRSCommonCarrierReferencePoint {
-      type  int32 ;
+    leaf rimRSCommonCarrierReferencePoint {
+      type  int32 { range 0..3279165 ; }
+      mandatory true;
+      description "This attribute is used to configure the common reference 
+        point for RIM RS. Where represents the frequency-location of point A 
+        expressed as in ARFCN. See 3GPP TS 38.211 subclause 4.4.4.2";
     }
 
-    leaf rimRSStartingFrequencyOffsetIdList {
+    leaf-list rimRSStartingFrequencyOffsetIdList {
       type  uint32 {
         range 0..550;
       }
@@ -152,7 +157,7 @@ module _3gpp-nr-nrm-rimrsset {
         (see 38.211 subclause 7.4.1.6)";
     }
 
-    leaf RIMRSScrambleTimerMultiplier {
+    leaf rIMRSScrambleTimerMultiplier {
       type uint32  {
         range 0..2147483647;
       }
@@ -163,7 +168,7 @@ module _3gpp-nr-nrm-rimrsset {
         allowedValues:  0,1...2^31-1";
     }
 
-    leaf RIMRSScrambleTimerOffset {
+    leaf rIMRSScrambleTimerOffset {
       type uint32  {
         range 0..2147483647;
       }