diff --git a/yang-models/_3gpp-5g-common-yang-types.yang b/yang-models/_3gpp-5g-common-yang-types.yang
index 08b8fc7211dd4b505c121951bbdd93d1e606a462..4219405411fe8477bbdeb9580cdc82b835cf40e7 100755
--- a/yang-models/_3gpp-5g-common-yang-types.yang
+++ b/yang-models/_3gpp-5g-common-yang-types.yang
@@ -3,7 +3,6 @@ module _3gpp-5g-common-yang-types {
   namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";
   prefix "types5g3gpp";
   
-  
   import ietf-yang-types { prefix yang; }
   import _3gpp-common-yang-types { prefix types3gpp; }
 
@@ -15,6 +14,8 @@ module _3gpp-5g-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
 
+  revision 2024-11-01 { reference CR-1405; }
+  revision 2024-10-06 { reference CR-1389; }
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-05-10 { reference CR-0916; }
@@ -22,6 +23,71 @@ module _3gpp-5g-common-yang-types {
   revision 2020-11-05 { reference CR-0412 ; }
   revision 2019-10-20 { reference "Initial version."; }
  
+  grouping MappedCellIdInfoGrp {
+    description "This data type represents the mapping relationship between 
+      Mapped Cell IDs and geographical areas (see clause 16.14.5 of TS 38.300";
+    
+    list ntnGeoArea {
+      description "This attribute indicates a specific geographical location 
+        mapped to Mapped Cell ID(s).";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:GeoAreaGrp;
+    }
+    
+    list mappedCellId  {
+      description "This attribute is in format of NCGI to indicate a fixed 
+        geographical area (See subclause 16.14.5 in TS 38.300)";
+      min-elements 1;
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses NcgiGrp;
+    }
+  }
+  
+  grouping NcgiGrp {
+    description "Represents the Ncgi datatype";
+    
+    list plmnId {
+      description "This attribute represents a PLMN Identity.";
+      min-elements 1;
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types3gpp:PLMNId ; 
+    }
+    
+    leaf nrCellId {
+      type string;
+      mandatory true;
+      description "This attribute represents NR Cell Identity.
+        It's a 36-bit string identifying an NR Cell Id as specified in 
+        clause 9.3.1.7 of TS 38.413, 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 4 bits. 
+        The most significant character representing the 4 most significant 
+        bits of the Cell Id shall appear first in the string, and the 
+        character representing the 4 least significant bit of the 
+        Cell Id shall appear last in the string.
+
+        Pattern: '^[A-Fa-f0-9]{9}$' 
+
+        Example:
+        An NR Cell Id 0x225BD6007 shall be encoded as '225BD6007'.";
+    }
+    
+    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.";
+    }
+  }
+  
   typedef NRTAC {
     type string;
     description "This holds the identity of the common Tracking Area Code 
diff --git a/yang-models/_3gpp-5gc-nrm-amffunction.yang b/yang-models/_3gpp-5gc-nrm-amffunction.yang
index 310e71835b97e066a22d95ba86e9e3f2b67a90be..cf6b290f25dbf59c50ca436afc9c49a1e51a2ea3 100755
--- a/yang-models/_3gpp-5gc-nrm-amffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-amffunction.yang
@@ -8,7 +8,9 @@ module _3gpp-5gc-nrm-amffunction {
   import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
   import ietf-inet-types { prefix inet; }
+  import ietf-yang-types { prefix yang; }
   import _3gpp-common-top { prefix top3gpp; }
+  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }
 
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -17,16 +19,17 @@ module _3gpp-5gc-nrm-amffunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
   
+  revision 2024-11-01 { reference CR-1405; }
+  revision 2024-10-06 { reference CR-1389; }
   revision 2024-04-04 { reference CR-1139; }
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-01-07 { reference CR-0643; }
   revision 2020-11-06 { reference CR-0412 ; }
   revision 2019-10-25 { reference "S5-194457 S5-193518"; }
-
   revision 2019-05-31 { reference "Ericsson refactoring."; }
   revision 2018-08-07 { reference "Initial revision"; }
-
-  grouping GlobalRanNodeIDGrp{
+                                     
+  grouping NTNGlobalRanNodeIDGrp{
     
     list pLMNId {
       description "The PLMN Identifier is composed of
@@ -116,14 +119,13 @@ module _3gpp-5gc-nrm-amffunction {
     }
   }
 
-  grouping satelliteBackhaulInfo{
+  grouping SatelliteBackhaulInfoGrp{
     description "Defines information related to satellite backhaul category
      and corresponding information of gNB.";
     reference "3GPP TS 23.501";
 
-    list GlobalRanNodeID{
+    list nTNGlobalRanNodeID{
       description "Unique identifier of an NG-RAN node.";
-      uses GlobalRanNodeIDGrp;
       min-elements 1;
       max-elements 1;
       leaf GlobalRanNodeIDValue{
@@ -131,6 +133,7 @@ module _3gpp-5gc-nrm-amffunction {
         description "this relies on the choice of GlobalRanNodeID";
       }
       key "GlobalRanNodeIDValue";
+      uses NTNGlobalRanNodeIDGrp;
     }
 
     leaf satelliteBackhaulCategory{
@@ -160,20 +163,309 @@ module _3gpp-5gc-nrm-amffunction {
     }
   }
 
+  grouping GUAMInfoGrp {
+    description "Represents the GUAMInfo datatype.";
+    
+    list pLMNId {
+      description "This attribute represents a PLMN Identity.";
+      min-elements 1;
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types3gpp:PLMNId ; 
+    }
+    
+    leaf aMFIdentifier  {
+      type int64;
+      description "The AMFI is constructed from an AMF Region ID, an 
+        AMF Set ID and an AMF Pointer. The AMF Region ID identifies the region, 
+        the AMF Set ID uniquely identifies the AMF Set within the AMF Region, 
+        and the AMF Pointer uniquely identifies the AMF within the AMF Set. 
+        (Ref. 3GPP TS 23.003)";
+    }
+  }
+
+  grouping N2InterfaceAmfInfoGrp {
+    description "Represents the N2InterfaceAmfInfo datatype.";
+    
+    leaf-list ipv4EndpointAddress {
+      type inet:ipv4-address;
+      min-elements 1;
+      description "This attribute represents available AMF endpoint 
+        IPv4 address(es) for N2.";
+    }
+    
+    leaf-list ipv6EndpointAddress {
+      type inet:ipv6-address;
+      min-elements 1;
+      description "This attribute represents available AMF endpoint 
+        IPv6 address(es) for N2.";
+    }
+    
+    leaf amfName {
+      type inet:host-name;
+      description "This attribute represents AMF Name FQDN as defined in 
+        clause 28.3.2.5 of TS 23.003.";
+    }    
+  }
+  
+  grouping BlockedLocationInfoGrp {
+    description "Repreasents the datatype BlockedLocationInfo";
+    
+    list blockedLocation {
+      description "This provides the geographical location at which the PLMN 
+        are not allowed in case of NTN.";
+      min-elements 1;
+      max-elements 1;
+      key "mnc mcc";
+      uses types3gpp:PLMNId ; 
+    }
+    
+    list blockedDurWindow {
+      description "This provides the time durations for which the PLMN are 
+        not allowed at a given location in case of NTN";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TimeWindowGrp;
+    }
+    
+    list blockedSlice {
+      description "This provides the slice for which the access is 
+        not allowed at a given location in case of NTN. ";
+      max-elements 1;
+      key idx;
+      unique "sst sd";
+      leaf idx { type uint32; }
+      uses types5g3gpp:SNssai;
+    }
+  }
+  
+  grouping NTNPLMNRestrictionsInfoGrp {
+    description "Represents the datatype NTNPLMNRestrictionsInfo";
+    
+    list pLMNId {
+      description "This attribute represents a PLMN Identity.";
+      min-elements 1;
+      max-elements 1;
+      key "mnc mcc";
+      uses types3gpp:PLMNId ; 
+    }
+    
+    list blockedLocationInfoList {
+      description "This defines the information related with the location 
+        for which the access restrictions are to be applied in case of NTN.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses BlockedLocationInfoGrp;
+    }
+  }
+  
+  grouping NtnLocationInfoGrp {
+    description  "Represents the NtnLocationInfo datatype.";
+    
+    list location {
+      description "This defines the Location (geographical area) under 
+        consideration to which the satellite coverage info belongs";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:GeoAreaGrp;       
+    }
+    
+    list availabilityWindows  {
+      description "This attribute defines the list of time windows at which 
+        the satellite coverage will be available for this location. 
+        Either availabilityWindows or nonAvailabilityWindows shall be present.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TimeWindowGrp;
+    }
+    
+    list nonAvailabilityWindows {
+      description "This attribute defines the list of time windows at which 
+        the satellite coverage will not be available for this location. 
+        Either availabilityWindows or nonAvailabilityWindows shall be present.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types3gpp:TimeWindowGrp;
+    }
+  }
+  
+  grouping SatelliteCoverageInfoGrp {
+    description "Represents the datatype SatelliteCoverageInfo";
+    
+    leaf nRSatelliteRATtype {
+      type enumeration {
+        enum NRLEO;
+        enum NRMEO;
+        enum NRGEO;
+        enum NROTHERSAT;
+      }
+      description "This attribute defines the RAT Type for NR satellite 
+        access.";
+    }
+    
+    list locationInfo {
+      description "This attribute defines the information about location and 
+        corresponding time windows for which the satellite coverage will be 
+        available or unavailable.";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses NtnLocationInfoGrp;
+    }
+  }
+  
+  grouping SliceExpiryInfoGrp {
+    description "Represents the datatype SliceExpiryInfo";
+    
+    list pLMNInfo {
+      min-elements 1;  // ???
+      config false;
+      description "It defines the PLMN(s) of a Network Function. ";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PLMNInfo;
+    }
+    
+    leaf expiryTime {
+      type yang:date-and-time;
+      config false;
+      description "This attribute provides information about the time at 
+        which the slice is scheduled to be expired as it is not required 
+        anymore.
+        This attribute will be set based on the sliceAvailability coming as 
+        part of ServiceProfile.";
+    }
+  }
+  
+  grouping MappedCellIdInfoGrp {
+    description "Represents the datatype MappedCellIdInfo";
+    
+    list ntnGeoArea {
+      description "This attribute indicates a specific geographical location 
+        mapped to Mapped Cell ID(s).";
+      min-elements 1;
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types3gpp:GeoAreaGrp;       
+    }
+    
+    list mappedCellId {
+      description "This attribute is in format of NCGI to indicate a fixed 
+        geographical area (See subclause 16.14.5 in TS 38.300";
+      min-elements 1;
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:NcgiGrp;       
+    }  
+  }
+  
+  grouping AmfInfoGrp {
+    description "Represents the data type AmfInfo.";
+    
+    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 {
+      type int64;
+      mandatory true;
+      description "It represents the AMF Set ID, which is uniquely identifies 
+        the AMF Set within the AMF Region.
+        allowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003";
+    }
+    
+    list taiList {
+      min-elements 1;
+      description "The list of TAIs.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses types3gpp:TaiGrp; 
+    }
+    
+    list taiRangeList {
+      min-elements 1;
+      description "The range of TAIs.";
+      key "idx";
+      leaf idx { type uint32 ; }
+       uses nfp3gpp:TaiRangeGrp; 
+    }
+    
+    list gUAMIdList {
+      description "List of supported Globally Unique AMF Ids (GUAMIs).";
+      config false;
+      min-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses GUAMInfoGrp;
+    }
+    
+    list backupInfoAmfFailure {
+      description "List of GUAMIs for which the AMF acts as a backup for AMF 
+        failure.";
+      min-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses GUAMInfoGrp;
+    }
+    
+    list backupInfoAmfRemoval {
+      description "List of GUAMIs for which the AMF acts as a backup for 
+        planned AMF removal.";
+      min-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses GUAMInfoGrp;
+    }
+    
+    list n2InterfaceAmfInfo {
+      description "This attribute represents the N2 interface information of 
+        the AMF. ";
+      max-elements 1;
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses N2InterfaceAmfInfoGrp;
+    }
+    
+    leaf amfOnboardingCapability {
+      type boolean;
+      default false;
+      description "This attribute indicates the AMF supports SNPN Onboarding 
+        capability. This is used for the case of Onboarding of UEs for SNPNs 
+        (see TS 23.501, clause 5.30.2.10).
+        - FALSE: AMF does not support SNPN Onboarding;
+        - TRUE: AMF supports SNPN Onboarding.";
+    }
+    
+    leaf highLatencyCom {
+      type boolean;
+      description "This attribute indicates whether the AMF supports High 
+        Latency communication (e.g. for NR RedCap UE). This is used for CP NF 
+        to discover AMF supporting High Latency communication (see TS 23.501, 
+        clause 6.3.5).
+        - FALSE: AMF does not support High Latency communication e.g. for 
+        NR RedCap UE;
+        - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;";
+    }
+  }
+  
   grouping AMFFunctionGrp {
     description "Represents the AMFFunction IOC";
     uses mf3gpp:ManagedFunctionGrp;
 
-    list pLMNIdList {
+    list pLMNInfoList {
       min-elements 1;
-      description "A list of PLMN identifiers (Mobile Country Code and Mobile
-        Network Code).";
-      key "mcc mnc";
-      uses types3gpp:PLMNId;
+      description "It defines the PLMN(s) of a Network Function. ";
+      key idx;
+      leaf idx { type uint32 ; }
+      uses types5g3gpp:PLMNInfo;
     }
 
     container aMFIdentifier {
-      //presence true;
       description "An AMF identifier, comprising an AMF Region ID, an
         AMF Set ID and an AMF Pointer.";  
       uses types3gpp:AmfIdentifier;
@@ -185,15 +477,14 @@ module _3gpp-5gc-nrm-amffunction {
       type inet:domain-name;
     }
 
-    list sNSSAIList {
-      min-elements 1;
-      description "List of S-NSSAIs the managed object is capable of supporting.
-                  (Single Network Slice Selection Assistance Information)
-                  An S-NSSAI has an SST (Slice/Service type) and an optional SD 
-                 (Slice Differentiator) field.";
-      reference "3GPP TS 23.003";
-      key "sd sst";
-      uses types5g3gpp:SNssai;
+    leaf-list cNSIIdList {
+      type string;
+      description "It is a set of 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 NSI ID definition in clause 3.1 of TS 23.501 and 
+        subclause 6.1.6.2.7 of  TS 29.531";
     }
     
     list managedNFProfile {
@@ -213,6 +504,39 @@ module _3gpp-5gc-nrm-amffunction {
       uses types5g3gpp:CommModel;
     }
 
+    list amfInfo {
+      max-elements 1;
+      description "This attribute represents information of an AMF 
+        NF Instance.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses AmfInfoGrp;
+    }
+    
+    list nTNPLMNRestrictionsList {
+      description "This attribute defines the location restrictions per PLMN 
+        that relates to non-terrestrial network access.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses NTNPLMNRestrictionsInfoGrp;
+    }
+    
+    list satelliteCoverageInfoList {
+      description "This attribute defines the information related to NR 
+        Satellite RAT type and corresponding information of satellite coverage";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses SatelliteCoverageInfoGrp;
+    }
+    
+    list sliceExpiryInfo {
+      description "This provides information related to a network slice 
+        validity.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses SliceExpiryInfoGrp;
+    }
+    
     list satelliteBackhaulInfoList{
       description "Specifies a list of satellite backhaul information. It can be
        used by NF and NF services.";
@@ -222,7 +546,7 @@ module _3gpp-5gc-nrm-amffunction {
       }
       key "GlobalRanNodeIDValue";
       min-elements 1;
-      uses satelliteBackhaulInfo;
+      uses SatelliteBackhaulInfoGrp;
     }
 
     leaf-list mdtUserConsentReqList {
@@ -243,12 +567,30 @@ module _3gpp-5gc-nrm-amffunction {
         Any MDT measurement, whose name is not specified in this list, is not 
         subject to user consent at MDT activation.";
     }
+    
+    list mappedCellIdInfoList {
+      description "It provides the list of mapping between GEO area and 
+        Mapped Cell ID.";
+      key "idx";
+      leaf idx { type uint32 ; }
+      uses MappedCellIdInfoGrp;
+    }
+    
+    leaf aMFSetRef {
+      type types3gpp:DistinguishedName;
+      description "This is the DN of AMFSet";
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
     list AMFFunction {
-      description "5G Core AMF Function";
-      reference "3GPP TS 28.541";
+      description "This IOC represents the AMF functionality in 5GC. 
+        For more information about the AMF, see 3GPP TS 23.501. 
+
+        The attribute sliceExpiryInfo is used when the validity information of 
+        a network slice need to be configured. The attribute 
+        sliceExpiryInfo.pLMNInfo indicates the network slice to which the 
+        validity information applies.";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
diff --git a/yang-models/_3gpp-5gc-nrm-lmffunction.yang b/yang-models/_3gpp-5gc-nrm-lmffunction.yang
index 6069ae5133d295ea5ef9e24c50bcb2acf088d83c..2a612372fc964b0ec67c36564e2d2f23c0eb0dcd 100755
--- a/yang-models/_3gpp-5gc-nrm-lmffunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-lmffunction.yang
@@ -9,28 +9,218 @@ module _3gpp-5gc-nrm-lmffunction {
   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-nfprofile { prefix nfp3gpp; }
+  import _3gpp-nr-nrm-ntnfunction { prefix ntn3gpp; }
+
   organization "3gpp SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
   description "This IOC represents the LMF function defined in 3GPP TS 23.501.
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541";
   
+  revision 2024-11-01 { reference CR-1405 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2019-10-25 { reference "S5-194457 S5193518"; }
+  revision 2019-05-15 { reference "initial revision"; }
+    
+  grouping LmfInfoGrp {
+    description "Represents the LmfInfo datatype.";
+    
+    leaf-list servingClientTypes {
+      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 PLMN_OPERATOR_BROADCAST_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";
+        }
+      }
+      description "This attribute represents a list of external client type(s),
+        e.g. emergency client. The NRF should only include this LMF instance 
+        to NF discovery with 'client-type' query parameter indicating one of 
+        the external client types in the list.
+
+        Absence of this attribute means the LMF is not dedicated to serve 
+        specific client types.";
+    }
+
+    leaf lmfId {
+      type string;
+      description "This attribute represents the LMF identification. 
+        See clause 6.1.6.3.6 TS 29.572";
+    }
+
+    leaf-list servingAccessTypes {
+      type enumeration {
+        enum 3GPP_ACCESS;
+        enum NON_3GPP_ACCESS;
+      }
+      min-elements 1;      
+      description "This attribute contains the access type (3GPP_ACCESS and/or 
+        NON_3GPP_ACCESS) supported by the SMF.
+        If not included, it shall be assumed the both access types are 
+        supported.";
+    }
+
+    leaf-list servingAnNodeTypes {
+      type enumeration {
+        enum GNB;
+        enum NG;
+        enum ENB;
+      }
+      min-elements 1;
+      description "This attribute contains the AN node type (i.e. gNB or NG-eNB) 
+        supported by the LMF.
+        If not included, it shall be assumed that all AN node types are 
+        supported.";
+    }
+
+    leaf-list servingRatTypes {
+      type string;
+      min-elements 1;
+      description "This attribute contains the RAT type (e.g. 5G NR, eLTE or 
+        any of the RAT Types specified for NR satellite access) supported by 
+        the LMF.
+        If not included, it shall be assumed that all RAT types are supported 
+        allowedValues: see clause 5.4.3.2 of TS 29.571";
+    }
+
+    list taiList {
+      description "This attribute contains TAI list that the LMF 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 LMF can be selected for any TAI in the serving 
+        network.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses types3gpp:TaiGrp;
+    }
+
+    list taiRangeList {
+      description "This attribute contains TAI range list that the LMF 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 LMF can be selected for any TAI in the serving network.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses nfp3gpp:TaiRangeGrp;
+    }
+
+    leaf-list supportedGADShapes {
+      type enumeration {
+        enum POINT {
+          description "indicates Ellipsoid Point";
+        }
+        enum POINT_UNCERTAINTY_CIRCLE {
+          description "indicates Ellipsoid point with uncertainty circle";
+        }
+        enum POINT_UNCERTAINTY_ELLIPSE {
+          description "indicates  Ellipsoid point with uncertainty ellipse";
+        }
+        enum POLYGON {
+          description "indicates Polygon";
+        }
+        enum POINT_ALTITUDE {
+          description "indicates Ellipsoid point with altitude";
+        }
+        enum POINT_ALTITUDE_UNCERTAINTY {
+          description "indicates  Ellipsoid point with altitude and 
+            uncertainty ellipsoid";
+        }
+        enum ELLIPSOID_ARC {
+          description "indicates Ellipsoid Arc";
+        }
+        enum LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE {
+          description "indicates Local 2D point with uncertainty ellipse";
+        }
+        enum LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID {
+          description "indicates  Local 3D point with uncertainty ellipsoid";
+        }
+      }
+      min-elements 1;
+      description "This attribute contains the GAD shapes supported by the LMF.
+      If not included, it doesn't indicate that the LMF doesn't support any 
+      GAD shapes.
+      The allowedValues are: see clause 6.1.6.3.4 of TS 29.572 ";
+    }
+  }
 
-  revision 2019-05-15 {
-    description "initial revision";
-    reference "Based on
-      3GPP TS 28.541 V15.X.XX";
+  grouping TrpMappingInfoGrp {
+    description "This data type represents the mapping relationship between 
+      satellite and TRPs.";
+    
+    leaf satelliteId {
+      type string {
+        pattern  '[0-9]{5}';
+      }
+      mandatory true;
+      description "This attribute indicates satellite Id. It shall be formatted 
+        as a fixed 5-digit string, padding with leading digits '0' to complete 
+        a 5-digit length.";
+    }
+    
+    leaf-list trpIds {
+      type uint8 {
+        range 1..max;
+      }
+      description "This attribute indicates TRPs uniquely within an NG-RAN 
+        node (see TS 38.455 clause 9.2.24). A gNB may serve several TRPs. 
+        For NTN, a TRP may be located on board the satellite.";
+    }
   }
+  
+  grouping TrpInfoGrp {
+    description "This data type represents the mapping relationship between 
+      gNB and TRPs.";
+      
+    leaf gNBId {
+      type uint32;
+      mandatory true;
+      description "It identifies a gNB within a PLMN. The gNB ID is part of 
+        the NR Cell Identifier (NCI) of the gNB cells.
+        See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300. See 
+        'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
+    }
     
+    list trpMappingInfoList {
+      description "This is the list of TRP mapping between satellite and TRPs.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses TrpMappingInfoGrp;
+    }  
+  }
+  
   grouping LMFFunctionGrp {
     uses mf3gpp:ManagedFunctionGrp;
 
     list pLMNIdList {
-      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).";
+      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;
       max-elements 6;
@@ -39,22 +229,58 @@ module _3gpp-5gc-nrm-lmffunction {
     }
     
     list managedNFProfile {
+      description "This parameter defines profile for managed NF. See TS 23.501";
       key idx;
       min-elements 1;
       uses types3gpp:ManagedNFProfile;
     }
 
     list commModelList {
+      description "The attribute specifies a list of commModel. It can be used 
+        by NF and NF services to interact with each other in 5G Core network 
+        (see TS 23.501)";
       min-elements 1;
       key "groupId";
       uses types5g3gpp:CommModel;
     }
+
+    list lmfInfo {
+      description "This attribute represents information of an LMF NF Instance";
+      max-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses LmfInfoGrp;
+    }
+
+    list mappedCellIdInfoList {
+      description "It provides the list of mapping between GEO area and 
+        Mapped Cell ID.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:MappedCellIdInfoGrp;
+    }
+
+    list ephemerisInfos {
+      description "This is the list of Ephemeris related information";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses ntn3gpp:EphemerisGrp;
+    }
+
+    list trpInfoList {
+      description "This is the list of TRP (Transmission-Reception Point) 
+        related information on LMF (see TS 38.305 clause 5.4.4).";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses TrpInfoGrp;
+    }
   }
   
   augment "/me3gpp:ManagedElement" {
     list LMFFunction {
-      description "5G Core LMF Function";
-      reference "3GPP TS 28.541";
+      description "5G Core LMF Function defined in TS 23.501";
       key id;
       uses top3gpp:Top_Grp;
       container attributes {
diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang
index 25d9a5b5b16205f7252de52c381f6ce87fc822eb..37fadf04ae1a6b6cc2e6a054ad55945c6be5fb6c 100755
--- a/yang-models/_3gpp-common-yang-types.yang
+++ b/yang-models/_3gpp-common-yang-types.yang
@@ -16,6 +16,7 @@ module _3gpp-common-yang-types {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.623";
 
+  revision 2024-11-01 { reference CR-0463; } 
   revision 2024-08-13 { reference CR-0387; } 
   revision 2024-05-18 { reference CR-0359; } 
   revision 2024-04-12 { reference CR-0346; } 
@@ -620,10 +621,24 @@ module _3gpp-common-yang-types {
   }
 
   typedef Tac {
-    type int32 {
-      range 0..16777215 ;
-    }
-    description "Tracking Area Code";
+    type string {
+      pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ;
+    }
+    description "Tracking Area Code
+      2 or 3-octet string identifying a tracking area code as specified in 
+      clause 9.3.3.10 of 3GPP TS 38.413 [34], 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 4 bits. 
+      The most significant character representing the 4 most significant 
+      bits of the TAC shall appear first in the string, and the character 
+      representing the 4 least significant bit of the TAC shall appear last 
+      in the string.
+
+      pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)'
+
+      Examples:
+      A legacy TAC 0x4305 shall be encoded as '4305'.
+      An extended TAC 0x63F84B shall be encoded as '63F84B'";
     reference "TS 23.003 clause 19.4.2.3";
   }
 
@@ -632,7 +647,7 @@ module _3gpp-common-yang-types {
       as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 
       and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN 
       identifier (PLMN-Id, which is composed of the MCC and MNC) and 
-      the Tracking Area Code (TAC). ";
+      the Tracking Area Code (TAC).";
     list plmnId {
       description "PLMN Identity.";
       min-elements 1;
@@ -641,7 +656,11 @@ module _3gpp-common-yang-types {
       uses types3gpp:PLMNId;
     }
     
-    leaf tac { type Tac; }
+    leaf tac { 
+      type Tac;
+      mandatory true;
+      description "Tracking Area Code";
+    }
   }
        
   grouping GeoCoordinateGrp {
diff --git a/yang-models/_3gpp-nr-nrm-bwpset.yang b/yang-models/_3gpp-nr-nrm-bwpset.yang
index cba0ca407fd9f8445ba55ee37b6c66d826ad4e49..42f70035212a2ab845bd2b59cb4743ac73b9007a 100644
--- a/yang-models/_3gpp-nr-nrm-bwpset.yang
+++ b/yang-models/_3gpp-nr-nrm-bwpset.yang
@@ -16,6 +16,7 @@ module _3gpp-nr-nrm-bwpset {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-11-01 { reference CR-1405 ; } 
   revision 2024-08-19 { reference CR-1314 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2022-06-29 { reference CR-0756 ; }
@@ -27,7 +28,7 @@ module _3gpp-nr-nrm-bwpset {
   }
   augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
 
-    list BWPLSett {
+    list BWPSet {
       description "Represents a bandwidth part (BWP) set.";
       key id;
       uses top3gpp:Top_Grp;
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 839cb879c47bac02062c1b0a6f2e31a7c7a959e6..ca324f891a21cf57f146f9dc8e616201ec010b3b 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   prefix "gnbcucp3gpp";
     
   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-managed-function { prefix mf3gpp; }
   import _3gpp-common-managed-element { prefix me3gpp; }
@@ -19,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-08-19 { reference "CR-1405"; } 
   revision 2024-08-19 { reference "CR-1337 CR-1352"; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2024-04-04 { reference CR-1139; }
@@ -56,7 +58,85 @@ module _3gpp-nr-nrm-gnbcucpfunction {
   feature DMROFunction {
     description "Class representing D-SON function of MRO feature";
   }
- 
+
+  grouping BackhaulAddressGrp {
+    description "This data type represents the properties describing the 
+      backhaul address of gNB. ";
+      
+    leaf gNBId {
+      type uint32 ;
+      mandatory true;
+      description "It identifies a gNB within a PLMN. The gNB ID is part of 
+        the NR Cell Identifier (NCI) of the gNB cells.";
+      reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. 
+                 Global gNB ID in subclause 9.3.1.6 of TS 38.413";
+    }
+    
+    list tAI {
+      key tac;
+      min-elements 1;
+      max-elements 1;
+      description "Tracking Area Identity";
+      reference "subclause 9.3.3.11 in TS 38.413";
+      uses types3gpp:TaiGrp;
+    }
+  }
+  
+  grouping MappingSetIDBackhaulAddressGrp {
+    description "This data type represents the properties describing the 
+      mapping relationship between set ID and backhaul address of gNB.";
+    
+    leaf setID {
+      type uint32 {
+        range 0..4194304;  // 22 bits
+      }
+      mandatory true;
+      description "This specifies the set ID of a victim Set (RIM-RS1 Set) or 
+        aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). 
+
+      allowedValues:
+      The bit length of the set ID is maximum 22bit.";
+    }
+    
+    list backhaulAddress  {
+      description "The attribute specifies backhaulAddress which is defined as 
+        a datatype.";
+      min-elements 1;
+      max-elements 1;
+      key gNBId;
+      uses BackhaulAddressGrp;
+    }
+  }
+
+  grouping tceIDMappingInfoGrp {
+    description "This data type represents the properties describing the 
+      mapping relationship between TCE ID, PLMN where TCE resides and 
+      IP address of TCE.";
+    
+    leaf tceIPAddress {
+      type inet:ip-address;
+      mandatory true;
+      description "This attribute indicates IP address of TCE. 
+        (See subclause 4.1.1.9.2 in TS 32.422)";
+    }
+    
+    leaf tceID {
+      type int64;
+      mandatory true;
+      description "This attribute indicates TCE Id. 
+        (See subclause 4.1.1.9.2 in TS 32.422)";
+    }
+    
+    list pLMNTarget {
+      description "Indicates the PLMN where TCE resides. 
+        (See subclauses 4.1.1.9.2 and 4.9.2 in TS 32.422)";
+      min-elements 1;
+      max-elements 1;
+      key mnc;      
+      uses types3gpp:PLMNId;
+    }
+  }
+  
   grouping GNBCUCPFunctionGrp {
     description "Represents the GNBCUCPFunction IOC.";
     reference "3GPP TS 28.541";
@@ -114,46 +194,50 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       description "List of nodes to which X2 connections are enforced.";
     }
 
-    leaf-list xnHOBlockList {
-      type string;
-      description "List of nodes to which handovers over  Xn are prohibited.";
-    }
-
-    leaf configurable5QISetRef {
-      type types3gpp:DistinguishedName;
-      description "DN of the Configurable5QISet that the GNBCUCPFunction 
-        supports (is associated to).";
-    }
-
     leaf-list x2HOBlockList {
       type string;
       description "List of nodes to which handovers over X2 are prohibited.";
     }
 
-    leaf dynamic5QISetRef {
-      type types3gpp:DistinguishedName;
-      description "DN of the Dynamic5QISet that the GNBCUCPFunction supports 
-        (is associated to).";
+    leaf-list xnHOBlockList {
+      type string;
+      description "List of nodes to which handovers over  Xn are prohibited.";
     }
 
-    leaf dCHOControl {
-      type boolean;
-      description "This attribute determines whether the CHO function is 
-        enabled or disabled.";
+    list mappingSetIDBackhaulAddressList {
+      description "The attribute specifies a list of mappingSetIDBackhaulAddress 
+        which is defined as a datatype. Which is used to 
+        retrieve the backhaul address of the victim set.";
+      min-elements 1;
+      key idx;
+      leaf idx {type uint32; }
+      uses MappingSetIDBackhaulAddressGrp;
     }
-
-    leaf dLTMCellSwitchControl {
-      type boolean;
-      description "This attribute determines whether the distributed SON
-        function LTM Cell Switch is enabled or disabled.";
+    
+    list tceIDMappingInfoList {
+      description "This attribute includes a list of TCE ID, PLMN where TCE 
+        resides and the corresponding TCE IP address. It is used in Logged MDT 
+        case to provide the information to the gNodeB or GNBCUCPFunction to 
+        get the corresponding TCE IP address when there is an MDT log 
+        received from the UE.";
+      min-elements 1;
+      key idx;
+      leaf idx { type uint32; }
+      uses tceIDMappingInfoGrp;
     }
-
+    
     leaf dDAPSHOControl {
       type boolean;
       description "This attribute determines whether the DAPS handover function
                    is enabled or disabled.";
     }
 
+    leaf dCHOControl {
+      type boolean;
+      description "This attribute determines whether the CHO 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
@@ -183,6 +267,26 @@ module _3gpp-nr-nrm-gnbcucpfunction {
         subject to user consent at MDT activation.";
     }
     
+    list mappedCellIdInfoList  {
+      description "This attribute provides the list of mapping between 
+        geographical location and Mapped Cell ID.";
+      key idx;
+      leaf idx { type uint32; }
+      uses types5g3gpp:MappedCellIdInfoGrp;
+    }
+    
+    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 
+        (is associated to).";
+    }
+
     leaf ephemerisInfoSetRef {
       type types3gpp:DistinguishedName;
       description "This is the DN of EphemerisInfoSet.";
diff --git a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
index fed4880c9bd0f7b85ecab68ff4a7d963f8abaaeb..4238ccf3b8f8e0ec632bdd74797bccfbeb87e224 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcuupfunction.yang
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcuupfunction {
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
 
+  revision 2024-11-01 { reference CR-1405 ; } 
   revision 2024-05-24 { reference CR-1273 ; } 
   revision 2023-09-18 { reference CR-1043 ; } 
   revision 2023-04-26 { reference CR-0916; }
@@ -38,74 +39,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
     GNBCUUPFunction";
   }
 
-  grouping TAIGrp {
-    description "Tracking Area Identity";
-    
-    list pLMNId {
-      key "mcc mnc";
-      description "PLMN IDs for the Tracking area";
-      uses types3gpp:PLMNId;
-    }
-    
-    leaf nRTAC {
-      type types5g3gpp:NRTAC;
-      description "Identity of the common Tracking Area Code for the PLMNs
-        allowedValues:
-        a) It is the TAC or Extended-TAC. 
-        b) A cell can only broadcast one TAC or Extended-TAC. 
-          See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation).
-        c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and 
-          Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.
-        d) For a 5G SA (Stand Alone), it has a non-null value.";
-    }
-  }
-  
-  grouping BackhaulAddressGrp {
-    description "Indicates the backhauladdress of gNB.";
-
-    leaf gNBId {
-      type uint32 {
-        range "0..4294967295";
-      }
-      description "It identifies a gNB within a PLMN. The gNB ID is part of 
-        the NR Cell Identifier (NCI) of the gNB cells.";
-      reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. 
-                 Global gNB ID in subclause 9.3.1.6 of TS 38.413";
-    }
-    
-    list tAI {
-      key nRTAC;
-      min-elements 1;
-      max-elements 1;
-      description "Tracking Area Identity";
-      reference "subclause 9.3.3.11 in TS 38.413";
-      uses TAIGrp;
-    }
-  }
-  
-  grouping MappingSetIDBackhaulAddressGrp {
-    description "Mapping relationship between setID and backhaulAddress of gNB";
-    
-    leaf idx { 
-      type uint32 ;
-      description "ID value";
-    }
-    
-    leaf setID {
-      type uint32;
-      mandatory true;
-      description "Indicates the setID of gNB.";
-      reference "Subclause 7.4.1.6 in TS 38.211";
-    }
-
-    list backhaulAddress {
-      key gNBId;
-      min-elements 1;
-      max-elements 1;
-      description "Indicates the backhauladdress of gNB.";
-      uses BackhaulAddressGrp;
-    }
-  }
   grouping GNBCUUPFunctionGrp {
     description "Represents the GNBCUUPFunction IOC.";
     reference "3GPP TS 28.541";
@@ -147,15 +80,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
       uses types5g3gpp:PLMNInfo;
     }
     
-    list mappingSetIDBackhaulAddressList {
-      key idx;
-      description "Specifies a list of mappingSetIDBackhaulAddress used to 
-        retrieve the backhaul address of the victim set.
-        Must be present if Remote Interference Management function is 
-        supported.";
-      uses MappingSetIDBackhaulAddressGrp;
-    }
-
     leaf configurable5QISetRef {
       type types3gpp:DistinguishedName;
       description "DN of the Configurable5QISet that the GNBCUUPFunction