diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang
index e037ff83c734245ce6ea13f7047ad71862e0bd3f..a6a1ab477dfd7e3108f65646afdf1afb0c69d09c 100755
--- a/yang-models/_3gpp-common-subscription-control.yang
+++ b/yang-models/_3gpp-common-subscription-control.yang
@@ -18,6 +18,7 @@ module _3gpp-common-subscription-control {
       Solution Set (SS) definitions
       3GPP TS 28.623";
   
+  revision 2024-01-18 { reference CR-0329 ; } 
   revision 2023-09-18 { reference CR-0271 ; } 
   revision 2023-08-10 { reference "CR0257 CR0260"; }
   revision 2022-10-20 { reference CR-0196;   }
@@ -42,45 +43,53 @@ module _3gpp-common-subscription-control {
         discriminated by notificationFilter attribute.";
     }
 
-    list scope {
-      key "scopeType";
-      min-elements 1;
-      max-elements 1;
+    choice scope {
       description "Describes which object instances are selected with 
         respect to a base object instance.";
       
-      leaf scopeType { 
-        type enumeration {
-          enum BASE_ONLY;
-          enum BASE_ALL;
-          enum BASE_NTH_LEVEL;
-          enum BASE_SUBTREE;
-        }
-        description "If the optional scopeLevel parameter is not supported 
-          or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL.
+      case type-level {
+        leaf scopeType { 
+          type enumeration {
+            enum BASE_ONLY;
+            enum BASE_ALL;
+            enum BASE_NTH_LEVEL;
+            enum BASE_SUBTREE;
+          }
+          mandatory true;
+          description "If the optional scopeLevel parameter is not supported 
+            or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL.
 
-          The value BASE_ONLY indicates only the base object is selected.
-          The value BASE_ALL indicates the base object and all of its 
-          subordinate objects (incl. the leaf objects) are selected.
+            The value BASE_ONLY indicates only the base object is selected.
+            The value BASE_ALL indicates the base object and all of its 
+            subordinate objects (incl. the leaf objects) are selected.
 
-          If the scopeLevel parameter is supported and present, allowed 
-          values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL 
-          and BASE_SUBTREE.
+            If the scopeLevel parameter is supported and present, allowed 
+            values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL 
+            and BASE_SUBTREE.
 
-          The value BASE_NTH_LEVEL indicates all objects on the level, 
-          which is specified by the scopeLevel parameter, below the base 
-          object are selected. The base object is at scopeLevel zero.
-          The value BASE_SUBTREE indicates the base object and all of its 
-          subordinate objects down to and including the objects on the level, 
-          which is specified by the scopeLevel parameter, are selected. 
-          The base object is at scopeLevel zero.";
-      }
+            The value BASE_NTH_LEVEL indicates all objects on the level, 
+            which is specified by the scopeLevel parameter, below the base 
+            object are selected. The base object is at scopeLevel zero.
+            The value BASE_SUBTREE indicates the base object and all of its 
+            subordinate objects down to and including the objects on the level, 
+            which is specified by the scopeLevel parameter, are selected. 
+            The base object is at scopeLevel zero.";
+        }
       
-      leaf scopeLevel {
-        when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"';
-        type uint16; 
-        mandatory true;
-        description "See description of scopeType.";
+        leaf scopeLevel {
+          when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"';
+          type uint16; 
+          mandatory true;
+          description "See description of scopeType.";
+        }
+      }
+      case dataNodeSelector {
+        leaf dataNodeSelector {
+          type string;
+          description "The value shall follow the rules of RFC 8641 
+            filter-spec";
+          reference "RFC 8641 section 5.";
+        }
       }
     }
 
@@ -288,4 +297,4 @@ module _3gpp-common-subscription-control {
       }
     }
   }   
-}
\ No newline at end of file
+}