diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang
index 5ad40a9c23956f0141890fee8bd7e3c7f6ec707b..8dc23e5b52c6648e639d5b643d2fa73773397728 100644
--- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang
+++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang
@@ -10,28 +10,34 @@ module _3gpp-5gc-nrm-stmfunction {
   
   organization "3gpp SA5";
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
-  description "This IOC represents the STM function defined in 3GPP TS 28.abc.
-    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+  description "This IOC represents the STM function defined in 3GPP TS 28.560.
+    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
     TTA, TTC). All rights reserved.";
   reference "3GPP TS 28.abc
     Signalling traffic monitoring management";
   
+  revision 2025-05-07 { reference "CR-0009"; } 
   revision 2024-11-07 { reference "S5-247077"; } 
   
-  grouping StmCtrlGrp {
-    description "Represents the StmCtrl IOC.";
+  grouping NetworkInterfaceGrp {
+    description "Represents the network interfaces for which signalling 
+      traffic messages are to be copied and sent to the external entity.  
+      The attribute networkInterfaceType specifies the network interface type  
+      to be monitored. The optional attribute networkInterfaceInstanceList 
+      specifies the network interface instances to be monitored. It is a list  
+      of applicable network interface instances of the network interface type 
+      specified by networkInterfaceType. The optional attribute 
+      serviceOperationList specifies the service operations to be monitored. 
+      It is a list of applicable service operations exchanged over the network 
+      interface instances specified by networkInterfaceInstanceList, or, if 
+      networkInterfaceInstanceList is not present, it is list of applicable 
+      service operations exchanged over the network interface type specified 
+      by networkInterfaceType.";
 
-    leaf-list reportingNFList {
-      type types3gpp:DistinguishedName;
-      description "List of Network Function Distinguished Name, which 
-        specifies the target network interface type to be monitored. If 
-        this parameter is not present or it is empty, then all applicable 
-        interface types from the target NF shall be monitored";   
-    }
-    
-    leaf-list networkInterfaceTypeList {
+     leaf networkInterfaceType {
       type enumeration {
         enum ALL;
+        enum N2;
         enum N4;
         enum N5;
         enum N7;
@@ -42,21 +48,103 @@ module _3gpp-5gc-nrm-stmfunction {
         enum N13;
         enum N14;
         enum N15;
+        enum N16;
+        enum N17;
+        enum N18;
+        enum N20;
+        enum N21;
         enum N22;
+        enum N23;
+        enum N26;
+        enum N28;
+        enum N29;
+        enum N30;
+        enum N33;
+        enum N34;
+        enum N35;
+        enum N36;
+        enum N37;
+        enum N40;
+        enum N41;
+        enum N42;
+        enum N51;
+        enum N52;
         enum N58;
         enum N59;
+        enum N60;
+        enum N61;
+        enum N62;
+        enum N63;
         enum N80;
         enum N81;
+        enum N82;
+        enum N83;
+        enum N84;
+        enum N85;
+        enum N86;
+        enum N87;
+        enum N88;
+        enum N89;
+        enum N96;
+        enum NL1;
+        enum NL2;
+        enum NL5;
+        enum NL6;
+        enum NL8;
+        enum NL9;
       }
       default ALL;
-      description "List of network interface type. it specifies the network 
-        function whose signalling traffic is to be monitored. If this 
+      description "List of network interface type to be monitored. The 
+        applicable network interface type names are specified based on 
+        subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP 
+        TS 23.273.
+        The value ALL is specified for the case if all the applicable
+        interface type of the network function shall be monitored.";
+      reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of  
+        3GPP TS 23.273 for details on the allowed values.";
+    }
+
+    leaf-list networkInterfaceInstanceList {
+      type types3gpp:DistinguishedName;
+      description "The list of applicable network interface instances, for 
+        which the monitoring is to be performed, of the network interface 
+        type specified by networkInterfaceType.";
+      reference "allowedValues: DN of the following MOIs as specified
+        in subclause 5.2.1 of 3GPP TS 28.541";
+    }
+    
+    leaf-list serviceOperationList {
+      type string;
+      description "The list of applicable service operations exchanged
+        over the network interface instances specified by 
+        networkInterfaceInstanceList, that needs to be monitored. Or,
+        If networkInterfaceInstanceList is not present, the list of 
+        applicable service operations exchanged over the network 
+        interface type specified by networkInterfaceType.";
+      reference "allowedValues: refer to subclause 5.2 of 3GPP 
+        TS 23.502";
+    }
+  }
+
+  grouping StmCtrlGrp {
+    description "Represents the StmCtrl IOC.";
+
+    leaf-list reportingNFList {
+      type types3gpp:DistinguishedName;
+      description "List of Network Function Distinguished Name, which 
+        specifies the target network interface type to be monitored. If 
+        this parameter is not present or it is empty, then all applicable 
+        interface types from the target NF shall be monitored";   
+    }
+    
+    list targetInterfaceInfoList {
+      uses NetworkInterfaceGrp; 
+      key "networkInterfaceType";
+      description "List of network interface to be monitored. If this 
         parameter is not present or it is empty, then all Network Functions 
         within the SubNetwork or ManagedElement shall be monitored. This 
         parameter shall be omitted if the STM control object is specified 
         under a ManagedFunction. ";
-      reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the
-        allowed values.";
     }
 
     leaf stmTargetUri {