diff --git a/yang-models/_3gpp-common-fm.yang b/yang-models/_3gpp-common-fm.yang
index ca4d7eaca21e33e00ca200e77bcb0f1f95cdec6b..51da632b5b7f7d01d3ecef326fd65cec8155cc70 100755
--- a/yang-models/_3gpp-common-fm.yang
+++ b/yang-models/_3gpp-common-fm.yang
@@ -12,7 +12,7 @@ module _3gpp-common-fm {
   contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
 
   description "Defines a Fault Management model
-    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.623
@@ -25,6 +25,7 @@ module _3gpp-common-fm {
       Integration Reference Point (IRP);
       Information Service (IS)";
 
+  revision 2024-04-05 { reference CR-0332 ; } 
   revision 2023-09-17 { reference CR-0270 ; } 
   revision 2023-05-09 { reference CR-0249;   }
   revision 2022-10-31 { reference CR-0195;   }
@@ -496,6 +497,7 @@ module _3gpp-common-fm {
     list AlarmList {
       key id;
       max-elements 1;
+      yext3gpp:only-system-created;
       description "The AlarmList represents the capability to store and manage
         alarm records. The management scope of an AlarmList is defined by all
         descendant objects of the base managed object, which is the object
diff --git a/yang-models/_3gpp-common-yang-extensions.yang b/yang-models/_3gpp-common-yang-extensions.yang
index d98af752ca9b81aa6b3d61f3cb4b3a1a2cccc056..dc9c8e5b5d4d34de17984cc7b005c6894d959b6e 100755
--- a/yang-models/_3gpp-common-yang-extensions.yang
+++ b/yang-models/_3gpp-common-yang-extensions.yang
@@ -4,12 +4,11 @@ module _3gpp-common-yang-extensions {
   prefix yext3gpp ;
 
   organization "3GPP SA5";
+  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
+
   description "The module defines YANG extensions needed 
     3GPP YANG modeling.
 
-    Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
-    TTA, TTC). All rights reserved.
-
     Extensions MUST be defined with the following structure in the
     description statement:
         - What is this statement.
@@ -39,12 +38,36 @@ module _3gpp-common-yang-extensions {
     If support for an extension is missing the extension statement needs
     individual handling or it SHOULD be removed from the module using
     the extension e.g. with a deviation.
-          ";
-
-  revision 2023-09-17 { reference CR-0270 ; } 
-  revision 2022-10-31 { reference CR-0195;   }
+    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
+    TTA, TTC). All rights reserved.";
+  reference "3GPP TS 28.623
+      Generic Network Resource Model (NRM)
+      Integration Reference Point (IRP);
+      Solution Set (SS) definitions
+      3GPP TS 28.623";
+
+  revision 2024-04-05 { reference "CR-0332, 0333" ; } 
+  revision 2023-09-17 { reference "CR-0270, 0271" ; } 
+  revision 2022-10-31 { reference "CR-0195, 0196";   }
   revision 2019-06-23 { reference "Initial version";   }
 
+  extension only-system-created {
+    description
+      "Indicates that the MOI can only be created and deleted by the 
+       MnS producer. 
+       System created MOIs can have both read-only and read-write data
+       node children. Implementers shall add the extension to standard 
+       models if they restrict creation/deletion of an IOC.
+       
+       The statement MUST only be a sub-statement of the list statement,
+       with the parent list statement representing an IOC.
+
+       Zero or one only-system-created statement per parent statement is
+       allowed. No sub-statements are allowed.
+            
+       Adding this statement is an NBC change, removing it is BC.";
+  }
+
   extension notNotifyable {
     description
       "Indicates that data change notifications shall not be sent